more clean up of some admin files..
[working/Evergreen.git] / 1.6 / admin / Upgrading-Evergreen_1.6.xml
index f24bfcb..5b856c2 100644 (file)
                <title>Stop Evergreen and back up data.</title>\r
                <procedure>\r
                        <step>\r
-                               <para>As <emphasis>root</emphasis>, stop the <application>Apache</application> \r
+                               <para>As <systemitem class="username">root</systemitem>, stop the <application>Apache</application> \r
                                web server<indexterm><primary>web server</primary><secondary>Apache</secondary></indexterm>.</para>\r
                        </step>\r
                        <step>\r
-                               <para>As the <emphasis>opensrf</emphasis> user, stop all \r
+                               <para>As the <systemitem class="username">opensrf</systemitem> user, stop all \r
                                <application>Evergreen</application>\r
                                and <application>OpenSRF</application> services:</para>\r
-                               <screen>osrf_ctl.sh -l -a stop_all</screen>\r
+                               <screen><userinput>osrf_ctl.sh -l -a stop_all</userinput></screen>\r
                        </step>\r
                        <step>\r
                                <para>Back up of the <filename class='directory'>/openils</filename> \r
                                directory.</para>\r
                        </step>\r
                        <step>\r
-                               <para><link linkend="backupevergreendatabase">Back up the <application>evergreen\r
+                               <para><link linkend="backingup">Back up the <application>evergreen\r
                                </application> database</link>.</para>\r
                        </step>\r
                </procedure>\r
                <title>Upgrade OpenSRF<indexterm><primary>OpenSRF</primary><secondary>1.2</secondary></indexterm> to 1.2</title>\r
                <procedure>\r
                        <step>\r
-                               <para>As the opensrf user, download and extract the source files for OpenSRF \r
+                               <para>As the <systemitem class="username">opensrf</systemitem> user, download and extract the source files for <application>OpenSRF</application> \r
                                1.2:</para>\r
-                               <screen>wget http://open-ils.org/downloads/OpenSRF-1.2.2.tar.gz</screen>\r
-                               <screen>tar xzf OpenSRF-1.2.2.tar.gz</screen>\r
+                               <screen><userinput>wget http://open-ils.org/downloads/OpenSRF-1.2.2.tar.gz</userinput></screen>\r
+                               <screen><userinput>tar xzf OpenSRF-1.2.2.tar.gz</userinput></screen>\r
                                <para>A new directory OpenSRF-1.2.2 will be created</para>\r
                                <note><para>For the latest edition of OpenSRF, check the Evergreen download page at \r
                                <ulink url="http://www.open-ils.org/downloads.php" />.\r
                                </para></note>\r
                        </step>\r
                        <step>  \r
-                               <para>As the root user, install the software prerequisites using the automatic \r
+                               <para>As the <systemitem class="username">root</systemitem> user, install the software prerequisites using the automatic \r
                                prerequisite installer.</para> \r
-                               <screen>aptitude install make</screen>\r
-                               <screen>cd /home/opensrf/OpenSRF-1.2.2</screen>\r
+                               <screen><userinput>aptitude install make</userinput></screen>\r
+                               <screen><userinput>cd /home/opensrf/OpenSRF-1.2.2</userinput></screen>\r
                                \r
-                               <para>Replace <emphasis>[distribution]</emphasis> below with the following value \r
+                               <para>Replace <option>[distribution]</option> below with the following value \r
                                for your distribution:</para>\r
                                <itemizedlist>\r
                                        <listitem>\r
-                                               <para><emphasis>debian-etch</emphasis> for Debian Etch (4.0)<indexterm><primary>Linux</primary><secondary>Debian</secondary></indexterm></para>\r
+                                               <para><option>debian-etch</option> for <systemitem class="osname">Debian Etch (4.0)</systemitem><indexterm><primary>Linux</primary><secondary>Debian</secondary></indexterm></para>\r
                                        </listitem>\r
                                        <listitem>\r
-                                               <para><emphasis>debian-lenny</emphasis> for Debian Lenny (5.0)</para>\r
+                                               <para><option>debian-lenny</option> for <systemitem class="osname">Debian Lenny (5.0)</systemitem></para>\r
                                        </listitem>\r
                                        <listitem>\r
