--- doc/build/sles10_install.frag	2010/05/27 05:48:22	1.6
+++ doc/build/sles10_install.frag	2013/12/13 18:28:42	1.8
@@ -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 10</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>.
@@ -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/sles10/">
-http://www.novell.com/documentation/sles10/</a>.<br /><br />
-Most of the subsequent installation screens are self explanatory.
+http://www.novell.com/documentation/sles10/</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,7 +95,6 @@ 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.
@@ -106,7 +105,7 @@ Finish installing your server, read the
 
 <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>
@@ -121,9 +120,12 @@ cp -rv /mnt/* sles10/CD1
 umount /mnt
 </pre>
 <p>
-Repeat those steps with CD2, CD3 and CD4.</p>
+Repeat those steps with CD2, CD3 and CD4.
+</p>
 <h3>Add an additional installation source</h3>
-<p>Add the LON-CAPA SLES 10 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 10 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>
@@ -134,6 +136,7 @@ Repeat those steps with CD2, CD3 and CD4
 <dd>Authentication</dd>
 <dt>Anonymous</dt>
 </dl>
+<p>
 After saving this configuration information for the LON-CAPA repository, quit yast.
 </p>
 
@@ -143,20 +146,20 @@ After saving this configuration informat
 <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>Retrieve and execute LON-CAPA setup program</h3>
 <p>
 Retrieve the LON-CAPA setup with one of the following commands:
 </p>
 <pre>
-wget http://install.loncapa.org/versions/suse/sles10/sles10_install.tar
+wget http://install.loncapa.org/linux/install.tar
 </pre>
 <p>
 Extract the archive with the following command:
 </p>
 <pre>
-tar xf sles10_install.tar
+tar xf install.tar
 </pre>
 <p>
 This creates a directory named <tt>installation</tt>.  Change to it and
@@ -167,8 +170,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
@@ -205,7 +228,7 @@ 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>
@@ -214,7 +237,7 @@ in the previous section.
 </p>
 <p>After installing LON-CAPA, and taking any actions included in the WARNINGS file created during installation, it is recommended that you set loncontrol to start automatically on boot, by executing the following command:</p>
 <pre>
-/sbin/chkconfig --level 345 loncontrol on
+/sbin/chkconfig --level 35 loncontrol on
 </pre>
 
 <h2>6. <a name="cdc">Creating a Domain Coordinator</a></h2>
@@ -222,15 +245,13 @@ in the previous section.
 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>
@@ -255,13 +276,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.