Improve wording of initdb and pg_controldata manual pages.

gabrielle 

diff --git a/doc/src/sgml/ref/initdb.sgml b/doc/src/sgml/ref/initdb.sgml
index 04f047b0636103606409a3a38c273239a8eb588a..e3fdebdfd24450254ed606c15ca4d3a3f24d9bea 100644 (file)
--- a/doc/src/sgml/ref/initdb.sgml
+++ b/doc/src/sgml/ref/initdb.sgml
@@ -22,9 +22,9 @@ PostgreSQL documentation
  
   
    initdb
-   option
+   optionreplaceable>
    
-    --pgdata 
+    --pgdata=
     -D 
     directory
    
@@ -186,16 +186,14 @@ PostgreSQL documentation
      
 
      
-      -X directory
-      --xlogdir=directory
+      --pwfile=filename
       
        
-        This option specifies the directory where the transaction log
-        should be stored.
+        Makes initdb read the database superuser's password
+        from a file.  The first line of the file is taken as the password.
        
       
      
-
      
       -U username
       --username=username
@@ -226,14 +224,16 @@ PostgreSQL documentation
      
 
      
-      --pwfile=filename
+      -X directory
+      --xlogdir=directory
       
        
-        Makes initdb read the database superuser's password
-        from a file.  The first line of the file is taken as the password.
+        This option specifies the directory where the transaction log
+        should be stored.
        
       
      
+
     
    
 

diff --git a/doc/src/sgml/ref/pg_controldata.sgml b/doc/src/sgml/ref/pg_controldata.sgml
index 50b1909499c8d5aa9ce0e1e375dcfe2236d7b2ca..d39b6e18f88e8845558ef58498e83081644e306f 100644 (file)
--- a/doc/src/sgml/ref/pg_controldata.sgml
+++ b/doc/src/sgml/ref/pg_controldata.sgml
@@ -22,6 +22,7 @@ PostgreSQL documentation
  
   
    pg_controldata
+   option
    datadir
   
  

diff --git a/doc/src/sgml/ref/pg_ctl-ref.sgml b/doc/src/sgml/ref/pg_ctl-ref.sgml
index 307f66b8da3cd00bab1d4a8e347ad29636ed2252..608749f4c6ad56f446478b4f1fd875c021595945 100644 (file)
--- a/doc/src/sgml/ref/pg_ctl-ref.sgml
+++ b/doc/src/sgml/ref/pg_ctl-ref.sgml
@@ -499,22 +499,22 @@ PostgreSQL documentation
    Starting the Server
 
    
-    To start up a server:
+    To start the server:
 
 $ pg_ctl start
 
    
 
    
-    An example of starting the server, and waiting until the server is
-    accepting connection:
+    To start the server, waiting until the server is
+    accepting connections:
 
 $ pg_ctl -w start
 
    
 
    
-    For a server using port 5433, and
+    To start the server using port 5433, and
     running without fsync, use:
 
 $ pg_ctl -o "-F -p 5433" start
@@ -530,7 +530,10 @@ PostgreSQL documentation
 $ pg_ctl stop
 
     The -m option allows control over
-    how the server shuts down.
+    how the server shuts down:
+
+$ pg_ctl stop -m fast
+
    
   
 
@@ -557,7 +560,7 @@ PostgreSQL documentation
    
 
    
-    To restart using port 5433 and disable fsync upon restart:
+    To restart using port 5433, disabling fsync upon restart:
 
 $ pg_ctl -o "-F -p 5433" restart
 

diff --git a/doc/src/sgml/ref/postgres-ref.sgml b/doc/src/sgml/ref/postgres-ref.sgml
index 4437bf899706a15019c47fb178a3390aa900a98c..d332cbae1d8ba4a973e31dc68ecb69f5f73b8da7 100644 (file)
--- a/doc/src/sgml/ref/postgres-ref.sgml
+++ b/doc/src/sgml/ref/postgres-ref.sgml
@@ -66,9 +66,9 @@ PostgreSQL documentation
    The postgres command can also be called in
    single-user mode.  The primary use for this mode is during
    bootstrapping by .  Sometimes it is used
-   for debugging or disaster recovery (but note that running a single-user
+   for debugging or disaster recovery;  note that running a single-user
    server is not truly suitable for debugging the server, since no
-   realistic interprocess communication and locking will happen).
+   realistic interprocess communication and locking will happen.
    When invoked in single-user
    mode from the shell, the user can enter queries and the results
    will be printed to the screen, but in a form that is more useful
@@ -413,8 +413,8 @@ PostgreSQL documentation
       -P
       
        
-        Ignore system indexes when reading system tables (but still update
-        the indexes when modifying the tables).  This is useful when
+        Ignore system indexes when reading system tables, but still update
+        the indexes when modifying the tables.  This is useful when
         recovering from damaged system indexes.
        
       
@@ -763,13 +763,11 @@ PostgreSQL documentation
 
   
    To start postgres with a specific
-   port:
+   port, e.g. 1234:
 
 $ postgres -p 1234
 
-   This command will start up postgres
-   communicating through the port 1234. In order to connect to this
-   server using psql, you would need to run it as
+   To connect to this server using psql, specify this port with the -p option:
 
 $ psql -p 1234