-                                       <para><emphasis>ubuntu-hardy</emphasis> for Ubuntu Hardy Heron (8.04)<indexterm><primary>Linux</primary><secondary>Ubuntu</secondary></indexterm></para>\r
+                                       <para><option>ubuntu-hardy</option> for <systemitem class="osname">Ubuntu Hardy Heron (8.04)</systemitem><indexterm><primary>Linux</primary><secondary>Ubuntu</secondary></indexterm></para>\r
                                        </listitem>\r
                                        <listitem>\r
-                                               <para><emphasis>ubuntu-intrepid</emphasis> for Ubuntu Intrepid Ibex \r
-                                               (8.10)</para>\r
+                                               <para><option>ubuntu-intrepid</option> for <systemitem class="osname">Ubuntu Intrepid Ibex \r
+                                               (8.10)</systemitem></para>\r
                                        </listitem>\r
                                        <listitem>\r
-                                               <para><emphasis>ubuntu-jaunty</emphasis> for Ubuntu Jaunty Jackalope \r
-                                               (9.04)</para>\r
+                                               <para><option>ubuntu-jaunty</option> for <systemitem class="osname">Ubuntu Jaunty Jackalope \r
+                                               (9.04)</systemitem></para>\r
                                        </listitem>\r
                                        <listitem>\r
-                                               <para><emphasis>ubuntu-karmic</emphasis> for Ubuntu Karmic Koala \r
-                                               (9.10)</para>\r
+                                               <para><option>ubuntu-karmic</option> for <systemitem class="osname">Ubuntu Karmic Koala \r
+                                               (9.10)</systemitem></para>\r
                                        </listitem>\r
                                </itemizedlist>\r
-                               <screen>make -f src/extras/Makefile.install <emphasis>[distribution]</emphasis></screen>\r
+                               <screen><userinput>make -f src/extras/Makefile.install <option>[distribution]</option></userinput></screen>\r
                                <para>This will install a number of packages required by OpenSRF on your system, \r
-                               including some Perl modules from CPAN<indexterm><primary>programming language</primary><secondary>Perl</secondary>\r
-                               <tertiary>CPAN</tertiary>\r
-                               </indexterm>. You can say <quote>no</quote> to the initial CPAN \r
+                               including some Perl modules from <systemitem class="resource">CPAN</systemitem><indexterm><primary>Perl</primary><secondary>CPAN</secondary>\r
+                               </indexterm>. You can type <userinput>no</userinput> to the initial <systemitem class="resource">CPAN</systemitem> \r
                                configuration prompt to allow it to automatically configure itself to download \r
-                               and install Perl modules from CPAN. The CPAN installer will ask you a number of \r
-                               times whether it should install prerequisite modules - say <quote>yes</quote>.</para>\r
+                               and install Perl modules from <systemitem class="resource">CPAN</systemitem>. The <systemitem class="resource">CPAN</systemitem> installer will ask you a number of \r
+                               times whether it should install prerequisite modules - type <userinput>yes</userinput>.</para>\r
                        </step>\r
                        <step>  \r
                                <para>As the opensrf user, configure and compile OpenSRF:</para> \r
-                               <note>You can include the –enable-python and –enable-java configure options if \r
-                               you want to include support for Python<indexterm><primary>programming language</primary><secondary>Python</secondary>\r
-                               </indexterm> and Java<indexterm><primary>programming language</primary><secondary>Java</secondary>\r
-                               </indexterm>, respectively.</note>\r
-                               <screen>cd /home/opensrf/OpenSRF-1.2.2</screen>\r
-                               <screen>./configure --prefix=/openils --sysconfdir=/openils/conf</screen>\r
-                               <screen>make</screen>\r
+                               <note>You can include the <option>–enable-python</option> and <option>–enable-java</option> configure options if \r
+                               you want to include support for Python<indexterm><primary>Python</primary></indexterm> and Java\r
+                               <indexterm><primary>Java</primary></indexterm>, respectively.</note>\r
+                               <screen><userinput>cd /home/opensrf/OpenSRF-1.2.2</userinput></screen>\r
+                               <screen><userinput>./configure --prefix=/openils --sysconfdir=/openils/conf</userinput></screen>\r
+                               <screen><userinput>make</userinput></screen>\r
                                \r
                        </step>\r
                        <step>  \r
-                               <para>As the root user, return to your OpenSRF build directory and install \r
+                               <para>As the <systemitem class="username">root</systemitem> user, return to your OpenSRF build directory and install \r
                                OpenSRF:</para>\r
