postgres.git / summary / log / commit / refs

commit    cada05eb6c2d8effb705ef23dad59ca27f24c9c3
Author:   Bruce Momjian <bruce@momjian.us>
Date:     Mon Aug 31 21:36:22 2020 +0000
First released in: 14.0, 9.5.24, 9.6.20, 10.15, 11.10, 12.5, 13.0

    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


 doc/src/sgml/ref/pgupgrade.sgml | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/doc/src/sgml/ref/pgupgrade.sgml b/doc/src/sgml/ref/pgupgrade.sgml
index 72cb79a59e5..7a7eec66182 100644
--- a/doc/src/sgml/ref/pgupgrade.sgml
+++ b/doc/src/sgml/ref/pgupgrade.sgml
@@ -481,9 +481,10 @@ pg_upgrade.exe
 
       <para>
        Save any configuration files from the old standbys' configuration
-       directories you need to keep, e.g.  <filename>postgresql.conf</>,
-       <literal>recovery.conf</>, because these will be overwritten or
-       removed in the next step.
+       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>
 


[parent: 6d33681f57bb]