From ac25f5bdc66f5381784e8597ad09ad22b9680b83 Mon Sep 17 00:00:00 2001
From: "steffen.wilberg%web.de" <steffen.wilberg%web.de>
Date: Sat, 26 Nov 2005 20:37:26 +0000
Subject: [PATCH] Bug 314814: Not all links that open new windows are diverted.
 r=jeff

---
 browser/locales/en-US/chrome/help/prefs.xhtml | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/browser/locales/en-US/chrome/help/prefs.xhtml b/browser/locales/en-US/chrome/help/prefs.xhtml
index 279ed931f6ff..18fc8420dafb 100644
--- a/browser/locales/en-US/chrome/help/prefs.xhtml
+++ b/browser/locales/en-US/chrome/help/prefs.xhtml
@@ -331,6 +331,12 @@ Contributors:
     normally be opened in new windows to be opened elsewhere. To do so, select
     the checkbox for this &pref.singular; and choose the behavior you desire.</p>
 
+    <p><strong>Note:</strong> If you have chosen to open links in new tabs,
+    &brandShortName; will ignore this &pref.singular; and will open a new window
+    from a link if the page author specified that the new window should have a
+    specific size, because some pages can only be displayed correctly at a
+    specific size.</p>
+
   <p><em>Hide the tab bar when only one web site is open</em><br/>
     If you're only viewing one web page in a &brandShortName; window, the tab
     bar is not shown. Uncheck this &pref.singular; to always show the tab bar.</p>
@@ -558,7 +564,7 @@ Contributors:
         than the one in &brandShortName;, click the <em>Security Devices</em>
         button.</p>
 
-<div class="contentsBox"><em>21 October 2005</em></div>
+<div class="contentsBox"><em>10 November 2005</em></div>
 <p>Copyright &copy; 2003-2005 Contributors to the Mozilla Help Viewer Project.</p>
 
 </body>