-                               <screen>cd /home/opensrf/OpenSRF-1.2.2</screen>\r
-                               <screen>make install</screen>\r
+                               <screen><userinput>cd /home/opensrf/OpenSRF-1.2.2</userinput></screen>\r
+                               <screen><userinput>make install</userinput></screen>\r
                        </step>\r
                        <step>\r
                                <para>As the root user, change the ownership of the installed files to the opensrf \r
                                user:</para>\r
-                               <screen>chown -R opensrf:opensrf /openils</screen>\r
+                               <screen><userinput>chown -R opensrf:opensrf /openils</userinput></screen>\r
                        </step>\r
                        <step>\r
                                <para>Restart and Test OpenSRF</para>\r
-                               <screen>osrf_ctl.sh -l -a start_all</screen>\r
-                               <screen>/openils/bin/srfsh</screen>\r
-                               <screen>srfsh#  request opensrf.math add 2 2</screen>\r
+                               <screen><userinput>osrf_ctl.sh -l -a start_all</userinput></screen>\r
+                               <screen><userinput>/openils/bin/srfsh</userinput></screen>\r
+                               <screen><userinput>srfsh#  request opensrf.math add 2 2</userinput></screen>\r
                                <para>You should see output like:</para>\r
-                               <screen>Received Data: 4</screen>\r
-                               <screen></screen>\r
-                               <screen>------------------------------------</screen>\r
-                               <screen>Request Completed Successfully</screen>\r
-                               <screen>Request Time in seconds: 0.007519</screen>\r
-                               <screen>------------------------------------</screen>\r
-                               <screen></screen>\r
-                               <screen>srfsh#</screen> \r
-                               <para>If test <emphasis>Completed Successfully</emphasis> move onto next section. \r
-                               If not, refer to <link linkend="troubleshooting">troubleshooting</link> section \r
+                               <screen>\r
+                               Received Data: 4\r
+                               \r
+                               ------------------------------------\r
+                               Request Completed Successfully\r
+                               Request Time in seconds: 0.007519\r
+                               ------------------------------------\r
+                               \r
+                               srfsh#\r
+                               </screen>       \r
+                               <para>If test completed successfully move onto next section. \r
+                               Otherwise, refer to the <link linkend="troubleshooting">troubleshooting</link> chapter \r
                                of this documentation.</para> \r
                        </step> \r
                </procedure>    \r
                <title>Upgrade <application>Evergreen</application> to 1.6</title>\r
                <procedure>\r
                        <step>\r
-                               <para>As the <emphasis>opensrf</emphasis> user, download and extract Evergreen 1.6\r
+                               <para>As the <systemitem class="username">opensrf</systemitem> user, download and extract <application>Evergreen 1.6</application>\r
                                </para>\r
-                               <screen>wget http://open-ils.org/downloads/Evergreen-ILS-1.6.0.8.tar.gz</screen>\r
-                               <screen>tar xzf Evergreen-ILS-1.6.0.8.tar.gz</screen>\r
+                               <screen><userinput>wget http://open-ils.org/downloads/Evergreen-ILS-1.6.0.8.tar.gz</userinput></screen>\r
+                               <screen><userinput>tar xzf Evergreen-ILS-1.6.0.8.tar.gz</userinput></screen>\r
                                <note><para>For the latest edition of Evergreen check the Evergreen download page at\r
                                <ulink url="http://www.open-ils.org/downloads.php" /> and adjust upgrading instructions accordingly.</para></note>\r
                        </step>\r
                        <step>\r
-                               <para>As the <emphasis>root</emphasis> user, install the prerequisites:</para> \r
-                               <screen>cd /home/opensrf/Evergreen-ILS-1.6.0.8</screen> \r
-                               <para>On the next command, replace <emphasis>[distribution]</emphasis> with one of \r
+                               <para>As the <systemitem class="username">root</systemitem> user, install the prerequisites:</para> \r
+                               <screen><userinput>cd /home/opensrf/Evergreen-ILS-1.6.0.8</userinput></screen>  \r
+                               <para>On the next command, replace <option>[distribution]</option> with one of \r
                                these values for your distribution of Debian or Ubuntu:</para>\r
                                <itemizedlist>\r
                                        <listitem>\r
-                                               <para><emphasis>debian-etch</emphasis> for Debian Etch (4.0)</para>\r
+                                               <para><option>debian-etch</option> for <systemitem class="osname">Debian Etch (4.0)</systemitem></para>\r
                                        </listitem>\r
                                        <listitem>\r
