--- doc/build/scientific6_install.frag	2011/06/01 04:44:44	1.2
+++ doc/build/scientific6_install.frag	2013/12/16 13:53:28	1.6
@@ -33,10 +33,10 @@ 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 Scientific Linux 6 CDs</a></h2>
 <p>
-Scientific Linux isos can be obtained from links included on the <a href="http://www.scientificlinux.org/download/">Scientific Linux download page</a><br />
+Scientific Linux isos can be obtained from links included on the <a href="http://www.scientificlinux.org/download/">Scientific Linux download page</a><br>
 For the minimal install on both 32-bit and 64 bit architecture you will need only the first CD.
 
 </p>
@@ -88,23 +88,26 @@ There are a few steps that require comme
    <dd>Click the "Customize Now" radio button and for a minimal install uncheck all packages except "Base" in the Base System category.  If you leave other packages checked in any of the other categories, you'll need additional ISO CDs.</dd>
 </dl>
 <p>
-
-Finish installing your server, reboot it, and log in as root. The
-first time you log-in, the Setup Agent will be displayed. (If you exit it early you can enter it again by running the command
+Finish installing your server, reboot it, and log in as root.
+</p>
+<h3>Firewall and SELinux Configuration</h3>
+<p>
+The first time you log-in, the Setup Agent will be displayed. (If you exit it early you can enter it again by running the command
+</p>
 <pre>
 setup
 </pre>
- This tool should be used to configure the Firewall and SELinux.
-
-  <dt>Firewall Configuration</dt>
-
-   <dd>Select Security Level: Enabled, and Customize, to allow
-       incoming: SSH (remote login), WWW (HTTP) and secure WWW
-       (HTTPS).
-   </dd>
-   <dd> Set SELinux to Disabled.</dd>
-   <dd> Select OK, and then Quit</dd>
+<p>
+This tool should be used to configure the Firewall and SELinux.
 </p>
+<ol>
+  <li>Select Security Level: Enabled, and Customize, to allow
+      incoming: SSH (remote login), WWW (HTTP) and secure WWW
+      (HTTPS).
+  </li>
+  <li>Set SELinux to Disabled.</li>
+  <li>Select OK, and then Quit</li>
+</ol>
 
 <h2>4. <a name="upd">Update your system</a></h2>
 <p>
@@ -125,13 +128,12 @@ wget http://install.loncapa.org/versions
 <p>
 Install the scientific_loncapa_yum.conf
 </p>
-<p>
 <pre>
 mv /etc/yum.conf /etc/yum.conf.backup
 cp scientific6_loncapa_yum.conf /etc/yum.conf
 yum update
 </pre>
-</p>
+
 <h2>5. <a name="ilc">Installing LON-CAPA</a></h2>
 <h3>Import the LON-CAPA encryption key</h3>
 <pre>rpm --import http://install.loncapa.org/versions/scientific/RPM-GPG-KEY-loncapa</pre>
@@ -140,7 +142,7 @@ yum update
 <pre>
 yum install 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>
@@ -159,7 +161,7 @@ tar xf install.tar
 This creates a directory named <tt>installation</tt>.  Change to it and
 execute the setup script with the following commands:
 </p>
-
+<pre>
 cd installation
 ./install.pl
 </pre>
@@ -171,7 +173,7 @@ used to check the configuration of a sys
 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:
+<p>The possible actions are:</p>
 <ul>
 <li>Create the www user/group</li>
 <li>Install the package LON-CAPA uses to authenticate users.</li>
@@ -180,12 +182,10 @@ Once a choice has been entered for all n
 <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 />
+<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
@@ -203,7 +203,7 @@ for it to function at all.  Below is a l
   <dd>Each site or school which installs LON-CAPA needs its own domain.
       Here at MSU we use 'msu'.  You should choose something short but
       meaningful.  <i>Restriction: One word, no hyphens, underscores, or 
-      special characters.</i><br />Domain names which include a departmental 
+      special characters.</i><br>Domain names which include a departmental 
       abbreviation are not recommended as although LON-CAPA may start in
       a single department, other departments frequently join subsequently.
       For a domain name: 'msu' is a superior choice to 'msuphys' for example.
@@ -234,7 +234,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 should correspond to a version number like '1.3')
+cd /root/loncapa-X.Y.Z     (X.Y.Z should correspond to a version number like '2.10.0')
 ./UPDATE
 </pre>
 <p>
@@ -247,15 +247,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>
@@ -280,7 +278,7 @@ 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