Bug 336389: document the new 'Add-ons' UI (formerly Extensions and Themes). r=jwalden

browser/locales/en-US/chrome/help/customization.xhtml

@@ -22,8 +22,7 @@ Contributors:
 <div class="contentsBox">In this section:
  <ul>
    <li><a href="#toolbars">Toolbars</a></li>
-   <li><a href="#themes">Themes</a></li>
+   <li><a href="#add_ons">Add-ons (extensions and themes)</a></li>
-   <li><a href="#extensions">Extensions</a></li>
  </ul>
 </div>
 <h2 id="toolbars">Toolbars</h2>
@@ -100,100 +99,90 @@ Contributors:
   click Done. You can also hide a custom toolbar as described in the previous
   paragraph.</p>
 
-<h2 id="themes">Themes</h2>
+<h2 id="add_ons">Add-ons (extensions and themes)</h2>
 
-<p>Themes are small files that are installed in &brandShortName; that change
+<p>Add-ons are small pieces of software which change or add to the appearance or
-  the look and feel of &brandShortName;. Themes are not allowed to modify the
+  functionality of &brandShortName;. There are two kinds of add-ons: extensions
-  actions or functionality of &brandShortName;, only the look.</p>
+  and themes.</p>
 
-<h3 id="getting_installing_themes">Getting and Installing Themes</h3>
+<dl>
+  <dt>Extensions</dt>
+  <dd>Extensions add new functionality to &brandShortName;. They can add
+    anything from a toolbar button to a completely new feature. They allow the
+    application to be customized to fit the personal needs of each user while
+    minimizing the size and appearance of the application itself.</dd>
 
-<p>You can download and install many themes from <a
+  <dt>Themes</dt>
-  href="https://addons.mozilla.org/themes/" target="_blank">Mozilla Update</a>.
+  <dd>Themes modify &brandShortName;'s appearance. They allow you to change the
-  Internet searches will find many other themes as well.</p>
+    look and feel of &brandShortName; and personalize it to your tastes. A
+    theme can simply change button images, or it can change every piece of
+    &brandShortName; appearance.</dd>
+</dl>
 
-<p>Usually when you click on a link to install a theme, &brandShortName;
+<h3 id="add_ons_installing">Getting and Installing Add-ons</h3>
-  displays a dialog asking you for permission to install the theme.  You can
-  choose to allow the download and installation or to cancel the process.</p>
 
-<h3 id="uninstalling_themes">Uninstalling Themes</h3>
+<p>You can download and install many add-ons from <a
+  href="https://addons.mozilla.org/firefox/" target="_blank">&brandShortName;
+  Add-ons</a>. Internet searches will find many other add-ons as well.</p>
 
-<p>Should you ever wish to remove a theme from &brandShortName;, select <span
+<p>When you click on a link to install an add-on, &brandShortName; displays a
-  class="menuPath">Tools &gt; Themes</span> to open the Theme Manager.</p>
+  dialog asking you for permission to install the add-on. You can choose to
+  allow the download and installation or to cancel the process.</p>
 
-<p>In the Theme Manager, select the theme you wish to remove, and click the
+<h2 id="add_ons_manager">Using the Add-ons manager</h2>
-  <em>Uninstall</em> button. You may need to close and then reopen
+<p>Add-ons are managed in the Add-ons manager. Select <span
-  &brandShortName; for all changes to take effect.</p>
+  class="menuPath">Tools &gt; Add-ons</span> to open it.</p>
 
-<h3 id="changing_themes">Switching Themes</h3>
+<h3 id="add_ons_updating">Updating Add-ons</h3>
 
-<p>To switch between your installed themes, select <span class="menuPath">Tools
+<p>By default, &brandShortName; will periodically check when a new version for
-  &gt; Themes</span> to open the Theme Manager.</p>
+  one of your installed add-ons is available. If any are available, it will
+  prompt you at the next start to install any updates. You can change this
+  behavior in the <a href="prefs.xhtml#advanced_update"><em>Update</em> tab</a>
+  of the <em>Advanced</em> panel of &pref.pluralCaps;.</p>
 
-<p>In the Theme Manager, select the theme of your choice, and click
+<p>You can check for updates manually by selecting the <em>Extensions</em> or
-  the <em>Use Theme</em> button. It is recommended that you close and then
+  <em>Themes</em> panel and clicking the <em>Find Updates</em> button. If
-  reopen &brandShortName; so that the theme can be applied correctly.</p>
+  updates are available, the Add-ons manager displays an <em>Updates</em>
+  panel, where you can choose the updates you want to install. Click the
+  <em>Install Updates</em> button to update those add-ons.
+  You need to restart &brandShortName; for changes to take effect.</p>
 
