Move PostgreSQL ifnormation from ServersideInstallation to Admin misc.
[working/Evergreen.git] / 1.6 / admin / Upgrading-Evergreen_1.6.xml
index a194b37..bd39174 100644 (file)
@@ -2,14 +2,23 @@
 <chapter xmlns="http://docbook.org/ns/docbook" xmlns:xi="http://www.w3.org/2001/XInclude"\r
        xmlns:xl="http://www.w3.org/1999/xlink" version="5.0" xml:id="upgradingevergreen">\r
        <info>\r
 <chapter xmlns="http://docbook.org/ns/docbook" xmlns:xi="http://www.w3.org/2001/XInclude"\r
        xmlns:xl="http://www.w3.org/1999/xlink" version="5.0" xml:id="upgradingevergreen">\r
        <info>\r
-               <title>Upgrading Evergreen from 1.4 to 1.6.0.8</title>\r
+               <title>Upgrading Evergreen from 1.4 to 1.6.1</title>\r
                <abstract>\r
                        <para>This Chapter will explain the step-by-step process of upgrading <application>Evergreen\r
                <abstract>\r
                        <para>This Chapter will explain the step-by-step process of upgrading <application>Evergreen\r
-                       </application> from version 1.4 to 1.6, including steps to upgrade <application>OpenSRF</application>. Before \r
+                       </application> from version 1.4 to 1.6.1, including steps to upgrade <application>OpenSRF</application>. Before \r
                        upgrading, it is important to carefully plan an upgrade strategy to minimize system downtime and \r
                        service interruptions. All of the steps in this chapter are to be completed from the command line.</para>\r
                </abstract>\r
        </info>    \r
                        upgrading, it is important to carefully plan an upgrade strategy to minimize system downtime and \r
                        service interruptions. All of the steps in this chapter are to be completed from the command line.</para>\r
                </abstract>\r
        </info>    \r
+               <para>In the following instructions, you are asked to perform certain steps as either the root <systemitem class="username"></systemitem>  or <systemitem class="username">opensrf</systemitem> user.</para>\r
+               <itemizedlist>\r
+                       <listitem>Debian: To become the <systemitem class="username">root</systemitem> user, issue the <command>su</command> command and enter the password of the \r
+                       <systemitem class="username">root</systemitem> user.</listitem>\r
+                       <listitem>Ubuntu: To become the <systemitem class="username">root</systemitem> user, issue the <command>sudo su</command> command and enter the password of your current user.</listitem>\r
+               </itemizedlist>\r
+               <para>To switch from the <systemitem class="username">root</systemitem> user to a different user, issue the <command>su - [user]</command> command; for example, \r
+               <command>su - opensrf</command>. Once you have become a non-root user, to become the <systemitem class="username">root</systemitem> user again simply issue the exit command.</para> \r
+               <para>In the following instructions, <filename class='directory'>/path/to/OpenSRF/</filename> represents the path to the OpenSRF source directory.</para>\r
        <simplesect>\r
                <title>Stop Evergreen and back up data.</title>\r
                <procedure>\r
        <simplesect>\r
                <title>Stop Evergreen and back up data.</title>\r
                <procedure>\r
                </procedure>\r
        </simplesect>\r
        <simplesect>\r
                </procedure>\r
        </simplesect>\r
        <simplesect>\r
-               <title>Upgrade OpenSRF<indexterm><primary>OpenSRF</primary><secondary>1.2</secondary></indexterm> to 1.2</title>\r
+               <title>Upgrading OpenSRF to 1.4</title><indexterm><primary>OpenSRF</primary><secondary>1.2</secondary></indexterm>\r
                <procedure>\r
                        <step>\r
                                <para>As the <systemitem class="username">opensrf</systemitem> user, download and extract the source files for <application>OpenSRF</application> \r
                <procedure>\r
                        <step>\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><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
+                               1.4:</para>\r
+<screen><userinput>\r
+wget http://open-ils.org/downloads/OpenSRF-1.4.0.tar.gz\r
+tar xzf OpenSRF-1.4.0.tar.gz\r
+</userinput></screen>\r
+                               <para>A new directory OpenSRF-1.4.0 is 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
                                <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
                                <para>As the <systemitem class="username">root</systemitem> user, install the software prerequisites using the automatic \r
                                prerequisite installer.</para> \r
                        <step>  \r
                                <para>As the <systemitem class="username">root</systemitem> user, install the software prerequisites using the automatic \r
                                prerequisite installer.</para> \r