-                                               <para><emphasis>debian-lenny</emphasis> for Debian Lenny (5.0)</para>\r
+                                               <para><option>debian-lenny</option> for <systemitem class="osname">Debian Lenny (5.0)</systemitem></para>\r
                                        </listitem>\r
                                        <listitem>\r
-                                               <para><emphasis>ubuntu-hardy</emphasis> for Ubuntu Hardy Heron \r
-                                               (8.04)</para>\r
+                                               <para><option>ubuntu-hardy</option> for <systemitem class="osname">Ubuntu Hardy Heron \r
+                                               (8.04)</systemitem></para>\r
                                        </listitem>\r
                                        <listitem>\r
-                                               <para><emphasis>ubuntu-intrepid</emphasis> for Ubuntu Intrepid Ibex \r
-                                               (8.10)</para>\r
+                                               <para><option>ubuntu-intrepid</option> for <systemitem class="osname">Ubuntu Intrepid Ibex \r
+                                               (8.10)</systemitem></para>\r
                                        </listitem>\r
                                        <listitem>\r
-                                               <para><emphasis>ubuntu-jaunty</emphasis> for Ubuntu Jaunty Jackalope \r
-                                               (9.04)</para>\r
+                                               <para><option>ubuntu-jaunty</option> for <systemitem class="osname">Ubuntu Jaunty Jackalope \r
+                                               (9.04)</systemitem></para>\r
                                        </listitem>\r
                                        <listitem>\r
-                                               <para><emphasis>ubuntu-karmic</emphasis> for Ubuntu Karmic Koala \r
-                                               (9.10)</para>\r
+                                               <para><option>ubuntu-karmic</option> for <systemitem class="osname">Ubuntu Karmic Koala \r
+                                               (9.10)</systemitem></para>\r
                                        </listitem>\r
                                </itemizedlist>\r
-                               <screen>make -f Open-ILS/src/extras/Makefile.install <emphasis>[distribution]</emphasis></screen>\r
+                               <screen><userinput>make -f Open-ILS/src/extras/Makefile.install <option>[distribution]</option></userinput></screen>\r
                        </step>\r
                        <step>\r
-                               <para>As the <emphasis>opensrf</emphasis> user, configure and compile \r
+                               <para>As the <systemitem class="username">opensrf</systemitem> user, configure and compile \r
                                <application>Evergreen</application>:</para>\r
-                               <screen>cd /home/opensrf/Evergreen-ILS-1.6.0.8</screen>\r
-                               <screen>./configure --prefix=/openils --sysconfdir=/openils/conf</screen>\r
-                               <screen>make</screen>\r
+                               <screen><userinput>cd /home/opensrf/Evergreen-ILS-1.6.0.8</userinput></screen>\r
+                               <screen><userinput>./configure --prefix=/openils --sysconfdir=/openils/conf</userinput></screen>\r
+                               <screen><userinput>make</userinput></screen>\r
                        </step>\r
                        <step>\r
-                               <para>As the <emphasis>root</emphasis> user, install \r
+                               <para>As the <systemitem class="username">root</systemitem> user, install \r
                                <application>Evergreen</application>:</para>\r
-                               <screen>make STAFF_CLIENT_BUILD_ID=rel_1_6_0_8 install</screen>\r
+                               <screen><userinput>make STAFF_CLIENT_BUILD_ID=rel_1_6_0_8 install</userinput></screen>\r
                        </step>\r
                        <step>\r
                                <para>Change to the <application>Evergreen</application> installation \r
                                directory:</para>\r
-                               <screen>cd /home/opensrf/Evergreen-ILS-1.6.0.8</screen>\r
+                               <screen><userinput>cd /home/opensrf/Evergreen-ILS-1.6.0.8</userinput></screen>\r
                        </step>\r
                        <step>\r
                                <para>As the <emphasis>root</emphasis> user, change all files to be owned by the \r
                                <emphasis>opensrf</emphasis> user and group:</para>\r
-                               <screen>chown -R opensrf:opensrf /openils</screen>\r
+                               <screen><userinput>chown -R opensrf:opensrf /openils</userinput></screen>\r
                        </step>                 \r
                        <step>\r