-<h3 id="updating_themes">Updating Themes</h3>
+<h3 id="add_ons_uninstalling">Disabling, Enabling, and Uninstalling Add-ons</h3>
 
-<p>Whenever you would like to check for a newer version of a theme that you
+<p>If you want to get rid of an extension, you can either disable it temporarily,
-  have installed, select <span class="menuPath">Tools &gt; Themes</span> to open
+  so it is easily available should you want to enable it again in the future,
-  the Theme Manager.</p>
+  or uninstall it. Themes can only be uninstalled since all themes except the
+  current one are disabled automatically.</p>
+  
+<p>To disable or enable an extension, select the extension of your choice and
+  click its <em>Disable</em> or <em>Enable</em> button. To remove an add-on from
+  &brandShortName;, select the add-on you wish to remove and click its
+  <em>Uninstall</em> button. You need to restart &brandShortName; for changes to
+  take effect.</p>
 
-<p>In the Theme Manager, &brandShortName; displays <em>Update Now</em> buttons
+<h3 id="add_ons_further">Further functionality</h3>
- for themes with available updates. Click the respective button for the theme
- you would like to update.</p>
 
-<p>By default, &brandShortName; will periodically check and notify you when a
+<p>Further functionality such as <em>Visit Home Page</em> and <em>About</em> is
- new version for one of your installed themes is available. You can change
+  available by selecting the add-on of your choice, <span class="mac">pressing
- this behavior in the <a href="prefs.xhtml#advanced_update"><em>Update</em>
+  &ctrlKey; and clicking on</span><span class="noMac">right-clicking</span> the
- tab</a> of the <em>Advanced</em> panel of &pref.pluralCaps;.
+  add-on and selecting the respective item from the context menu.</p>
- You can check for updates manually by clicking the <em>Find Updates</em>
- button.</p>
 
-<h2 id="extensions">Extensions</h2>
+<h3 id="add_ons_specific">Tasks specific to extensions or themes</h3>
+<h4 id="add_ons_configuring_extensions">Configuring Extensions</h4>
 
-<p>Extensions are small add-ons to &brandShortName; that change existing
+<p>Extensions often provide a dialog to configure their functionality. To open
-  browser functionality or add new functionality.</p>
+  the preferences dialog of an extension, select the Extensions panel, select
+  the extension of your choice, and click its <em>&pref.pluralCaps;</em> button,
+  or simply double-click the extension.</p>
 
-<h3 id="getting_installing_extensions">Getting and Installing Extensions</h3>
+<h4 id="add_ons_switching_themes">Switching Themes</h4>
 
-<p>Installing an extension involves a very similar process to installing
+<p>To switch between your installed themes, select the Themes panel, select the
-  themes. Extensions can be found at <a target="blank"
+  theme of your choice, and click its <em>Use Theme</em> button. You need to
-  href="https://addons.mozilla.org/extensions/">Mozilla Update</a>.</p>
+  restart &brandShortName; for changes to take effect.</p>
 
-<p>There should be an install link for each extension on that extension's
+<div class="contentsBox"><em>25 August 2006</em></div>
-  page. As long as JavaScript is not disabled in your browser, clicking this
-  link will install the extension for you.</p>
-
-<h3 id="uninstalling_extensions">Uninstalling Extensions</h3>
-
-<p>Should you ever wish to remove an extension from &brandShortName;, select
-  <span class="menuPath">Tools &gt; Extensions</span> to open the Extension
-  Manager.</p>
-
-<p>In the Extension Manager, select the extension you wish to remove, and click
-  the <em>Uninstall</em> button. You may need to close and then reopen
-  &brandShortName; for all changes to take effect.</p>
-
-<h3 id="updating_extensions">Updating Extensions</h3>
-
-<p>Whenever you would like to check for a newer version of an extension that
-  you have installed, select <span class="menuPath">Tools &gt;
-  Extensions</span> to open the Extension Manager.</p>
-
-<p>In the Extension Manager, &brandShortName; displays <em>Update Now</em>
- buttons for extensions with available updates. Click the respective button for
- the extension you would like to update.</p>
-
-<p>By default, &brandShortName; will periodically check and notify you when a
- new version for one of your installed extensions is available. You can change
- this behavior in the <a href="prefs.xhtml#advanced_update"><em>Update</em>
- tab</a> of the <em>Advanced</em> panel of &pref.pluralCaps;.
- You can check for updates manually by clicking the <em>Find Updates</em>
- button.</p>
-
-<div class="contentsBox"><em>22 January 2006</em></div>
 <p>Copyright &copy; 2003-2006 Contributors to the Mozilla Help Viewer Project.</p>
 
 </body>

