--- doc/build/F12_install.frag	2010/05/25 16:03:22	1.1
+++ doc/build/F12_install.frag	2011/11/27 03:06:30	1.4
@@ -51,7 +51,7 @@ Path: fedora/releases/12/Fedora/i386/os/
 You will need to know the following network settings for your installation.
 <b>Note:</b>You must have a static IP address to use LON-CAPA.
 DHCP is <em>not</em> supported.
-
+</p>
 <ul>
   <li>ip address </li>
   <li>netmask </li>
@@ -114,10 +114,12 @@ mv loncapa_selinux_config /etc/selinux/c
 <h3>Firewall Configuration</h3>
 To configure the firewall settings, use the system-config-firewall utility. Execute: <p>
 <pre>lokkit</pre></p><p>
+<dl style="list-style:square outside none">
   <dt>Firewall Configuration</dt>
-   <dd>Select Security Level: Enabled, and allow incoming: SSH (remote login), WWW (HTTP) and secure WWW (HTTPS). You should also open the additional port used by LON-CAPA for TCP traffic: 5663.</dd>
-<br />Exit the system-config-firewall</p>
-
+   <dd>Select Security Level: Enabled, and allow incoming: SSH (remote login), WWW (HTTP) and secure WWW (HTTPS).</dd>
+</dl>
+<br />Exit the system-config-firewall
+</p>
 <h2>4. <a name="upd">Update your system</a></h2>
 <p>
 Update your system to the latest versions of the system software using yum.
@@ -159,20 +161,20 @@ rpm --import http://install.loncapa.org/
 <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>
 Retrieve the LON-CAPA setup with the following command:
 </p>
 <pre>
-wget http://install.loncapa.org/versions/fedora/12/F12_install.tar
+wget http://install.loncapa.org/linux/install.tar
 </pre>
 <p>
 Extract the archive with the following command:
 </p>
 <pre>
-tar xf F12_install.tar
+tar xf install.tar
 </pre>
 <p>
 This creates a directory named <tt>installation</tt>.  Change to it and
@@ -183,22 +185,27 @@ 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>
-pwauth.c: In function ‘lastlog’:
-<ul>
-<li>pwauth.c:541: warning: incompatible implicit declaration of built-in function ‘strncpy’</li>
-<li>pwauth.c:543: warning: incompatible implicit declaration of built-in function ‘strlen’</li>
-</ul>
-pwauth.c: In function ‘main’:
+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>pwauth.c:692: warning: incompatible implicit declaration of built-in function ‘strlen’</li>
+<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>
-</tt>
-
 </p>
-
 <h3>Determine LON-CAPA Settings</h3>
 <p>
 LON-CAPA requires a number of identifying parameters to be set in order
@@ -248,7 +255,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-X.Y.Z     (X.Y.Z should correspond to a version number like '2.7.1')
+cd /root/loncapa-X.Y.Z     (X.Y.Z should correspond to a version number like '2.10.0')
 ./UPDATE
 </pre>
 <p>
@@ -261,15 +268,14 @@ 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
+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.
 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>