-                               <screen><userinput>aptitude install make</userinput></screen>\r
-                               <screen><userinput>cd /home/opensrf/OpenSRF-1.2.2</userinput></screen>\r
-                               \r
+<screen><userinput>\r
+aptitude install make\r
+cd /home/opensrf/OpenSRF-1.4.0\r
+</userinput></screen>          \r
                                <para>Replace <option>[distribution]</option> below with the following value \r
                                for your distribution:</para>\r
                                <itemizedlist>\r
                                <para>Replace <option>[distribution]</option> below with the following value \r
                                for your distribution:</para>\r
                                <itemizedlist>\r
                                                <para><option>ubuntu-karmic</option> for <systemitem class="osname">Ubuntu Karmic Koala \r
                                                (9.10)</systemitem></para>\r
                                        </listitem>\r
                                                <para><option>ubuntu-karmic</option> for <systemitem class="osname">Ubuntu Karmic Koala \r
                                                (9.10)</systemitem></para>\r
                                        </listitem>\r
+                                       <listitem>\r
+                                               <para><option>ubuntu-lucid</option> for <systemitem class="osname">Ubuntu Lucid Lynx\r
+                                               (10.04)</systemitem></para>\r
+                                       </listitem>\r
                                </itemizedlist>\r
                                </itemizedlist>\r
-                               <screen><userinput>make -f src/extras/Makefile.install <option>[distribution]</option></userinput></screen>\r
+<screen><userinput>\r
+cd /path/to/OpenSRF\r
+make -f src/extras/Makefile.install [distribution]\r
+</userinput></screen>\r
                                <para>This will install a number of packages required by OpenSRF on your system, \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
                                <para>This will install a number of packages required by OpenSRF on your system, \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
                                times whether it should install prerequisite modules - type <userinput>yes</userinput>.</para>\r
                        </step>\r
                        <step>  \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
+                               <para>As the <systemitem class="username">opensrf</systemitem> user, configure and compile OpenSRF:</para> \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
                                <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
+<screen><userinput>\r
+cd /home/opensrf/OpenSRF-1.4.0\r
+./configure --prefix=/openils --sysconfdir=/openils/conf\r
+make\r
+</userinput></screen>          \r
                        </step>\r
                        <step>  \r
                                <para>As the <systemitem class="username">root</systemitem> user, return to your OpenSRF build directory and install \r
                                OpenSRF:</para>\r
                        </step>\r
                        <step>  \r
                                <para>As the <systemitem class="username">root</systemitem> user, return to your OpenSRF build directory and install \r
                                OpenSRF:</para>\r
-                               <screen><userinput>cd /home/opensrf/OpenSRF-1.2.2</userinput></screen>\r
-                               <screen><userinput>make install</userinput></screen>\r
+<screen><userinput>\r
+cd /home/opensrf/OpenSRF-1.4.0\r
+make install\r
+</userinput></screen>\r
                        </step>\r
                        <step>\r
                        </step>\r
                        <step>\r
-                               <para>As the root user, change the ownership of the installed files to the opensrf \r
-                               user:</para>\r
+                               <para>As the <systemitem class="username">root</systemitem> user, change the ownership of the installed files to the \r
+                               <systemitem class="username">opensrf</systemitem> user:</para>\r
                                <screen><userinput>chown -R opensrf:opensrf /openils</userinput></screen>\r
                        </step>\r
                        <step>\r
                                <para>Restart and Test OpenSRF</para>\r
                                <screen><userinput>chown -R opensrf:opensrf /openils</userinput></screen>\r
                        </step>\r
                        <step>\r
                                <para>Restart and Test OpenSRF</para>\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><userinput>\r
+osrf_ctl.sh -l -a start_all\r
+/openils/bin/srfsh\r
+srfsh#  request opensrf.math add 2 2\r
+</userinput></screen>\r
+                               <para>You should see output such as:</para>\r
 <screen>\r
 Received Data: 4\r
 \r
 <screen>\r
 Received Data: 4\r
 \r
@@ -124,26 +148,28 @@ Request Time in seconds: 0.007519
 \r
 srfsh#\r
 </screen>      \r
 \r
 srfsh#\r
 </screen>      \r
-                               <para>If test completed successfully move onto next section. \r
+                               <para>If test completed successfully move onto the next section. \r
                                Otherwise, refer to the <link linkend="troubleshooting">troubleshooting</link> chapter \r
                                of this documentation.</para> \r
                        </step> \r
                </procedure>    \r
        </simplesect>\r
        <simplesect>\r
                                Otherwise, refer to the <link linkend="troubleshooting">troubleshooting</link> chapter \r
                                of this documentation.</para> \r
                        </step> \r
                </procedure>    \r
        </simplesect>\r
        <simplesect>\r
