--- doc/build/centos5_install.frag	2009/05/11 10:03:24	1.2
+++ doc/build/centos5_install.frag	2011/09/23 20:48:35	1.7
@@ -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 CentOS Linux 5 CDs</a></h2>
 <p>
-CentOS isos can be obtained from links included on the <a href="http://mirror.centos.org/centos/5/isos/">CentOS download page</a><br />
+CentOS isos can be obtained from links included on the <a href="http://mirror.centos.org/centos/5/isos/">CentOS download page</a><br>
 For the minimal install on 32-bit architecture you will need only the first CD.
 For the minimal install on 64-bit architecture you will need CDs 1, 2, and 4.
 
@@ -88,26 +88,31 @@ There are a few steps that require comme
    <dt>Software</dt>
    <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 buy running the command
-<pre>
-setup
-</pre>
- This should tool be used to configure the Firewall and SELinux.
+<p>
+Finish installing your server, reboot it, and log in as root.
+</p>
 
-  <dt>Firewall Configuration</dt>
+<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 buy running the command
+</p>
+<pre>setup</pre>
+<p>
+This tool should be used to configure the Firewall and SELinux.
+</p>
 
-   <dd>Select Security Level: Enabled, and Customize, to allow
+<ol>
+   <li>Select Security Level: Enabled, and Customize, to allow
        incoming: SSH (remote login), WWW (HTTP) and secure WWW
-       (HTTPS). (LON-CAPA also will use ports 5663 and 8080, but the
-       loncontrol startup script should open and close thos ports
-       itself.)
-   </dd>
-   <dd> Set SELinux to Disabled.</dd>
-   <dd> Select OK, and then Quit</dd>
-</p>
+       (HTTPS).
+   </li>
+   <li> Set SELinux to Disabled.</li>
+   <li> Select OK, and then Quit</li>
+</ol>
+
+<pre>reboot</pre>
 
 <h2>4. <a name="upd">Update your system</a></h2>
 <p>
@@ -120,7 +125,7 @@ yum update
 Reboot your system before continuing with the installation.
 </p>
 <p>
-Retrieve the rhel5_loncapa_yum file from the LON-CAPA install site:
+Retrieve the centos5_loncapa_yum file from the LON-CAPA install site:
 </p>
 <pre>
 wget http://install.loncapa.org/versions/centos/5/centos5_loncapa_yum.conf
@@ -128,14 +133,16 @@ wget http://install.loncapa.org/versions
 <p>
 Install the centos5_loncapa_yum.conf
 </p>
-<p>
 <pre>
 mv /etc/yum.conf /etc/yum.conf.backup
 cp centos5_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/centos/RPM-GPG-KEY-loncapa</pre>
 <h3>Install prerequisites</h3>
 <p> Execute: </p>
 <pre>
@@ -165,9 +172,10 @@ cd installation
 ./install.pl
 </pre>
 <p>
-This script will prompt you for the MySQL root password and will download the latest LON-CAPA release.<br />
-You can safely ignore the following warnings from gcc 4 when compiling pwauth:<br />
-<tt>
+This script will prompt you for the MySQL root password and will download the latest LON-CAPA release.<br>
+You can safely ignore the following warnings from gcc 4 when compiling pwauth:<br>
+</p>
+<div style="font-family:monospace;">
 pwauth.c: In function ‘lastlog’:
 <ul>
 <li>pwauth.c:541: warning: incompatible implicit declaration of built-in function ‘strncpy’</li>
@@ -177,9 +185,8 @@ pwauth.c: In function ‘main’:
 <ul>
 <li>pwauth.c:692: warning: incompatible implicit declaration of built-in function ‘strlen’</li>
 </ul>
-</tt>
+</div>
 
-</p>
 
 <h3>Determine LON-CAPA Settings</h3>
 <p>
@@ -198,7 +205,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.
@@ -275,7 +282,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