Fix Upgrading from review by Ben Shum.

diff --git a/2.0/admin/Upgrading-Evergreen-2.0.xml b/2.0/admin/Upgrading-Evergreen-2.0.xml
index 68c9f69..324957d 100644 (file)
--- a/2.0/admin/Upgrading-Evergreen-2.0.xml
+++ b/2.0/admin/Upgrading-Evergreen-2.0.xml
@@ -15,7 +15,7 @@
                <itemizedlist>\r
                        <listitem>PostgreSQL: Version 8.4 is the minimum supported version of PostgreSQL. </listitem>\r
                        <listitem>Linux: Evergreen 2.0 has been tested on Debian Squeeze (6.0) and Ubuntu Lucid Lynx (10.04). If you are runnung an older version of these distributions, \r
-                       you may want to upgrade befor installing Evergreen 2.0. For instructions om upgrading these distribuitions, visit the \r
+                       you may want to upgrade befor installing Evergreen 2.0. For instructions on upgrading these distributions, visit the \r
                        <ulink url="http://www.debian.org/releases/squeeze/">Debian</ulink> or <ulink url="https://help.ubuntu.com/community/LucidUpgrades">Ubuntu</ulink> websites.</listitem>\r
                </itemizedlist>\r
                <para>In the following instructions, you are asked to perform certain steps as either the <systemitem class="username">root</systemitem>  or \r
@@ -154,9 +154,12 @@ srfsh#
        </section>\r
        <section xml:id="upgradingevergreen-upgrading_from_1.6_to_2.0">\r
                <title>Upgrade <application>Evergreen</application> from 1.6.1 to 2.0</title>\r
-               <note><para>8.4 is the minimum supported version of PostgreSQL. Evergreen 2.0 has been tested on Debian Squeeze (6.0) and Ubuntu Lucid (10.04). If you are runnung an older version of \r
-                       these distributions, you may want to upgrade befor installing Evergreen 2.0. For instructions om upgrading these distribuitions, visit the \r
-                       <ulink url="http://www.debian.org/releases/squeeze/">Debian</ulink> or <ulink url="https://help.ubuntu.com/community/LucidUpgrades">Ubuntu</ulink> websites.</para></note>\r
+               <note>\r
+                       <para>PostgreSQL 8.4 is the minimum supported version of PostgreSQL.</para> \r
+                       <para>Evergreen 2.0 has been tested on Debian Squeeze (6.0) and Ubuntu Lucid (10.04). If you are runnung an older version of \r
+                       these distributions, you may want to upgrade befor installing Evergreen 2.0. For instructions on upgrading these distribuitions, visit the \r
+                       <ulink url="http://www.debian.org/releases/squeeze/">Debian</ulink> or <ulink url="https://help.ubuntu.com/community/LucidUpgrades">Ubuntu</ulink> websites.</para>\r
+               </note>\r
                <procedure>\r
                        <step>\r
                                <para>As the <systemitem class="username">opensrf</systemitem> user, download and extract <application>Evergreen 2.0</application>\r
@@ -238,8 +241,8 @@ psql -U evergreen -h localhost -f Open-ILS/src/sql/Pg/2.0.0-2.0.1-upgrade-db.sql
                        <step>\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
+                               . (If upgrading from 1.6.1.x, <filename>oils_web.xml</filename> should already exist.)</para>\r
                                <indexterm><primary>configuration files</primary><secondary>oils_web.xml</secondary></indexterm>\r
-                               (needed for acquisitions templates).</para>\r
                                <screen><userinput>cp /openils/conf/oils_web.xml.example /openils/conf/oils_web.xml</userinput></screen>\r
                        </step>\r
                        <step>\r
@@ -249,6 +252,8 @@ psql -U evergreen -h localhost -f Open-ILS/src/sql/Pg/2.0.0-2.0.1-upgrade-db.sql
                                <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
+                               <caution><para>Copying these configuration files will remove any customizations you have made to them. Remember to redo your customizations after copying \r
+                               them.</para></caution>\r
                        </step>\r
                        <step>\r
                                <para>Update <filename>opensrf.xml</filename> with the database connection info:</para>\r
@@ -269,12 +274,12 @@ perl Open-ILS/src/support-scripts/eg_db_config.pl --update-config --service all
                        <para>Update /etc/apache2/sites-available/eg.conf by copying the example from Open-ILS/\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, you \r
+                       <caution>\r
+                               <para>Copying these Apache configuration files will remove any customizations you have made to them. Remember to redo your customizations after copying \r
+                               them. 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
+                       </caution> \r
                </procedure>    \r
        </section>\r
        <section xml:id="testing_after_upgrade">\r