--- doc/build/ubuntu10LTS_install.frag	2011/06/08 22:28:05	1.3
+++ doc/build/ubuntu10LTS_install.frag	2013/12/16 13:44:33	1.8
@@ -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 Ubuntu 10.04 LTS .iso file</a></h2>
 <p>
-Ubuntu 10.04 LTS (server install) isos can be obtained from the <a href="http://www.ubuntu.com/download/server/download">Ubuntu Server download</a> page<br />
+Ubuntu 10.04 LTS (server install) isos can be obtained from the <a href="http://www.ubuntu.com/download/server/download">Ubuntu Server download</a> page<br>
 An .iso file (either 32 bit or 64 bit) can be burned to a CD. 
 </p>
 
@@ -86,25 +86,34 @@ There are a few steps that require comme
    <dd>The base system will be installed. Once that is complete you will have the option to select additional software collections. Leave all unselected.</dd>
 </dl>
 <p>
-
 Finish installing your server, reboot it, and log in with the username you created during installation.
-  <dt>Firewall Configuration</dt>
-   <dd>Use ufw to allow incoming traffic for the following services: 
-       ssh, www, https
-   </dd>
+</p>
+<h3>Firewall Configuration</h3>
+<p>
+Use ufw to allow incoming traffic for the following services:
+ssh, www, https
+</p>
 <pre>
 sudo ufw default deny
 sudo ufw enable
-sudo allow ssh
-sudo allow www
-sudo allow https
+sudo ufw allow ssh
+sudo ufw allow www
+sudo ufw allow https
 </pre>
-   <dt>E-mail Configuration</dt>
-   <dd>By default Ubuntu disallows mailing to remote domains. Change using<dd>
+<h3>E-mail: Postfix Installation</h3>
+<p>
+Configure to "Internet Site" to allow LON-CAPA to send e-mail to users.
+</p>
 <pre>
-sudo dpkg-reconfigure exim4-config
-</pre
+sudo apt-get install postfix
+</pre>
+<h3>E-mail: Postfix Configuration</h3>
+<p>
+If you need to change the postfix configuration in the future use:
 </p>
+<pre>
+sudo dpkg-reconfigure postfix
+</pre>
 
 <h2>4. <a name="upd">Update your system</a></h2>
 <p>
@@ -118,20 +127,12 @@ sudo apt-get upgrade
 If kernel packages were updated, reboot your system before continuing with the installation.
 </p>
 <p>
-Retrieve the ubuntu10_LTS_sources.list file from the LON-CAPA install site:
-</p>
-<pre>
-wget http://install.loncapa.org/versions/ubuntu/10.04/ubuntu10_LTS_sources.list
-</pre>
-<p>
-Install ubuntu10_LTS_sources.list
+Add LON-CAPA ubuntu repository to your /etc/apt/sources.list file. 
 </p>
-<p>
 <pre>
-mv /etc/apt/sources.list /etc/apt/sources.list.backup
-cp ubuntu10_LTS_sources.list /etc/apt/sources.list
+sudo apt-get install python-software-properties
+sudo apt-add-repository 'deb http://install.loncapa.org/ubuntu lucid main'
 </pre>
-</p>
 <h2>5. <a name="ilc">Installing LON-CAPA</a></h2>
 <h3>Import the LON-CAPA encryption key</h3>
 <pre>
@@ -144,7 +145,7 @@ sudo apt-get update
 <pre>
 sudo apt-get 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>
@@ -185,7 +186,7 @@ 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>
@@ -208,7 +209,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.
@@ -253,15 +254,12 @@ 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.
+Replace USERNAME and DOMAIN with an appropriate username and your domain.
 </p>
 <pre>
 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>
@@ -287,7 +285,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