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 f4a64615f36e186741c5fd7a9f46b88c423c77c0..63cb5cbc67c95158c68e26433f0e0b0cbc33a8de 100644 (file)
--- a/doc/src/sgml/ref/pgupgrade.sgml
+++ b/doc/src/sgml/ref/pgupgrade.sgml
@@ -515,9 +515,10 @@ pg_upgrade.exe
 
       
        Save any configuration files from the old standbys' configuration
-       directories you need to keep, e.g.  postgresql.conf,
-       pg_hba.conf, because these will be overwritten or
-       removed in the next step.
+       directories you need to keep, e.g.  postgresql.conf
+       (and any files included by it), postgresql.auto.conf,
+       pg_hba.conf, because these will be overwritten
+       or removed in the next step.
       
      
 
@@ -605,7 +606,8 @@ rsync --archive --delete --hard-links --size-only --no-inc-recursive /vol1/pg_tb
     
      If you modified 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. postgresql.conf.
+     cluster to match the old cluster, e.g., postgresql.conf
+     (and any files included by it), postgresql.auto.conf.