Bug 641252 - Update help for redesigned Software Installation preferences r=IanN
authorrsx11m <rsx11m.pub@gmail.com>
Sat, 23 Apr 2011 08:55:00 +0200
changeset 7605 52c2ccceb1d7508337afe4a593b904e5e70a2cca
parent 7604 b066f8c46d19c96a153a96db4df3cd0dc3007593
child 7606 33f66df662a5f4f08723ce5b06b1a8025e8de06b
push id5831
push userjh@junetz.de
push dateSun, 24 Apr 2011 09:36:14 +0000
treeherdercomm-central@52c2ccceb1d7 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersIanN
bugs641252
Bug 641252 - Update help for redesigned Software Installation preferences r=IanN
suite/locales/en-US/chrome/common/help/cs_nav_prefs_advanced.xhtml
--- a/suite/locales/en-US/chrome/common/help/cs_nav_prefs_advanced.xhtml
+++ b/suite/locales/en-US/chrome/common/help/cs_nav_prefs_advanced.xhtml
@@ -423,97 +423,92 @@
 
 <ol>
   <li>Open the <span class="mac">&brandShortName;</span>
     <span class="noMac">Edit</span> menu and choose Preferences.</li>
   <li>Under the Advanced category, click Software Installation. (If no
     subcategories are visible, double-click Advanced to expand the list.)</li>
 </ol>
 
-<p>The Software Installation preferences panel is used to enable software
-  installation and update notification:</p>
+<p>The Software Installation preferences panel is used to enable add-on
+  installation and updates. The Add-on Manager allows you to view and manage
+  all your installed extensions and themes.</p>
 
 <ul>
-  <li><strong>Allow websites to install extensions and updates</strong>:
-    Select this if you want to allow websites to install extensions and
-    updates to be used with &brandShortName;. You will be prompted before each
-    installation.</li>
-  <li><strong>Allowed Websites</strong>: Click this to open the Allowed Websites
-    dialog box, where you can view and edit the list of websites that you
-    want to allow to install software:
+  <li><strong>Add-ons</strong>:
     <ul>
-      <li><strong>Allow</strong>: Click this to add a typed website to the
-        list of allowed websites.</li>
-      <li><strong>Remove Website</strong>: Click this to remove a selected
-        website.</li>
-      <li><strong>Remove All Websites</strong>: Click this to remove all of the
-        websites in the current list.</li>
-    </ul>
-  </li>
-  <li><strong>Add-on Manager</strong>: Using the Add-on Manager, you can view
-    and manage all your installed extensions and themes.
-    <ul>
+      <li><strong>Allow websites to install add-ons and updates</strong>:
+        Select this if you want to allow websites to install add-ons and
+        updates to be used with &brandShortName;. You will be prompted before
+        each installation.
+        <ul>
+          <li><strong>Allowed Websites</strong>: Click this link to open the
+            Data Manager tab, where you can view and edit the list of websites
+            that you want to allow to install software</li>
+          <li><strong>Automatically check for updates</strong>:Select this to
+            be notified when a new version of one of your installed add-ons is
+            available. Choose whether you want &brandShortName; to do a
+            <strong>daily</strong> or a <strong>weekly</strong> check for new
+            versions.</li>
+          <li><strong>Automatically download and install the update</strong>:
+            Select this if you want &brandShortName; to automatically download
+            and install updates for you when they become available. The download
+            will happen in the background, with low priority. After the download
+            has finished the update to the add-on will be installed
+            automatically the next time you start &brandShortName;.</li>
+        </ul>
+      </li>
       <li><strong>Personalize Add-on recommendations</strong>: Select this to
         be offered suggestions for add-ons in the &quot;Get Add-ons&quot; tab
         of the manager:
         <ul>
           <li>Note that this function involves sending a list of your
             currently installed add-ons to the add-on web site.</li>
           <li>Disabling this option will also suppress contacting the add-on
             site periodically for any new information about installed add-ons,
             but won't affect automated updates.</li>
         </ul>
       </li>
       <li><strong>Manage Add-ons</strong>: Click this link to open the Add-on
         Manager in a new browser tab.</li>
     </ul>
   </li>