browser/locales/en-US/chrome/help/firebird-toc.rdf

@@ -110,8 +110,7 @@
       <nc:subheadings>
         <rdf:Seq>
           <rdf:li> <rdf:Description ID="customize-toolbars" nc:name="Toolbars" nc:link="customization.xhtml#toolbars"/> </rdf:li>
-          <rdf:li> <rdf:Description ID="themes" nc:name="Themes" nc:link="customization.xhtml#themes"/> </rdf:li>
+          <rdf:li> <rdf:Description ID="add-ons" nc:name="Add-ons (extensions and themes)" nc:link="customization.xhtml#add_ons"/> </rdf:li>
-          <rdf:li> <rdf:Description ID="extensions" nc:name="Extensions" nc:link="customization.xhtml#extensions"/> </rdf:li>
         </rdf:Seq>
       </nc:subheadings>
   </rdf:Description>
@@ -125,23 +124,11 @@
       </nc:subheadings>
   </rdf:Description>
 
-  <rdf:Description about="#themes">
+  <rdf:Description about="#add-ons">
       <nc:subheadings>
         <rdf:Seq>
-          <rdf:li> <rdf:Description ID="themes-getting-and-installing" nc:name="Getting and Installing Themes" nc:link="customization.xhtml#getting_installing_themes"/> </rdf:li>
+          <rdf:li> <rdf:Description ID="add-ons-installing" nc:name="Getting and Installing Add-ons" nc:link="customization.xhtml#add_ons_installing"/> </rdf:li>
-          <rdf:li><rdf:Description ID="themes-uninstalling" nc:name="Uninstalling Themes" nc:link="customization.xhtml#uninstalling_themes"/> </rdf:li>
+          <rdf:li> <rdf:Description ID="add-ons-manager" nc:name="Using the Add-ons manager" nc:link="customization.xhtml#add_ons_manager"/> </rdf:li>
-          <rdf:li> <rdf:Description ID="themes-changing" nc:name="Switching Themes" nc:link="customization.xhtml#changing_themes"/> </rdf:li>
-          <rdf:li><rdf:Description ID="themes-updating" nc:name="Updating Themes" nc:link="customization.xhtml#updating_themes"/> </rdf:li>
-        </rdf:Seq>
-      </nc:subheadings>
-  </rdf:Description>
-
-  <rdf:Description about="#extensions">
-      <nc:subheadings>
-        <rdf:Seq>
-          <rdf:li><rdf:Description ID="extensions-installing" nc:name="Getting and Installing Extensions" nc:link="customization.xhtml#getting_installing_extensions"/> </rdf:li>
-          <rdf:li><rdf:Description ID="extensions-uninstalling" nc:name="Uninstalling Extensions" nc:link="customization.xhtml#uninstalling_extensions"/> </rdf:li>
-          <rdf:li><rdf:Description ID="extensions-updating" nc:name="Updating Extensions" nc:link="customization.xhtml#updating_extensions"/> </rdf:li>
         </rdf:Seq>
       </nc:subheadings>
   </rdf:Description>
@@ -382,8 +369,7 @@
       <rdf:Seq>
         <rdf:li> <rdf:Description ID="menu-tools-web-search" nc:name="Web Search" nc:link="menu_reference.xhtml#web_search"/> </rdf:li>
         <rdf:li> <rdf:Description ID="menu-tools-downloads" nc:name="Downloads" nc:link="menu_reference.xhtml#downloads"/> </rdf:li>
-        <rdf:li> <rdf:Description ID="menu-tools-extensions" nc:name="Extensions" nc:link="menu_reference.xhtml#extensions"/> </rdf:li>
+        <rdf:li> <rdf:Description ID="menu-tools-add-ons" nc:name="Add-ons" nc:link="menu_reference.xhtml#add_ons"/> </rdf:li>
-        <rdf:li> <rdf:Description ID="menu-tools-themes" nc:name="Themes" nc:link="menu_reference.xhtml#themes"/> </rdf:li>
         <rdf:li> <rdf:Description ID="menu-tools-javascript-console" nc:name="Error Console" nc:link="menu_reference.xhtml#javascript_console"/> </rdf:li>
         <rdf:li> <rdf:Description ID="menu-tools-page-info" nc:name="Page Info" nc:link="menu_reference.xhtml#page_info"/> </rdf:li>
         <rdf:li> <rdf:Description ID="menu-tools-clear-private-data" nc:name="Clear Private Data..." nc:link="menu_reference.xhtml#clear_private_data"/> </rdf:li>

