Add command-line documentation for pg_upgrade.

diff --git a/doc/src/sgml/oid2name.sgml b/doc/src/sgml/oid2name.sgml
index d2ab3f4c2261debb3310f634d8d895acfedf3daa..cf73cc9c154860625b5c77f7398e153dea5613f8 100644 (file)
--- a/doc/src/sgml/oid2name.sgml
+++ b/doc/src/sgml/oid2name.sgml
@@ -1,4 +1,4 @@
-
+
 
 
  oid2name
@@ -31,16 +31,16 @@
    oid2name connects to a target database and
    extracts OID, filenode, and/or table name information.  You can also have
    it show database OIDs or tablespace OIDs.  The program is controlled by
-   a large number of command-line switches, as shown in
-   switches">.
+   a large number of command-line options, as shown in
+   options">.
   
 
-  switches">
-   <application>oid2name</> <span class="marked">switche</span>s
+  options">
+   <application>oid2name</> <span class="marked">option</span>s
    
     
      
-      Switch
+      Option
       Description
      
     
@@ -122,8 +122,8 @@
    and -t takes a tablename (actually, it's a LIKE
    pattern, so you can use things like foo%).
    You can use as many
-   of these switches as you like, and the listing will include all objects
-   matched by any of the switches.  But note that these switches can only
+   of these options as you like, and the listing will include all objects
+   matched by any of the options.  But note that these options can only
    show objects in the database given by -d.
   
 
@@ -131,7 +131,7 @@
    If you don't give any of -o, -f or -t,
    but do give -d, it will list all tables in the database
    named by -d.  In this mode, the -S and
-   -i switches control what gets listed.
+   -i options control what gets listed.
   
 
   

diff --git a/doc/src/sgml/pgupgrade.sgml b/doc/src/sgml/pgupgrade.sgml
index 0fd13fa7037d844d04e4f03f66387a34d32f4864..c12a3bb4da1b872f7b9eabfc30da60efc8541fc2 100644 (file)
--- a/doc/src/sgml/pgupgrade.sgml
+++ b/doc/src/sgml/pgupgrade.sgml
@@ -1,4 +1,4 @@
-
+
 
 
  pg_upgrade
@@ -27,6 +27,109 @@
 
  
 
+ 
+  <application>pg_upgrade</> options
+
+   
+    pg_upgrade accepts the following command-line arguments:
+
+    
+
+     
+      -d OLDDATADIR
+      --old-datadir OLDDATADIR
+      specify the old cluster data directory
+     
+
+     
+      -D NEWDATADIR
+      --new-datadir NEWDATADIR
+      specify the new cluster data directory
+     
+
+     
+      -b OLDBINDIR
+      --old-bindir OLDBINDIR
+      specify the old cluster executable directory
+     
+
+     
+      -B NEWBINDIR
+      --new-bindir NEWBINDIR
+      specify the new cluster executable directory
+     
+
+     
+      -p portnum
+      --old-port portnum
+      specify the old cluster port number
+     
+
+     
+      -P portnum
+      --new-port portnum
+      specify the new cluster port number
+     
+
+     
+      -u username
+      --user username
+      clusters superuser
+     
+
+     
+      -c
+      --check
+      check clusters only, don't change any data
+     
+
+     
+      -d
+      --debug
+      enable debugging
+     
+
+     
+      -G DEBUGFILENAME
+      --debugfile DEBUGFILENAME
+      output debugging activity to file
+     
+
+     
+      -k
+      --link
+      link instead of copying files to new cluster
+     
+
+     
+      -l LOGFILENAME
+      --logfile LOGFILENAME
+      log session activity to file
+     
+
+     
+      -v
+      --verbose
+      enable verbose output
+     
+
+     
+      -V
+      --version
+      display version information, then exit
+     
+
+     
+      -h
+      --help
+      show help, then exit
+     
+
+    
+   
+
+ 
+
  
   Upgrade Steps