-                               <para>As the <emphasis>root</emphasis> user, build live-db-setup.pl for the cgi-bin \r
-                               bootstrapping scripts and offline-config.pl for the offline staff client data \r
-                               uploader:</para>\r
-                               <screen>cd /home/opensrf/Evergreen-ILS-1.6.0.8</screen>                         \r
-                               <screen>perl Open-ILS/src/support-scripts/eg_db_config.pl --create-bootstrap --create-offline --user evergreen \</screen>\r
-                               <screen>--password evergreen --hostname localhost --port 5432 --database evergreen</screen>\r
+                               <para>As the <systemitem class="username">root</systemitem> user, build <filename>live-db-setup.pl</filename> for the cgi-bin \r
+                               bootstrapping scripts and <filename>offline-config.pl</filename> for the offline staff client data uploader:</para>\r
+                               <screen><userinput>cd /home/opensrf/Evergreen-ILS-1.6.0.8</userinput></screen>                          \r
+                               <screen>\r
+                               <userinput>\r
+                               perl Open-ILS/src/support-scripts/eg_db_config.pl --create-bootstrap --create-offline --user evergreen \\r
+                               --password evergreen --hostname localhost --port 5432 --database evergreen\r
+                               </userinput>\r
+                               </screen>\r
                        </step>\r
                        <step>\r
-                               <para>As the opensrf user, update server symlink in <filename class="directory">/openils/var/web/xul/</filename>:</para>\r
-                               <screen>cd /openils/var/web/xul/</screen>\r
-                               <screen>rm server</screen>\r
-                               <screen>ln -s rel_1_6_0_8/server</screen>\r
+                               <para>As the <systemitem class="username">opensrf</systemitem> user, update server symlink in <filename class="directory">/openils/var/web/xul/</filename>:</para>\r
+                               <screen><userinput>cd /openils/var/web/xul/</userinput></screen>\r
+                               <screen><userinput>rm server</userinput></screen>\r
+                               <screen><userinput>ln -s rel_1_6_0_8/server</userinput></screen>\r
                        </step>\r
                        \r
                        <step>\r
                                <para>Update the Evergreen database:</para>\r
                                <note><para>it is recommended that you <link linkend="backingup">back up your Evergreen database</link> in order to restore your data if anything goes wrong.</para></note>\r
-                               <screen>psql -U evergreen -h localhost -f Open-ILS/src/sql/Pg/1.4.0.5-1.6.0.0-upgrade-db.sql evergreen</screen> \r
-                               <screen>psql -U evergreen -h localhost -f Open-ILS/src/sql/Pg/1.6.0.0-1.6.0.1-upgrade-db.sql evergreen</screen> \r
-                               <screen>psql -U evergreen -h localhost -f Open-ILS/src/sql/Pg/1.6.0.1-1.6.0.2-upgrade-db.sql evergreen</screen> \r
-                               <screen>psql -U evergreen -h localhost -f Open-ILS/src/sql/Pg/1.6.0.2-1.6.0.3-upgrade-db.sql evergreen</screen> \r
-                               <screen>psql -U evergreen -h localhost -f Open-ILS/src/sql/Pg/1.6.0.3-1.6.0.4-upgrade-db.sql evergreen</screen> \r
-                               <screen>psql -U evergreen -h localhost -f Open-ILS/src/sql/Pg/1.6.0.4-1.6.0.5-upgrade-db.sql evergreen</screen>  \r
-                               <screen>psql -U evergreen -h localhost -f Open-ILS/src/sql/Pg/1.6.0.5-1.6.0.6-upgrade-db.sql evergreen</screen> \r
-                               <screen>psql -U evergreen -h localhost -f Open-ILS/src/sql/Pg/1.6.0.6-1.6.0.7-upgrade-db.sql evergreen</screen> \r
-                               <screen>psql -U evergreen -h localhost -f Open-ILS/src/sql/Pg/1.6.0.7-1.6.0.8-upgrade-db.sql evergreen</screen> \r
+                               <screen><userinput>psql -U evergreen -h localhost -f Open-ILS/src/sql/Pg/1.4.0.5-1.6.0.0-upgrade-db.sql evergreen</userinput></screen>\r
+                               <screen><userinput>psql -U evergreen -h localhost -f Open-ILS/src/sql/Pg/1.6.0.0-1.6.0.1-upgrade-db.sql evergreen</userinput></screen> \r
+                               <screen><userinput>psql -U evergreen -h localhost -f Open-ILS/src/sql/Pg/1.6.0.1-1.6.0.2-upgrade-db.sql evergreen</userinput></screen> \r
+                               <screen><userinput>psql -U evergreen -h localhost -f Open-ILS/src/sql/Pg/1.6.0.2-1.6.0.3-upgrade-db.sql evergreen</userinput></screen> \r
+                               <screen><userinput>psql -U evergreen -h localhost -f Open-ILS/src/sql/Pg/1.6.0.3-1.6.0.4-upgrade-db.sql evergreen</userinput></screen> \r
+                               <screen><userinput>psql -U evergreen -h localhost -f Open-ILS/src/sql/Pg/1.6.0.4-1.6.0.5-upgrade-db.sql evergreen</userinput></screen>  \r
+                               <screen><userinput>psql -U evergreen -h localhost -f Open-ILS/src/sql/Pg/1.6.0.5-1.6.0.6-upgrade-db.sql evergreen</userinput></screen> \r
+                               <screen><userinput>psql -U evergreen -h localhost -f Open-ILS/src/sql/Pg/1.6.0.6-1.6.0.7-upgrade-db.sql evergreen</userinput></screen> \r
+                               <screen><userinput>psql -U evergreen -h localhost -f Open-ILS/src/sql/Pg/1.6.0.7-1.6.0.8-upgrade-db.sql evergreen</userinput></screen> \r
                                <para>Download and run the the billing view hot-fix script</para>                               \r
