Bug 1620784 - Update installation and uninstallation instructions on website. r=frg

src/doc/install-and-uninstall.en.html

@@ -20,7 +20,7 @@
   <li><a href="#install">Installation</a>
     <ul>
       <li><a href="#install_win">Windows</a></li>
-      <li><a href="#install_mac">Mac OS X</a></li>
+      <li><a href="#install_mac">macOS</a></li>
       <li><a href="#install_linux">Linux</a></li>
     </ul>
   </li>
@@ -38,19 +38,14 @@ might not work until updates for them are made available.
 
 <h3 id="install_win">Windows Installation Instructions</h3>
 <div class="section">
-<p class="note">
-For Windows 2000/XP systems, you need Administrator privileges to
-install SeaMonkey. If you see an "Error 5" message during installation,
-make sure you're running the installation with Administrator privileges.
-</p>
-
 <p class="note">
 Windows may warn you that it could not verify the publisher when you try to run
-the installer. This is because the SeaMonkey installer for Windows is not digitally
-signed. As long as you downloaded the installer from either www.seamonkey-project.org
-or mozilla.org, you can safely ignore it (more experienced users may use the checksums
-linked to from the download pages to verify the integrity of the installer).<br>
-Windows Vista/7 will by default present you with an additional warning after
+the installer. This is because the SeaMonkey installer for Windows is not
+digitally signed. As long as you downloaded the installer from either
+www.seamonkey-project.org or mozilla.org, you can safely ignore it (more
+experienced users may use the checksums linked to from the download pages to
+verify the integrity of the installer).<br>
+Windows 7 and above will by default present you with an additional warning after
 extracting finished. You also need to confirm this User Account Control warning
 in order to proceed with the installation.
 </p>
@@ -60,14 +55,16 @@ To install SeaMonkey by downloading the SeaMonkey installer, follow these steps:
 </p>
 
 <ol>
-  <li>Click the Download link in the Windows column on the site you're
+  <li>Click the Download link in the relevant Windows column for your
+    architecture (x64 for 64-bit or x86 for 32-bit) on the site you're
     downloading SeaMonkey from to download the installer file
-    (<tt>SeaMonkey Setup 2.1.exe</tt> or similar file name) to your machine.</li>
+    (<tt>seamonkey-2.53.1.en-US.win64.installer.exe</tt> or similar file name)
+    to your machine.</li>
   <li>Navigate to where you downloaded the file and double-click the
     installer file icon on your machine to begin the Setup program.</li>
   <li>Follow the on-screen instructions in the setup program (see the note about
-    Unknown Publisher warnings above). The program starts automatically the first
-    time.</li>
+    Unknown Publisher warnings above). The setup program gives you the option
+    to launch SeaMonkey once the installation is completed.</li>
 </ol>
 
 
@@ -80,24 +77,21 @@ described above):
 <ol>
   <li>Go to a Mozilla FTP server or one of its mirrors, navigate to the
     appropriate SeaMonkey releases directory and the subdirectory for your
-    language in its <tt>win32</tt> subdirectory. Click the link to
-    <tt>seamonkey-2.1.zip</tt> (or similar file name) in there to download the
-    .zip file to your machine.</li>
+    language in its <tt>win32</tt> or <tt>win64</tt> subdirectory. Click the
+    link to <tt>seamonkey-2.53.1.en-US.win64.zip</tt> (or similar file name) in
+    there to download the .zip file to your machine.</li>
   <li>Navigate to where you downloaded the file and double-click the
     compressed file.
-    <p class="note">
-      This step assumes you already have a recent version of WinZip
-      (or a similar zip tool) installed, and that you know how to use it.
-    </p>
   </li>
   <li>Extract the .zip file to a directory such as
-    <tt>C:\Program Files\mozilla.org\SeaMonkey</tt>.</li>
+    <tt>C:\Program Files (x86)\SeaMonkey</tt> or
+    <tt>C:\Program Files\SeaMonkey</tt>.</li>
   <li>To start SeaMonkey, navigate to the directory you extracted
     SeaMonkey to and double-click the <tt>seamonkey.exe</tt> icon.</li>
 </ol>
 </div>
 
-<h3 id="install_mac">Mac OS X Installation Instructions</h3>
+<h3 id="install_mac">macOS Installation Instructions</h3>
 <div class="section">
 
 <p>
@@ -105,9 +99,10 @@ To install SeaMonkey, follow these steps:
 </p>
 
 <ol>
-  <li>Click the Download link in the Mac OS X column on the site you're
+  <li>Click the Download link in the macOS column on the site you're
     downloading SeaMonkey from to download the disk image file
-    (<tt>SeaMonkey 2.1.dmg</tt> or similar file name) to your machine.</li>
+    (<tt>seamonkey-2.53.1.en-US.mac.dmg</tt> or similar file name) to your
+    machine.</li>
   <li>Double-click on the .dmg file. The disk image will now mount and a new
     Finder window should appear.
   <li>Drag the SeaMonkey icon to the Applications folder.</li>
@@ -133,9 +128,11 @@ To install SeaMonkey by downloading the tar.bz2 file:
 <ol>
   <li>Create a directory named "seamonkey2" (<tt>mkdir seamonkey2</tt>) and
     change to that directory (cd seamonkey2).</li>
-  <li>Click the link on the site you're downloading SeaMonkey from to
-     download the package (seamonkey-2.*.tar.bz2) file into the seamonkey2
-     directory.</li>
+  <li>Click the Download link in the relevant Linux column for your
+    architecture (x64 for 64-bit or x86 for 32-bit) on the site you're
+    downloading SeaMonkey from to download the package
+    (<tt>seamonkey-2.53.1.en-US.linux-x86_64.tar.bz2</tt> or similar name) file
+    into the seamonkey2 directory.</li>
   <li>Decompress the file with the following command:
     <p><tt>tar jxvf seamonkey-2.*.tar.bz2</tt></p>
     This creates a "seamonkey" directory under your seamonkey2 directory.</li>
@@ -197,7 +194,7 @@ The procedure is quite similar in the Xfce environment:
 <p>
 You can remove SeaMonkey through the <tt>Control Panel</tt> in the
 <tt>Start Menu</tt> on Windows, by removing the <tt>SeaMonkey</tt> application
-on OS X, or by removing the <tt>seamonkey</tt> folder on Linux.
+on macOS, or by removing the <tt>seamonkey</tt> folder on Linux.
 </p>
 
 <p>
@@ -209,15 +206,11 @@ depending on your operating system:
 
 <table style="font-size: small;" border="1" cellspacing="0">
   <tbody><tr>
-    <td><img src="/images/ico-win.png" alt=""> Windows Vista, Windows 7</td>
+    <td><img src="/images/ico-win.png" alt=""> Windows 7 and above</td>
     <td>Users\&lt;UserName&gt;\AppData\Roaming\Mozilla\SeaMonkey</td>
   </tr>
   <tr>
-    <td><img src="/images/ico-win.png" alt=""> Windows 2000, XP, Server 2003</td>
-    <td>Documents and Settings\&lt;UserName&gt;\Application Data\Mozilla\SeaMonkey</td>
-  </tr>
-  <tr>
-    <td><img src="/images/ico-osx-uni.png" alt=""> Mac&nbsp;OS&nbsp;X</td>
+    <td><img src="/images/ico-osx-uni.png" alt=""> macOS</td>
     <td>~/Library/Application Support/SeaMonkey</td>
   </tr>
   <tr>