-               <title>Upgrade <application>Evergreen</application> to 1.6</title>\r
+               <title>Upgrade <application>Evergreen</application> to 1.6.1.2</title>\r
                <procedure>\r
                        <step>\r
                <procedure>\r
                        <step>\r
-                               <para>As the <systemitem class="username">opensrf</systemitem> user, download and extract <application>Evergreen 1.6</application>\r
+                               <para>As the <systemitem class="username">opensrf</systemitem> user, download and extract <application>Evergreen 1.6.1.2</application>\r
                                </para>\r
                                </para>\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
+<screen><userinput>\r
+wget http://open-ils.org/downloads/Evergreen-ILS-1.6.1.2.tar.gz\r
+tar xzf Evergreen-ILS-1.6.1.2.tar.gz\r
+</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 <systemitem class="username">root</systemitem> user, install the prerequisites:</para> \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 <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
+                               <screen><userinput>cd /home/opensrf/Evergreen-ILS-1.6.1.2</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
                                <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
@@ -169,25 +195,29 @@ srfsh#
                                                <para><option>ubuntu-karmic</option> for <systemitem class="osname">Ubuntu Karmic Koala \r
                                                (9.10)</systemitem></para>\r
                                        </listitem>\r
                                                <para><option>ubuntu-karmic</option> for <systemitem class="osname">Ubuntu Karmic Koala \r
                                                (9.10)</systemitem></para>\r
                                        </listitem>\r
+                                       <listitem>\r
+                                               <para><option>ubuntu-lucid</option> for <systemitem class="osname">Ubuntu Lucid Lynx \r
+                                               (10.04)</systemitem></para>\r
+                                       </listitem>\r
                                </itemizedlist>\r
                                <screen><userinput>make -f Open-ILS/src/extras/Makefile.install <option>[distribution]</option></userinput></screen>\r
                        </step>\r
                        <step>\r
                                <para>As the <systemitem class="username">opensrf</systemitem> user, configure and compile \r
                                <application>Evergreen</application>:</para>\r
                                </itemizedlist>\r
                                <screen><userinput>make -f Open-ILS/src/extras/Makefile.install <option>[distribution]</option></userinput></screen>\r
                        </step>\r
                        <step>\r
                                <para>As the <systemitem class="username">opensrf</systemitem> user, configure and compile \r
                                <application>Evergreen</application>:</para>\r
-                               <screen><userinput>cd /home/opensrf/Evergreen-ILS-1.6.0.8</userinput></screen>\r
+                               <screen><userinput>cd /home/opensrf/Evergreen-ILS-1.6.1.2</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 <systemitem class="username">root</systemitem> user, install \r
                                <application>Evergreen</application>:</para>\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 <systemitem class="username">root</systemitem> user, install \r
                                <application>Evergreen</application>:</para>\r
-                               <screen><userinput>make STAFF_CLIENT_BUILD_ID=rel_1_6_0_8 install</userinput></screen>\r
+                               <screen><userinput>make STAFF_CLIENT_BUILD_ID=rel_1_6_1_2 install</userinput></screen>\r
                        </step>\r
                        <step>\r
                                <para>Change to the <application>Evergreen</application> installation \r
                                directory:</para>\r
                        </step>\r
                        <step>\r
                                <para>Change to the <application>Evergreen</application> installation \r
                                directory:</para>\r
-                               <screen><userinput>cd /home/opensrf/Evergreen-ILS-1.6.0.8</userinput></screen>\r
+                               <screen><userinput>cd /home/opensrf/Evergreen-ILS-1.6.1.2</userinput></screen>\r
                        </step>\r
                        <step>\r
                                <para>As the <emphasis>root</emphasis> user, change all files to be owned by the \r
                        </step>\r
                        <step>\r
                                <para>As the <emphasis>root</emphasis> user, change all files to be owned by the \r
@@ -197,21 +227,20 @@ srfsh#
                        <step>\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
                        <step>\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
+<screen><userinput>\r
+cd /home/opensrf/Evergreen-ILS-1.6.1.2\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
 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
+</userinput></screen>\r
                        </step>\r
                        <step>\r
                                <para>As the <systemitem class="username">opensrf</systemitem> user, update server symlink in <filename class="directory">/openils/var/web/xul/</filename>:</para>\r
                        </step>\r
                        <step>\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