browser/locales/en-US/chrome/help/menu_reference.xhtml

@@ -333,17 +333,10 @@ Contributors:
   <p>Opens the Download Manager, where you can see the current, as well as
     finished downloads.</p>
 
-  <h3 id="extensions">Extensions</h3>
+  <h3 id="add_ons">Add-ons</h3>
-  <p>Opens the Extension Manager, where you can see all extensions installed
+  <p>Opens the Add-ons manager, where you can view, install, configure, update,
-    on this version of &brandShortName;. You can also choose to uninstall
+    and uninstall your extensions and themes. For more information, see the
-    extensions from this dialog. For more information, see the
+    <a href="customization.xhtml#add_ons">Add-ons</a> help topic.</p>
-    <a href="customization.xhtml#extensions">Extensions</a> help topic.</p>
-
-  <h3 id="themes">Themes</h3>
-  <p>Opens the Theme Manager. From here, you can switch the current theme that
-    &brandShortName; is using. You can also install and uninstall themes from
-    this dialog. For more information, see the
-    <a href="customization.xhtml#themes">Themes</a> help topic.</p>
 
   <h3 id="javascript_console">Error Console</h3>
   <p>Opens the Error Console, which tracks problems with JavaScript code.

browser/locales/en-US/chrome/help/search-db.rdf

@@ -25,10 +25,12 @@
         <li><Description nc:name="Certificates" nc:link="prefs.xhtml#certificates"/></li>
         <li><Description nc:name="Certificate Revocation Lists" nc:link="prefs.xhtml#certificates"/></li>
         <li><Description nc:name="client (definition)" nc:link="glossary.xhtml#client"/></li>
+        <li><Description nc:name="Configuring Extensions" nc:link="customization.xhtml#add_ons_configuring_extensions"/></li>
         <li><Description nc:name="cookie (definition)" nc:link="glossary.xhtml#cookie"/></li>
         <li><Description nc:name="cryptography (definition)" nc:link="glossary.xhtml#cryptography"/></li>
         <li><Description nc:name="decryption (definition)" nc:link="glossary.xhtml#decryption"/></li>
         <li><Description nc:name="digital ID (definition)" nc:link="glossary.xhtml#digital_ID"/></li>
+        <li><Description nc:name="Disabling, Enabling, Uninstalling Add-ons" nc:link="customization.xhtml#add_ons_uninstalling"/></li>
         <li><Description nc:name="encryption (definition)" nc:link="glossary.xhtml#encryption"/></li>
         <li><Description nc:name="Extensible Markup Language (XML) (definition)" nc:link="glossary.xhtml#XML"/></li>
         <li><Description nc:name="feed (definition)" nc:link="glossary.xhtml#feed"/></li>
@@ -68,9 +70,11 @@
         <li><Description nc:name="Software Updates" nc:link="menu_reference.xhtml#check_for_updates"/></li>
         <li><Description nc:name="Status Bar (definition)" nc:link="glossary.xhtml#Status_Bar"/></li>
         <li><Description nc:name="Stop Button" nc:link="using_firebird.xhtml#stopping_and_reloading"/></li>
+        <li><Description nc:name="Switching Themes" nc:link="customization.xhtml#add_ons_switching_themes"/></li>
         <li><Description nc:name="TLS (definition)" nc:link="glossary.xhtml#TLS"/></li>
         <li><Description nc:name="TCP/IP (Transmission Control Protocol/Internet Protocol) (definition)" nc:link="glossary.xhtml#TCP_IP"/></li>
         <li><Description nc:name="Uniform Resource Locator (URL) (definition)" nc:link="glossary.xhtml#Uniform_Resource_Locator"/></li>
+        <li><Description nc:name="Updating Add-ons" nc:link="customization.xhtml#add_ons_updating"/></li>
         <li><Description nc:name="Verification" nc:link="prefs.xhtml#certificates"/></li>
         <li><Description nc:name="Viewing HTML Source" nc:link="menu_reference.xhtml#page_source"/></li>
         <li><Description nc:name="web page (definition)" nc:link="glossary.xhtml#web_page"/></li>