Bug 240695 - Wrong help text: Profile Manager can't be invoked from OS X's finder. Patch by Stefan <stefan_h@hem.utfors.se>. r=neil@parkwaycc.co.uk

suite/locales/en-US/chrome/common/help/profiles_help.xhtml

@@ -3,7 +3,8 @@
 <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
 <title>Managing Profiles</title>
 
-<link rel="stylesheet" href="chrome://help/locale/content_style.css" type="text/css">
+<link rel="stylesheet" href="chrome://help/locale/content_style.css"
+  type="text/css">
 
 </head>
 
@@ -14,11 +15,19 @@
 <a NAME="profiles:managingIDX"></a>
 <hr><h1>Managing Profiles</h1>
 
-<p>If you use the Internet at home and at work, you may want to have access to a different set of bookmarks, preferences, address books, email accounts, Sidebar setup, and so on. Similarly, family members may want to share a copy of the same browser software but keep their Internet identities separate. 
+<p>If you use the Internet at home and at work, you may want to have access to
+  a different set of bookmarks, preferences, address books, email accounts,
+  Sidebar setup, and so on. Similarly, family members may want to share a copy
+  of the same browser software but keep their Internet identities separate.</p>
 
-<p>The Profile Manager lets you create different profiles, each with its own bookmarks, preferences, email settings, and so on. You automatically create a default profile when you first install your browser software. After you create one or more additional profiles, you will be asked which you want to use each time you launch the browser.</P>
+<p>The Profile Manager lets you create different profiles, each with its own
+  bookmarks, preferences, email settings, and so on. You automatically create a
+  default profile when you first install your browser software. After you
+  create one or more additional profiles, you will be asked which you want to
+  use each time you launch the browser.</p>
 
-<table summary="list of headings" cellpadding=4 cellspacing=2 bgcolor="#cccccc" Width=324>
+<table summary="list of headings" cellpadding=4 cellspacing=2 bgcolor="#cccccc"
+  Width=324>
 <tr>
 <td class="inthissections">
 <p>In this section:</p>
@@ -37,43 +46,66 @@
 <p>To create a profile:
 
 <ol>
-	<li>Exit the browser. It is not possible to create a new profile while the Navigator, Mail, or any other component of your browser software is running.
-	<li>Open the Profile Manager:</li>
+  <li>Open the Profile Manager:
     <ul>
-		<li>On Windows, open the Start menu and choose Programs, then Mozilla, then Profile Manager.
-		<li>On Mac OS, open the Mozilla folder and then double-click the Profile Manager.
-		<li>On Linux or Unix, type the following at the command line: <tt> ./mozilla -profilemanager</tt>
+      <li><strong>If Mozilla is running:</strong> Open the Tools menu and
+        select Switch Profile.</li>
+      <li><strong>If Mozilla is closed:</strong><span class="win"> Open the
+        Start menu and choose Programs, then Mozilla, then Profile
+        Manager.</span><span class="mac"> Hold down the Option key while you're
+        starting Mozilla from the Finder or the Dock.</span><span class="unix">
+        Type the following at the command line:
+        <tt> ./mozilla -profilemanager</tt></span></li>
     </ul>
-	<li>Click Create Profile, read the Profile description, and then click Next.
-	<li>Enter a profile name. This can be anything you like, such as your real name or a name that's related to what you use the profile for, such as &quot;School.&quot;
-	<li>Accept the default location for the new profile, or click the Choose Folder button and navigate to the location you want.
-	<li>If you have Language Packs or Regional Content Packs installed, click Region Selection and choose the Language/Content set you want.
-	<li>Click Finish.
+  </li>
+  <li>Click Create Profile, read the Profile description, and then click
+    Next.</li>
+  <li>Enter a profile name. This can be anything you like, such as your real
+    name or a name that's related to what you use the profile for, such as
+    &quot;School&quot;.</li>
+  <li>Accept the default location for the new profile, or click the Choose
+    Folder button and navigate to the location you want.</li>
+  <li>If you have Language Packs or Regional Content Packs installed, click
+    Region Selection and choose the Language/Content set you want.</li>
+  <li>Click Finish.</li>
 </ol>
 
-<p>The opening screen of the Profile Manager reappears, with the new profile listed and highlighted. 
-
-
-
 <p>&nbsp;</p>
 <a NAME="deleting_profiles"></a>
 <a NAME="profiles:deletingIDX"></a>
 <a NAME="profiles:renamingIDX"></a>
 <h2>Deleting or Renaming a Profile</h2>
 
-<p>You may want to delete profiles that you don't normally use. To delete or rename an existing profile:
+<p>You may want to delete profiles that you don't normally use. To delete or
+  rename an existing profile:</p>
 
 <ol>
-	<li>Exit the browser. It is not possible to create, delete, or rename a profile while the Navigator, Mail, or any other component of your browser software is running.
-
-	<li>Open the Profile Manager:</li>
+  <li>Open the Profile Manager:
     <ul>
-		<li>On Windows, open the Start menu and choose Programs, then Mozilla, then Profile Manager.
-		<li>On Mac OS, open the Mozilla folder and then double-click the Profile Manager.
-		<li>On Linux or Unix, type the following at the command line: <tt>./mozilla -profile</tt>
+      <li><strong>If Mozilla is running:</strong> Open the Tools menu and
+        select Switch Profile. <strong>Note:</strong> You can't delete the
+        profile that is in use.</li>
+      <li><strong>If Mozilla is closed:</strong>
+        <span class="win"> Open the Start menu and choose Programs, then
+        Mozilla, then Profile Manager.</span><span class="mac"> Hold down the
+        Option key while you're starting Mozilla from the Finder or the
+        Dock.</span><span class="unix"> Type the following at the command line:
+        <tt> ./mozilla -profilemanager</tt></span></li>
     </ul>
-	<li>To delete a profile, select its name and click Delete Profile.
-	<li>To rename a profile, select its name, click Rename Profile, and follow the instructions.
+  </li>
+  <li>To delete a profile, select its name and click Delete Profile. In the
+    confirmation box, choose one of the following options:
+    <ul>
+      <li><strong>Delete files:</strong> Deletes the whole profile folder
+        with its stored data (bookmarks, preferences, email
+        accounts, and so on). <em>Make sure that you won't need anything from
+        the profile in the future before you choose this option.</em></li>
+      <li><strong>Don't delete files:</strong> Removes the profile from the
+        list of available profiles, but keeps the profile folder. By choosing
+        this option none of your profile's stored data will be deleted.</li>
+    </ul>
+    To rename a profile, select its name, click Rename Profile, and follow the
+    instructions.</li>
 </ol>
 
 <hr>