From d533751ddc55e41cb4d990429eea80b0ad91dc57 Mon Sep 17 00:00:00 2001
From: "steffen.wilberg%web.de"
 <steffen.wilberg%web.de@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Sat, 8 Apr 2006 09:36:22 +0000
Subject: [PATCH] Bug 324256: document revised Tabs prefs. r=jeff, a=me

git-svn-id: svn://10.0.0.236/branches/MOZILLA_1_8_BRANCH@193924 18797224-902f-48f8-a5cc-f745e15eee43
---
 .../locales/en-US/chrome/help/prefs.xhtml     | 20 ++++++-------------
 1 file changed, 6 insertions(+), 14 deletions(-)

diff --git a/mozilla/browser/locales/en-US/chrome/help/prefs.xhtml b/mozilla/browser/locales/en-US/chrome/help/prefs.xhtml
index 2bd9588bb7a..3ce2e7f2e44 100644
--- a/mozilla/browser/locales/en-US/chrome/help/prefs.xhtml
+++ b/mozilla/browser/locales/en-US/chrome/help/prefs.xhtml
@@ -313,20 +313,12 @@ Contributors:
         default colors instead.</p>
 
 <h2 id="tabs_options">Tabs &pref.pluralCaps;</h2>
-  <p><em>Open links from other applications in:</em><br/>
-    When other applications on your computer display a web page, &brandShortName;
-    opens the page in the most recently displayed tab or window. You can make
-    &brandShortName; open the page elsewhere by changing this
-    &pref.singular;.</p>
+  <p><em>Open links that would open new windows in:</em><br/>
+    This &pref.singular; controls whether links from other applications or from
+    web pages which request to open them in new windows are opened in <em>new
+    windows</em> or in <em>new tabs in the most recent window</em>.</p>
 
-  <p><em>Force links that open new windows to open in:</em><br/>
-    &brandShortName; opens new windows from links when web pages request them.
-    If you prefer to use tabs as you browse, this behavior may be
-    counterproductive. You can force &brandShortName; to open links that would
-    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,
+  <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
@@ -559,7 +551,7 @@ Contributors:
         than the one in &brandShortName;, click the <em>Security Devices</em>
         button.</p>
 
-<div class="contentsBox"><em>11 March 2006</em></div>
+<div class="contentsBox"><em>08 April 2006</em></div>
 <p>Copyright &copy; 2003-2006 Contributors to the Mozilla Help Viewer Project.</p>
 
 </body>