-                               <screen>wget http://www.open-ils.org/downloads/1.6.0-mmbxs-cleanup.sql</screen>\r
-                               <screen>psql -U evergreen -h localhost -f 1.6.0-mmbxs-cleanup.sql</screen>      \r
+                               <screen><userinput>wget http://www.open-ils.org/downloads/1.6.0-mmbxs-cleanup.sql</userinput></screen>\r
+                               <screen><userinput>psql -U evergreen -h localhost -f 1.6.0-mmbxs-cleanup.sql</userinput></screen>       \r
                        </step>\r
                        <step>\r
-                               <para>As the <emphasis>opensrf</emphasis> user, \r
-                               copy /openils/conf/oils_web.xml.example to /openils/conf/oils_web.xml \r
+                               <para>As the <systemitem class="username">opensrf</systemitem> user, \r
+                               copy <filename>/openils/conf/oils_web.xml.example</filename> to <filename>/openils/conf/oils_web.xml</filename>\r
+                               <indexterm><primary>configuration files</primary><secondary>oils_web.xml</secondary></indexterm>\r
                                (needed for acquisitions templates).</para>\r
-                               <screen>cp /openils/conf/oils_web.xml.example /openils/conf/oils_web.xml</screen>\r
+                               <screen><userinput>cp /openils/conf/oils_web.xml.example /openils/conf/oils_web.xml</userinput></screen>\r
                        </step>\r
                        <step>\r
-                               <para>Update opensrf_core.xml and opensrf.xml by copying the new example files (/\r
-                               openils/conf/opensrf_core.xml.example and /openils/conf/opensrf.xml).</para>\r
-                               <screen>cp /openils/conf/opensrf_core.xml.example /openils/conf/opensrf_core.xml</screen>\r
-                               <screen>cp /openils/conf/opensrf.xml.example /openils/conf/opensrf.xml</screen>\r
+                               <para>Update <filename>opensrf_core.xml</filename> and <filename>opensrf.xml</filename> by copying the new example files \r
+                               (<filename>/openils/conf/opensrf_core.xml.example</filename> and <filename>/openils/conf/opensrf.xml</filename>).</para>\r
+                               <indexterm><primary>configuration files</primary><secondary>opensrf.xml</secondary></indexterm>\r
+                               <screen><userinput>cp /openils/conf/opensrf_core.xml.example /openils/conf/opensrf_core.xml</userinput></screen>\r
+                               <indexterm><primary>configuration files</primary><secondary>opensrf_core.xml</secondary></indexterm>\r
+                               <screen><userinput>cp /openils/conf/opensrf.xml.example /openils/conf/opensrf.xml</userinput></screen>\r
                        </step>\r
                        <step>\r
-                               <para>Update opensrf.xml with the database connection info:</para>\r
-                               <screen>perl Open-ILS/src/support-scripts/eg_db_config.pl --update-config --service all --user evergreen \</screen>\r
-                               <screen>--password evergreen --hostname localhost --port 5432 --database evergreen</screen>\r
+                               <para>Update <filename>opensrf.xml</filename> with the database connection info:</para>\r
+                               <screen>\r
+                               <userinput>\r
+                               perl Open-ILS/src/support-scripts/eg_db_config.pl --update-config --service all --user evergreen \\r
+                               --password evergreen --hostname localhost --port 5432 --database evergreen\r
+                               </userinput>\r
+                               </screen>\r
                        </step>\r
                        <step>\r
                                <para>Update /etc/apache2/startup.pl by copying the example from \r
