pg_upgrade doc: mention saving postgresql.conf.auto files

Also mention files included by postgresql.conf.

Reported-by: Álvaro Herrera
Discussion: https://postgr.es/m/08AD4526-75AB-457B-B2DD-099663F28040@yesql.se

Backpatch-through: 9.5

diff --git a/doc/src/sgml/ref/pgupgrade.sgml b/doc/src/sgml/ref/pgupgrade.sgml
index dc5fb35bb0d0a94701426ed3653a41823ab6b442..fc5cc8d4a25a7a8b496bbc73a3516a2d592f626d 100644 (file)
--- a/doc/src/sgml/ref/pgupgrade.sgml
+++ b/doc/src/sgml/ref/pgupgrade.sgml
@@ -480,10 +480,11 @@ pg_upgrade.exe
       <title>Save configuration files</title>
 
       <para>
-       Save any configuration files from the old standbys' data
-       directories you need to keep, e.g.  <filename>postgresql.conf</>,
-       <literal>recovery.conf</>, because these will be overwritten or
-       removed in the next step.
+       Save any configuration files from the old standbys' configuration
+       directories you need to keep, e.g.  <filename>postgresql.conf</filename>
+       (and any files included by it), <filename>postgresql.auto.conf</filename>,
+       <literal>recovery.conf</literal>, <literal>pg_hba.conf</literal>,
+       because these will be overwritten or removed in the next step.
       </para>
      </step>
 
@@ -571,7 +572,8 @@ rsync --archive --delete --hard-links --size-only --no-inc-recursive /vol1/pg_tb
     <para>
      If you modified <filename>pg_hba.conf</>, restore its original settings.
      It might also be necessary to adjust other configuration files in the new
-     cluster to match the old cluster, e.g. <filename>postgresql.conf</>.
+     cluster to match the old cluster, e.g., <filename>postgresql.conf</filename>
+     (and any files included by it), <filename>postgresql.auto.conf</filename>.
     </para>
    </step>