doc: mention datadir locations are actually config locations

Technically, pg_upgrade's --old-datadir and --new-datadir are
configuration directories, not necessarily data directories.  This is
reflected in the 'postgres' manual page, so do the same for pg_upgrade.

Reported-by: Yves Goergen
Bug: 14898

Discussion: https://postgr.es/m/20171110220912[email protected]

Backpatch-through: 10

diff --git a/doc/src/sgml/ref/pgupgrade.sgml b/doc/src/sgml/ref/pgupgrade.sgml
index aaa4b04a42408672d91de201099da670b699041c..ffa400ad849ff4d30b655a2b32cfd167fa239756 100644 (file)
--- a/doc/src/sgml/ref/pgupgrade.sgml
+++ b/doc/src/sgml/ref/pgupgrade.sgml
@@ -24,9 +24,9 @@
    -B
    newbindir
    -d
-   olddatadir
+   oldconfigdir
    -D
-   newdatadir
+   newconfigdir
    option
   
  
@@ -99,16 +99,16 @@
      
 
      
-      -d datadir
-      --old-datadir=datadir
-      the old cluster data directory; environment
+      -d configdir
+      --old-datadir=configdir
+      the old database cluster configuration directory; environment
       variable PGDATAOLD
      
 
      
-      -D datadir
-      --new-datadir=datadir
-      the new cluster data directory; environment
+      -D configdir
+      --new-datadir=configdir
+      the new database cluster configuration directory; environment
       variable PGDATANEW
      
 
@@ -476,7 +476,7 @@ pg_upgrade.exe
       Save configuration files
 
       
-       Save any configuration files from the old standbys' data
+       Save any configuration files from the old standbys' configuration
        directories you need to keep, e.g.  postgresql.conf,
        recovery.conf, because these will be overwritten or
        removed in the next step.