-                               Open-ILS/examples/apache/startup.pl.</para>\r
+                               Open-ILS/examples/apache/startup.pl.</para><indexterm><primary>configuration files</primary><secondary>startup.pl</secondary></indexterm>\r
                        </step>\r
                        <step>\r
                                <para>Update /etc/apache2/eg_vhost.conf by copying the example from \r
-                               Open-ILS/examples/apache/eg_vhost.conf.</para>\r
+                               Open-ILS/examples/apache/eg_vhost.conf.</para><indexterm><primary>configuration files</primary><secondary>eg_vhost.conf</secondary></indexterm>\r
                        </step>\r
                        <step>\r
                        <para>Update /etc/apache2/sites-available/eg.conf by copying the example from Open-ILS/\r
-                       examples/apache/eg.conf.</para>\r
+                       examples/apache/eg.conf.</para><indexterm><primary>configuration files</primary><secondary>eg.conf</secondary></indexterm>\r
                        </step>\r
                        <step>\r
                                <para>Recover customizations you have made to the <application>Apache</application><indexterm><primary>Apache</primary></indexterm> \r
-                               configuration files. For example, if you purchased an SSL certificate<indexterm><primary>SSL certificate</primary></indexterm>, you \r
-                               will need to edit eg.conf to point to the appropriate SSL certificate files.</para>\r
+                               configuration files. For example, if you purchased an SSL certificate, you \r
+                               will need to edit <filename>eg.conf</filename> to point to the appropriate SSL certificate files.</para>\r
+                               <indexterm><primary>SSL</primary><secondary>certificates</secondary></indexterm>\r
                        </step> \r
                </procedure>    \r
        </simplesect>\r
                <title>Restart Evergreen and Test</title>\r
                <procedure>\r
                        <step>\r
-                               <para>As the <emphasis>opensrf</emphasis> user, start all \r
+                               <para>As the <systemitem class="username">opensrf</systemitem> user, start all \r
                                <application>Evergreen</application> and <application>OpenSRF</application> \r
                                services:</para>\r
-                               <screen>osrf_ctl.sh -l -a start_all</screen>\r
+                               <screen><userinput>osrf_ctl.sh -l -a start_all</userinput></screen>\r
                        </step>\r
                        <step>\r
-                               <para>As the <emphasis>opensrf</emphasis> user, run autogen to refresh the static \r
-                               organizational data files:</para>\r
-                               <screen>cd /openils/bin</screen>\r
-                               <screen>./autogen.sh -c /openils/conf/opensrf_core.xml -u</screen>\r
+                               <para>As the <systemitem class="username">opensrf</systemitem> user, run <command>autogen</command> to refresh the static \r
+                               organizational data files:</para><indexterm><primary>autogen</primary></indexterm>\r
+                               <screen><userinput>cd /openils/bin</userinput></screen>\r
+                               <screen><userinput>./autogen.sh -c /openils/conf/opensrf_core.xml -u</userinput></screen>\r
                                        \r
                        </step>\r
                        <step>\r
-                               <para>Start srfsh and try logging in  using your <application>Evergreen</application>\r
+                               <para>Start <command>srfsh</command> and try logging in  using your <application>Evergreen</application>\r
                                username and password:</para>\r
-                               <screen>/openils/bin/srfsh</screen> \r
-                               <screen>srfsh% login <emphasis>username password</emphasis></screen> \r
+                               <screen><userinput>/openils/bin/srfsh</userinput></screen> \r
+                               <screen><prompt>srfsh%</prompt> <userinput>login <option>username</option> <option>password</option></userinput></screen> \r
                        </step> \r
                        <step>\r
                                <para>Start the <application>Apache</application> web server.</para>\r
                        </step>\r
                </procedure>\r
+               <note>\r
+                       <para>If you encounter errors, refer to the <link linkend="troubleshooting">troubleshooting \r
+                       section</link> of this documentation for tips \r
+                       on finding solutions and seeking further assistance from the Evergreen community.</para>  \r
+               </note>\r
        </simplesect>\r
