--- doc/build/sles11_install.frag	2011/02/06 18:47:41	1.2
+++ doc/build/sles11_install.frag	2013/12/13 18:28:42	1.4
@@ -33,7 +33,7 @@ The installation process takes the follo
   <li><a href="#log">Log in to LON-CAPA</a></li>
 </ol>
 
-<hr />
+<hr>
 <h2>1. <a name="obt">Obtain SuSE Linux Enterprise Server 11</a></h2>
 <p>
 SuSE ISO files can be obtained from the Novell site: <a href="http://www.novell.com/products/server/">http://www.novell.com/products/server/</a>.  Only DVD1 is required for each architecture (DVD2 contains source rpms for the various packages).
@@ -58,8 +58,8 @@ DHCP is <em>not</em> supported.
 Installing SuSE Linux Enterprise Server is quite easy if you've installed Linux products
 before.  Some documentation is available from
 <a href="http://www.novell.com/documentation/sles11/">
-http://www.novell.com/documentation/sles11/</a>.<br /><br />
-Most of the subsequent installation screens are self explanatory.
+http://www.novell.com/documentation/sles11/</a>.<br><br>
+Most of the installation screens are self explanatory.
 There are a few steps that require comment and are dealt with below.
 </p>
 <dl style="list-style:square outside none">
@@ -95,14 +95,14 @@ There are a few steps that require comme
    </dd>
    <dt>Online update</dt>
    <dd>Indicate "Yes" when prompted to "run online update now?"</dd>
-   </dt>
 </dl>
 <p>
 Finish installing your server, read the "readme", reboot and log in as root.
 </p>
+
 <h2>4. <a name="upd">Change software sources for your system</a></h2>
 <p>
-You will use yast to import packages required for LON-CAPA.<br />
+You will use yast to import packages required for LON-CAPA.<br>
 Execute:
 </p>
 <pre>
@@ -117,7 +117,9 @@ cp -rv /mnt/* sles11/DVD1
 umount /mnt
 </pre>
 <h3>Add an additional installation source</h3>
-<p>Add the LON-CAPA SLES 11 repository as an additional installation source, so software installation in yast will have access to at least two repositories - a SuSE/Novell source (for packages included for the standard distribution) and the LON-CAPA repository (for extra packages needed to run LON-CAPA). For the LON-CAPA source you will use:
+<p>
+Add the LON-CAPA SLES 11 repository as an additional installation source, so software installation in yast will have access to at least two repositories - a SuSE/Novell source (for packages included for the standard distribution) and the LON-CAPA repository (for extra packages needed to run LON-CAPA). For the LON-CAPA source you will use:
+</p>
 <dl style="list-style:square outside none">
 <dd>Protocol</dd>
 <dt>HTTP</dt>
@@ -128,15 +130,17 @@ umount /mnt
 <dd>Authentication</dd>
 <dt>Anonymous</dt>
 </dl>
+<p>
 After saving this configuration information for the LON-CAPA repository, quit yast.
 </p>
+
 <h2>5. <a name="ilc">Installing LON-CAPA</a></h2>
 <h3>Install prerequisites</h3>
 <p> Execute: </p>
 <pre>
 yast -i LONCAPA-prerequisites
 </pre><p>
-This may take a moment due to LON-CAPA's large number of dependencies.
+This may take some minutes due to LON-CAPA's large number of dependencies.
 </p>
 <h3>Configure Firewall Settings</h3>
 <p>After installing the prerequisites you should start yast, and select Security and Users -> Firewall. At step 2 include the following services: HTTP, HTTP with SSL, and Secure Shell.
@@ -146,13 +150,13 @@ This may take a moment due to LON-CAPA's
 Retrieve the LON-CAPA setup with one of the following commands:
 </p>
 <pre>
-wget http://install.loncapa.org/versions/suse/sles11/sles11_install.tar
+wget http://install.loncapa.org/linux/install.tar
 </pre>
 <p>
 Extract the archive with the following command:
 </p>
 <pre>
-tar xf sles11_install.tar
+tar xf install.tar
 </pre>
 <p>
 This creates a directory named <tt>installation</tt>.  Change to it and
@@ -163,8 +167,28 @@ cd installation
 ./install.pl
 </pre>
 <p>
-This script will prompt you for the MySQL root password and will download the latest LON-CAPA release.
+The script is used to prepare a Linux system to run LON-CAPA, and can also be
+used to check the configuration of a system on which LON-CAPA has already been installed.  Typically, though, you will run this script only once, when you first install LON-CAPA.
+</p>
+<p>
+The script will analyze your system to determine which actions are recommended.  The script will then prompt you to choose the actions you would like taken.
+Once a choice has been entered for all nine possible actions, required changes will be made.
+</p>
+<p>The possible actions are:
+<ul>
+<li>Create the www user/group</li>
+<li>Install the package LON-CAPA uses to authenticate users.</li>
+<li>Set-up the MySQL database</li>
+<li>Set-up MySQL permissions</li>
+<li>Configure Apache web server</li>
+<li>Configure start-up of services</li>
+<li>Check firewall settings</li>
+<li>Stop services not used by LON-CAPA,<br>
+    e.g., services for a print server: cups daemon</li>
+<li>Download LON-CAPA source code in readiness for installation</li>
+</ul>
 </p>
+
 <h3>Determine LON-CAPA Settings</h3>
 <p>
 LON-CAPA requires a number of identifying parameters to be set in order
@@ -201,27 +225,26 @@ for it to function at all.  Below is a l
 To configure and install LON-CAPA, execute the following commands:
 </p>
 <pre>
-cd /root/loncapa-N.N.N     (N.N.N should correspond to a version number like '2.2.2')
+cd /root/loncapa-X.Y.Z     (X.Y.Z should correspond to a version number like '2.10.0')
 ./UPDATE
 </pre>
 <p>
 You will need to enter the LON-CAPA configuration information you determined
 in the previous section.
 </p>
+
 <h2>6. <a name="cdc">Creating a Domain Coordinator</a></h2>
 <p>
 You will need at least one user at your site who has the role of
 'domain coordinator'.  This user creates accounts for other users and
 grants them additional privileges.  The make_domain_coordinator.pl script
-invoked below requires that you enter the users password.  The password will
-show in plaintext as you type it.  Feel free to use the "passwd username"
-command to change it later.  Replace USERNAME and DOMAIN with an
-appropriate user name and your domain.
+invoked below requires that you enter the user's password.
+Feel free to use the "passwd username" command to change it later.
+Replace USERNAME and DOMAIN with an appropriate user name and your domain.
 </p>
 <pre>
-cd /root/loncapa-N.N/loncom/build
+cd /root/loncapa-X.Y.Z/loncom/build
 perl make_domain_coordinator.pl USERNAME DOMAIN
-(WILL PROMPT FOR PASSWORD HERE)
 </pre>
 
 <h2>7. <a name="sts">Start/Restart Services</a></h2>
@@ -246,13 +269,13 @@ Point a web browser at your new machine
 coordinator.  Congratulations!
 </p>
 
-<hr />
+<hr>
 <h2>If things aren't working right</h2>
 <p>
 If you've followed the steps above and the server doesn't start or you think
 there's something wrong, please get in touch with the LON-CAPA group.
-You can submit a help request using our web form:<br />
-<a href="http://help.loncapa.org/help/">http://help.loncapa.org/help/</a><br />
+You can submit a help request using our web form:<br>
+<a href="http://help.loncapa.org/help/">http://help.loncapa.org/help/</a><br>
 If there were errors in installation of the dependency RPMs or during the
 automatic setup, please send us as much information as possible.
 If some part of this document is unclear please let us know.