+<screen><userinput>\r
+cd /openils/var/web/xul/\r
+rm server\r
+ln -s rel_1_6_1_2/server\r
+</userinput></screen>\r
                        </step>\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
                        <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
@@ -222,15 +251,11 @@ psql -U evergreen -h localhost -f Open-ILS/src/sql/Pg/1.6.0.0-1.6.0.1-upgrade-db
 psql -U evergreen -h localhost -f Open-ILS/src/sql/Pg/1.6.0.1-1.6.0.2-upgrade-db.sql evergreen\r
 psql -U evergreen -h localhost -f Open-ILS/src/sql/Pg/1.6.0.2-1.6.0.3-upgrade-db.sql evergreen \r
 psql -U evergreen -h localhost -f Open-ILS/src/sql/Pg/1.6.0.3-1.6.0.4-upgrade-db.sql evergreen\r
 psql -U evergreen -h localhost -f Open-ILS/src/sql/Pg/1.6.0.1-1.6.0.2-upgrade-db.sql evergreen\r
 psql -U evergreen -h localhost -f Open-ILS/src/sql/Pg/1.6.0.2-1.6.0.3-upgrade-db.sql evergreen \r
 psql -U evergreen -h localhost -f Open-ILS/src/sql/Pg/1.6.0.3-1.6.0.4-upgrade-db.sql evergreen\r
-psql -U evergreen -h localhost -f Open-ILS/src/sql/Pg/1.6.0.4-1.6.0.5-upgrade-db.sql evergreen\r
-psql -U evergreen -h localhost -f Open-ILS/src/sql/Pg/1.6.0.5-1.6.0.6-upgrade-db.sql evergreen\r
-psql -U evergreen -h localhost -f Open-ILS/src/sql/Pg/1.6.0.6-1.6.0.7-upgrade-db.sql evergreen \r
-psql -U evergreen -h localhost -f Open-ILS/src/sql/Pg/1.6.0.7-1.6.0.8-upgrade-db.sql evergreen\r
+psql -U evergreen -h localhost -f Open-ILS/src/sql/Pg/1.6.0.4-1.6.1.0-upgrade-db.sql evergreen\r
+psql -U evergreen -h localhost -f Open-ILS/src/sql/Pg/1.6.1.0-1.6.1.1-upgrade-db.sql evergreen\r
+psql -U evergreen -h localhost -f Open-ILS/src/sql/Pg/1.6.1.1-1.6.1.2-upgrade-db.sql evergreen\r
 </userinput>\r
 </userinput>\r
-</screen> \r
-                               <para>Download and run the the billing view hot-fix script</para>                               \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
+</screen>      \r
                        </step>\r
                        <step>\r
                                <para>As the <systemitem class="username">opensrf</systemitem> user, \r
                        </step>\r
                        <step>\r
                                <para>As the <systemitem class="username">opensrf</systemitem> user, \r
@@ -249,12 +274,10 @@ psql -U evergreen -h localhost -f Open-ILS/src/sql/Pg/1.6.0.7-1.6.0.8-upgrade-db
                        </step>\r
                        <step>\r
                                <para>Update <filename>opensrf.xml</filename> with the database connection info:</para>\r
                        </step>\r
                        <step>\r
                                <para>Update <filename>opensrf.xml</filename> with the database connection info:</para>\r
-<screen>\r
-<userinput>\r
+<screen><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
 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
+</userinput></screen>\r
                        </step>\r
                        <step>\r
                                <para>Update /etc/apache2/startup.pl by copying the example from \r
                        </step>\r
                        <step>\r
                                <para>Update /etc/apache2/startup.pl by copying the example from \r
@@ -288,15 +311,19 @@ perl Open-ILS/src/support-scripts/eg_db_config.pl --update-config --service all
                        <step>\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
                        <step>\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
+<screen><userinput>\r
+cd /openils/bin\r
+./autogen.sh -c /openils/conf/opensrf_core.xml -u\r
+</userinput></screen>\r
                                        \r
                        </step>\r
                        <step>\r
                                <para>Start <command>srfsh</command> and try logging in  using your <application>Evergreen</application>\r
                                username and password:</para>\r
                                        \r
                        </step>\r
                        <step>\r
                                <para>Start <command>srfsh</command> and try logging in  using your <application>Evergreen</application>\r
                                username and password:</para>\r
