bug 546936 - Adapt Help for changes from Bug 536374 - Places history changes due to async expiration, r=IanN
authorRobert Kaiser <kairo@kairo.at>
Thu, 22 Apr 2010 15:30:50 +0200
changeset 5508 6d1782409f381d9ea9cf11a610e1f0089380f6b4
parent 5507 4f802aa77e93e14bf68f07bdc2a43edcee1cb792
child 5509 71558cab8b649796155602782acddcf58e18edc0
push id4261
push userkairo@kairo.at
push dateThu, 22 Apr 2010 13:31:20 +0000
treeherdercomm-central@028eebe1606b [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs546936, 536374
bug 546936 - Adapt Help for changes from Bug 536374 - Places history changes due to async expiration, r=IanN
--- a/suite/locales/en-US/chrome/common/help/cs_nav_prefs_navigator.xhtml
+++ b/suite/locales/en-US/chrome/common/help/cs_nav_prefs_navigator.xhtml
@@ -144,35 +144,20 @@
 <p>The History preferences panel allows you to configure the history settings
   for the browser.</p>
   <li><strong>Browsing History</strong>:
       <li><strong>Clear History</strong>: Click this to delete the list of
         sites visited.</li>
-      <li><strong>Always remember visited pages for at least [__]
-        days</strong>: Type the minimum number of days for which
-        &brandShortName; should remember pages you have previously visited.
-        Unless you manually delete entries from the history, &brandShortName;
-        will always remember visited pages for at least as many days as you
-        specify here, no matter what the other Browsing History preferences
-        say. After that time, &brandShortName; may delete entries from the
-        history, depending on the next two preferences.</li>
-      <li><strong>Remember visited pages for up to [__] days</strong>: Type the
-        maximum number of days you want &brandShortName; to keep track of the
-        web pages you have previously visited. For example, if you set this
-        number to 180 days, pages 180 days old or less will be kept in the
-        history list unless you manually delete them from the history or the
-        maximum number of visited pages (see next point) has been reached.</li>
-      <li><strong>Remember up to [__] visited pages</strong>: Type the maximum
-        number of visited pages &brandShortName; should remember. When the
-        actual number of visited pages exceeds the number specified here,
-        &brandShortName; will delete as many of the oldest history entries as
-        needed to get down to that number again.</li>
+      <li><strong>Remember visited pages</strong>: Select this to make
+        &brandShortName; remember pages you visit within the browsing history.
+        For example, you need that to be able to search for pages you have
+        already visited from the location bar or history window.</li>
   <li><strong>Location Bar History</strong>:
       <li><strong>Clear Location Bar</strong>: Click this to clear the list of
         sites in the Location bar menu.</li>
--- a/suite/locales/en-US/chrome/common/help/nav_help.xhtml
+++ b/suite/locales/en-US/chrome/common/help/nav_help.xhtml
@@ -218,20 +218,16 @@
     <span class="mac">&brandShortName;</span><span class="noMac">Edit</span>
     menu and choose Preferences.</li>
   <li>Under the Browser category, click History. (If no subcategories are
     visible, double-click Browser to expand the list.)</li>
   <li>Click Clear History and Clear Location Bar to remove all previously
     visited web pages from the lists.</li>
-<p><strong>Tip</strong>: Use the preferences under <a
-  href="cs_nav_prefs_navigator.xhtml#history">Browsing History</a> to set
-  how long and how many pages will remain in the history list.</p>
 <p>To selectively delete pages from the history list, do any of the
   <li>To delete all pages from a domain, select a page within that domain
     (folder) in the History list, open the Edit menu, and select <q>Delete
     History for <em>*.[domain name]</em></q>. For example, use this command
     if you want to delete all pages that end in <q>mozilla.org</q>.</li>