pg_upgrade docs: clarify rsync and move verification step

These are adjustments based on someone using the new standby upgrade
steps.

Report by Andy Colson

Backpatch through 9.5

diff --git a/doc/src/sgml/ref/pgupgrade.sgml b/doc/src/sgml/ref/pgupgrade.sgml
index ebc0d58887e1b977357d7a26e6785f1a15fed387..fcb03161edff261b212cb81510767e55c273f3ce 100644 (file)
--- a/doc/src/sgml/ref/pgupgrade.sgml
+++ b/doc/src/sgml/ref/pgupgrade.sgml
@@ -310,8 +310,21 @@ NET STOP postgresql-9.0
     </para>
 
     <para>
-     Streaming replication and log-shipping standby servers can remain running until
-     a later step.
+     Streaming replication and log-shipping standby servers can
+     remain running until a later step.
+    </para>
+   </step>
+
+   <step>
+    <title>Verify standby servers</title>
+
+    <para>
+     If you are upgrading Streaming Replication and Log-Shipping standby
+     servers, verify that the old standby servers are caught up by running
+     <application>pg_controldata</> against the old primary and standby
+     clusters.  Verify that the <quote>Latest checkpoint location</>
+     values match in all clusters.  (There will be a mismatch if old
+     standby servers were shut down before the old primary.)
     </para>
    </step>
 
@@ -404,7 +417,9 @@ pg_upgrade.exe
      If you have Streaming Replication (<xref
      linkend="streaming-replication">) or Log-Shipping (<xref
      linkend="warm-standby">) standby servers, follow these steps to
-     upgrade them (before starting any servers):
+     upgrade them.  You will not be running <application>pg_upgrade</>
+     on the standby servers, but rather <application>rsync</>.  Do not
+     start any servers yet.
     </para>
 
     <substeps>
@@ -447,18 +462,6 @@ pg_upgrade.exe
       </para>
      </step>
 
-     <step>
-      <title>Verify standby servers</title>
-
-      <para>
-       To prevent old standby servers from being modified, run
-       <application>pg_controldata</> against the primary and standby
-       clusters and verify that the <quote>Latest checkpoint location</>
-       values match in all clusters.  (This requires the standbys to be
-       shut down after the primary.)
-      </para>
-     </step>
-
      <step>
       <title>Save configuration files</title>