From 36cf0b18f5c7db870f8b0338ee43e84c32ad4661 Mon Sep 17 00:00:00 2001
From: David Steele <david@pgmasters.net>
Date: Fri, 3 Jun 2016 18:59:12 -0400
Subject: [PATCH] Update installation documentation.

* Recommended install location for pgBackRest modules is now /usr/share/perl5 since /usr/lib/perl5 has been removed from the search path in newer versions of Perl.

* Added instructions for removing prior versions of pgBackRest.
---
 doc/xml/release.xml    | 14 ++++++++++++++
 doc/xml/user-guide.xml | 30 ++++++++++++++++++++++++++++--
 2 files changed, 42 insertions(+), 2 deletions(-)

diff --git a/doc/xml/release.xml b/doc/xml/release.xml
index f71771183..3829ee387 100644
--- a/doc/xml/release.xml
+++ b/doc/xml/release.xml
@@ -84,6 +84,20 @@
     </contributor-list>
 
     <release-list>
+         <release date="XXXX-XX-XX" version="1.03dev" title="UNDER DEVELOPMENT">
+             <release-doc-list>
+                 <release-refactor-list>
+                    <release-item>
+                        <p>Recommended install location for <backrest/> modules is now <path>/usr/share/perl5</path> since <path>/usr/lib/perl5</path> has been removed from the search path in newer versions of Perl.</p>
+                    </release-item>
+
+                    <release-item>
+                        <p>Added instructions for removing prior versions of <backrest/>.</p>
+                    </release-item>
+                </release-refactor-list>
+            </release-doc-list>
+         </release>
+
          <release date="2016-06-02" version="1.02" title="Bug Fix for Perl 5.22">
              <release-core-list>
                  <release-bug-list>
diff --git a/doc/xml/user-guide.xml b/doc/xml/user-guide.xml
index 45f7e8cc1..f75c96b71 100644
--- a/doc/xml/user-guide.xml
+++ b/doc/xml/user-guide.xml
@@ -11,8 +11,7 @@
         <variable key="user-guide-os" keyword="default">Debian/Ubuntu</variable>
         <variable key="user-guide-os" keyword="co6">RHEL/CentOS 6</variable>
 
-        <variable key="perl-lib-path" keyword="default">/usr/lib/perl5</variable>
-        <variable key="perl-lib-path" keyword="co6">/usr/share/perl5</variable>
+        <variable key="perl-lib-path">/usr/share/perl5</variable>
         <variable key="perl-bin-path">/usr/bin</variable>
 
         <variable key="backrest-repo-path">/var/lib/pgbackrest</variable>
@@ -192,6 +191,33 @@
             </execute>
         </execute-list>
 
+        <p>If <backrest/> has been installed before it's best to be sure that no prior copies of it are still installed.  Depending on how old the version of pgBackRest is it may have been installed in a few different locations.  The following commands will remove all prior versions of pgBackRest.</p>
+
+        <execute-list host="{[host-db-master]}">
+            <title>Remove prior <backrest/> installations</title>
+
+            <execute user="root">
+                <exe-cmd>rm -f /usr/bin/pgbackrest</exe-cmd>
+            </execute>
+            <execute user="root">
+                <exe-cmd>rm -f /usr/bin/pg_backrest</exe-cmd>
+            </execute>
+            <execute user="root">
+                <exe-cmd>rm -rf /usr/lib/perl5/BackRest</exe-cmd>
+            </execute>
+            <execute user="root">
+                <exe-cmd>rm -rf {[perl-lib-path]}/BackRest</exe-cmd>
+            </execute>
+            <execute user="root">
+                <exe-cmd>rm -rf /usr/lib/perl5/pgBackRest</exe-cmd>
+            </execute>
+            <execute user="root">
+                <exe-cmd>rm -rf {[perl-lib-path]}/pgBackRest</exe-cmd>
+            </execute>
+        </execute-list>
+
+        <p>The new version can now be installed.</p>
+
         <execute-list host="{[host-db-master]}">
             <title>Install <backrest/></title>