-  <li><strong>Automatically check for updates to</strong>:
+  <li><strong>&brandShortName;</strong>:
     <ul>
-      <li><strong>&brandShortName;</strong>: Select this to be notified when
-        new versions of &brandShortName; are available. Your personal
-        information is not shared when verifying your version of
-        &brandShortName;. Choose whether you want &brandShortName; to do a
-        <strong>daily</strong> or a <strong>weekly</strong> check for new
-        versions.</li>
-      <li><strong>Installed Add-ons</strong>: Select this to be notified when a
-        new version of one of your installed add-ons is available. Choose
-        whether you want &brandShortName; to do a <strong>daily</strong> or a
-        <strong>weekly</strong> check for new versions.</li>
+      <li><strong>Automatically check for updates</strong>:Select this to be
+        notified when a new version of &brandShortName; is available. Choose
+        whether you want &brandShortName; to do a <strong>daily</strong> or
+        a <strong>weekly</strong> check for new versions.
+        <ul>
+          <li><strong>Automatically download and install the update</strong>:
+            Select this if you want &brandShortName; to automatically download
+            and install updates for you when they become available. The download
+            will happen in the background, with low priority. After the download
+            has finished the update to &brandShortName; will be installed
+            automatically the next time you start it.</li>
+          <li><strong>Warn me if this will disable any of my add-ons</strong>:
+            Select this to be notified if an automatic update will disable any
+            of your installed add-ons. In that case you will be shown a list
+            of incompatible add-ons and you can choose whether you want to
+            download and install the update or not.</li>
+        </ul>
+        <p><strong>Note</strong>: You can use Check for Updates from the
+          <span class="mac">&brandShortName;</span><span class="noMac">Help</span>
+          menu to manually initiate the search for a &brandShortName; update.
+          <span class="noMac">The label of the menu item will change when an
+          update is being downloaded or ready to be applied.</span></p>
+      </li>
+      <li><strong>Show Update History…</strong>: Click this to open the Update
+        History dialog box which shows a list of &brandShortName; updates that
+        have been installed, including the update type (e.g. Security Update),
+        time of installation and installation status. The Details link next to
+        each update takes you to a web page that contains further information
+        regarding the update.</li>
     </ul>
   </li>
-  <li><strong>When updates to &brandShortName; are found</strong>:
-    <ul>
-      <li><strong>Ask me what I want to do</strong>: Select this to be notified
-        when new versions of &brandShortName; are available.</li>
-      <li><strong>Automatically download and install the update</strong>: Select
-        this if you want &brandShortName; to automatically download and install
-        updates for you when they become available. The download will happen in
-        the background, with low priority. After the download has finished the
-        update will be installed automatically the next time you start
-        &brandShortName;.</li>
-      <li><strong>Warn me if this will disable any of my add-ons</strong>:
-        Select this to be notified if an automatic update will disable any of
-        your installed add-ons. In that case you will be shown a list of
-        incompatible add-ons and you can choose whether you want to download and
-        install the update or not.</li>
-    </ul>
-
-    <p><strong>Note</strong>: You can use Check for Updates from the
-      <span class="mac">&brandShortName;</span><span class="noMac">Help</span>
-      menu to manually initiate the search for a &brandShortName; update.
-      <span class="noMac">The label of the menu item will change when an update
-      is being downloaded or ready to be applied.</span></p>
-  </li>
-  <li><strong>Show Update History</strong>: Click this to open the Update
-    History dialog box which shows a list of &brandShortName; updates that have
-    been installed, including the update type (e.g. Security Update), time of
-    installation and installation status. The Details link next to each update
-    takes you to a web page that contains further information regarding the
-    update.</li>
 </ul>
 
 <p>[<a href="#advanced_preferences">Return to beginning of section</a>]</p>
 
 <h2 id="mouse_wheel">Advanced Preferences - Mouse Wheel</h2>
 
 <p>This section describes how to use the Mouse Wheel preferences panel. If
   you&apos;re not already viewing it, follow these steps:</p>