-                               <screen><userinput>/openils/bin/srfsh</userinput></screen> \r
-                               <screen><prompt>srfsh%</prompt> <userinput>login <option>username</option> <option>password</option></userinput></screen> \r
+<screen>\r
+<userinput>/openils/bin/srfsh</userinput>\r
+<prompt>srfsh%</prompt> <userinput>login <option>username</option> <option>password</option></userinput>\r
+</screen> \r
                        </step> \r
                        <step>\r
                                <para>Start the <application>Apache</application> web server.</para>\r
                        </step> \r
                        <step>\r
                                <para>Start the <application>Apache</application> web server.</para>\r
@@ -309,8 +336,8 @@ perl Open-ILS/src/support-scripts/eg_db_config.pl --update-config --service all
                </note>\r
        </simplesect>\r
        <simplesect>\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
+               <title>Upgrading PostgreSQL from 8.2 to 8.4</title>\r
+               <para>Evergreen 1.6.1 supports PostgreSQL version 8.4 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><indexterm><primary>databases</primary><secondary>PostgreSQL</secondary></indexterm>\r
                <procedure>\r
                        <step>\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
@@ -320,17 +347,20 @@ perl Open-ILS/src/support-scripts/eg_db_config.pl --update-config --service all
                        <step>\r
                                <para><link linkend="backingup">Backup the Evergreen database data</link></para>\r
                        </step>\r
                        <step>\r
                                <para><link linkend="backingup">Backup the Evergreen database data</link></para>\r
                        </step>\r
+                       <step>\r
+                               <para>Upgrade to Postgresql 8.4 by removing old version and installing Postgresql 8.4</para>\r
+                       </step>\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
+                               <para>Create an empty Evergreen database in postgresql 8.4 by issuing the following commands as the postgres user:</para>\r
 <screen>\r
 <userinput>\r
 createdb -E UNICODE evergreen\r
 createlang plperl   evergreen\r
 createlang plperlu  evergreen\r
 createlang plpgsql  evergreen\r
 <screen>\r
 <userinput>\r
 createdb -E UNICODE evergreen\r
 createlang plperl   evergreen\r
 createlang plperlu  evergreen\r
 createlang plpgsql  evergreen\r
-psql -f /usr/share/postgresql/8.3/contrib/tablefunc.sql evergreen\r
-psql -f /usr/share/postgresql/8.3/contrib/tsearch2.sql evergreen\r
-psql -f /usr/share/postgresql/8.3/contrib/pgxml.sql evergreen\r
+psql -f /usr/share/postgresql/8.4/contrib/tablefunc.sql evergreen\r
+psql -f /usr/share/postgresql/8.4/contrib/tsearch2.sql evergreen\r
+psql -f /usr/share/postgresql/8.4/contrib/pgxml.sql evergreen\r
 </userinput>\r
 </screen>              \r
                        </step>\r
 </userinput>\r
 </screen>              \r
                        </step>\r
@@ -343,7 +373,7 @@ psql -f /usr/share/postgresql/8.3/contrib/pgxml.sql evergreen
                                <para>Restore data from backup created in step 1.</para>\r
                        </step>\r
                        <step>\r
                                <para>Restore data from backup created in step 1.</para>\r
                        </step>\r
                        <step>\r
-                               <para>To point tsearch2 to proper function names in 8.3, run the SQL script \r
+                               <para>To point tsearch2 to proper function names in 8.4, 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
                                <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
@@ -353,8 +383,8 @@ psql -f /usr/share/postgresql/8.3/contrib/pgxml.sql evergreen
                        </step>\r
                        <step>\r
                                <para>For additional information regarding upgrading PostgreSQL, see the following documentation in PostgreSQL:</para>\r
                        </step>\r
                        <step>\r
                                <para>For additional information regarding upgrading PostgreSQL, see the following documentation in PostgreSQL:</para>\r
-                               <para><ulink url="http://www.postgresql.org/docs/8.3/static/install-upgrading.html" /></para>\r
-                               <para><ulink url="http://www.postgresql.org/docs/8.3/interactive/textsearch-migration.html" /> \r
+                               <para><ulink url="http://www.postgresql.org/docs/8.4/static/install-upgrading.html" /></para>\r
+                               <para><ulink url="http://www.postgresql.org/docs/8.4/interactive/textsearch-migration.html" /> \r
                                </para>\r
                                <para><ulink url="http://www.postgresql.org/docs/current/static/tsearch2.html#AEN102824" /></para>\r
                        </step>\r
                                </para>\r
                                <para><ulink url="http://www.postgresql.org/docs/current/static/tsearch2.html#AEN102824" /></para>\r
                        </step>\r