-       <note>\r
-               <para>If you encounter errors, refer to the <link linkend="troubleshooting">troubleshooting \r
-               section</link> of this documentation for tips \r
-               on finding solutions and seeking further assistance from the Evergreen community.</para>  \r
-       </note>\r
-<simplesect>\r
+       <simplesect>\r
                <title>Upgrading PostgreSQL from 8.2 to 8.3</title>\r
                <para>Evergreen 1.6 supports PostgreSQL version 8.3 and it is recommended that you upgrade PostgreSQL when you upgrade Evergreen to 1.6.</para>\r
-               <note><para>The Order of the following steps is very important.</para></note>\r
+               <note><para>The order of the following steps is very important.</para></note><indexterm><primary>databases</primary><secondary>PostgreSQL</secondary></indexterm>\r
                <procedure>\r
                        <step>\r
-                               <para>As opensrf, stop the evergreen and opensrf services:</para>\r
-                               <screen>osrf_ctl.sh -l -a stop_all</screen>\r
+                               <para>As <systemitem class="username">opensrf</systemitem>, stop the evergreen and opensrf services:</para>\r
+                               <screen><userinput>osrf_ctl.sh -l -a stop_all</userinput></screen>\r
                        </step>                 \r
                        <step>\r
-                               <para><link linkend="backupevergreendatabase">Backup the Evergreen database data</link></para>\r
+                               <para><link linkend="backingup">Backup the Evergreen database data</link></para>\r
                        </step>\r
                        <step>                  \r
                                <para>Create an empty Evergreen database in postgresql 8.3 by issuing the following commands as the postgres user:</para>\r
-                               <screen>createdb -E UNICODE evergreen</screen>\r
-                               <screen>createlang plperl   evergreen</screen>\r
-                               <screen>createlang plperlu  evergreen</screen>\r
-                               <screen>createlang plpgsql  evergreen</screen>\r
-                               <screen>psql -f /usr/share/postgresql/8.3/contrib/tablefunc.sql evergreen</screen>\r
-                               <screen>psql -f /usr/share/postgresql/8.3/contrib/tsearch2.sql evergreen</screen>\r
-                               <screen>psql -f /usr/share/postgresql/8.3/contrib/pgxml.sql evergreen</screen>          \r
-                       </step>\r
-                       <step>\r
-                               <para>As the postgres user on the PostgreSQL server, create a PostgreSQL user named evergreen for the database cluster:</para>\r
-                               <screen>createuser -P -s evergreen</screen>\r
-                               <para>Enter the password for the new PostgreSQL superuser (<quote>evergreen</quote>)</para>     \r
+                               <screen><userinput>createdb -E UNICODE evergreen</userinput></screen>\r
+                               <screen><userinput>createlang plperl   evergreen</userinput></screen>\r
+                               <screen><userinput>createlang plperlu  evergreen</userinput></screen>\r
+                               <screen><userinput>createlang plpgsql  evergreen</userinput></screen>\r
+                               <screen><userinput>psql -f /usr/share/postgresql/8.3/contrib/tablefunc.sql evergreen</userinput></screen>\r
+                               <screen><userinput>psql -f /usr/share/postgresql/8.3/contrib/tsearch2.sql evergreen</userinput></screen>\r
+                               <screen><userinput>psql -f /usr/share/postgresql/8.3/contrib/pgxml.sql evergreen</userinput></screen>           \r
+                       </step>\r
+                       <step>\r
+                               <para>As the postgres user on the PostgreSQL server, create a PostgreSQL user named <systemitem class="username">evergreen</systemitem> for the database cluster:</para>\r
+                               <screen><userinput>createuser -P -s evergreen</userinput></screen>\r
+                               <para>Enter the password for the new PostgreSQL superuser (<systemitem class="username">evergreen</systemitem>)</para>  \r
                        </step>                 \r
                        <step>\r
                                <para>Restore data from backup created in step 1.</para>\r
                        <step>\r
                                <para>To point tsearch2 to proper function names in 8.3, run the SQL script \r
                                <filename>/home/opensrf/Evergreen-ILS*/Open-ILS/src/sql/Pg/000.english.pg83.fts-config.sql</filename> using the <command>psql</command> command.</para>\r
+                               <screen><userinput>cd /home/opensrf/Evergreen-ILS*</userinput></screen>\r
+                               <screen><userinput>psql -f /Open-ILS/src/sql/Pg/000.english.pg83.fts-config.sql evergreen</userinput></screen>\r
                        </step>\r
                        <step>\r
                                <para><link linkend="upgraderestart">Restart Evergreen and OpenSRF services</link></para>\r