Tuning for docbook2man.

diff --git a/doc/src/sgml/ref/createdb.sgml b/doc/src/sgml/ref/createdb.sgml
index 4466c30548fbb767159bbe4eac804c472b5dbd87..f0f6d803fa321dcbd1ef27af66d514c392b2fc59 100644 (file)
--- a/doc/src/sgml/ref/createdb.sgml
+++ b/doc/src/sgml/ref/createdb.sgml
@@ -1,5 +1,5 @@
 
 
@@ -23,7 +23,7 @@ Postgres documentation
   
    createdb
    options
-    choice="plain">dbname
+   dbname
    description
   
 
@@ -41,7 +41,7 @@ Postgres documentation
    Specifies the hostname of the machine on which the 
    postmaster
    is running.  If host begins with a slash, it is used 
-   as the directory for the Unix-domain socket.
+   as the directory for the Unix domain socket.
        
       
      
@@ -50,8 +50,8 @@ Postgres documentation
       -p, --port port
       
        
-   Specifies the Internet TCP/IP port or local Unix domain socket file 
-   extension on which the <application>postmaster>
+   Specifies the Internet TCP/IP port or the local Unix domain socket file 
+   extension on which the <command>postmaster>
    is listening for connections.
        
       
@@ -153,7 +153,7 @@ Postgres documentation
     The options -D, -T, and
     -E are converted into options for the underlying
     SQL command 
-    endterm="SQL-CREATEDATABASE-title">, which see for more information
+    endterm="SQL-CREATEDATABASE-title">; see there for more information
     about them.
    
   


diff --git a/doc/src/sgml/ref/pg_dump.sgml b/doc/src/sgml/ref/pg_dump.sgml

index 1fa64e38365b19c90e5600c4dc053c20fbe9eab5..ddcf5db63f8b76be72a2529008b6a6e1ae39493c 100644 (file)

--- a/doc/src/sgml/ref/pg_dump.sgml
+++ b/doc/src/sgml/ref/pg_dump.sgml
@@ -1,5 +1,5 @@
 
 
@@ -35,7 +35,6 @@ Postgres documentation
    -f file 
    -F format
    -i
-   
     -n -N 
    -o
    -O
@@ -45,11 +44,9 @@ Postgres documentation
    -v
    -x
    -Z 0...9
-   
    -h host
    -p port
    -u
-   
    dbname
   
  


diff --git a/doc/src/sgml/ref/pg_restore.sgml b/doc/src/sgml/ref/pg_restore.sgml

index dbd6ceb8504ccff09615ea9efa52c728bfd01059..246154a8df2d70179978bf56eb6a2ae87bc3bcee 100644 (file)

--- a/doc/src/sgml/ref/pg_restore.sgml
+++ b/doc/src/sgml/ref/pg_restore.sgml
@@ -1,4 +1,4 @@
-
+
 
 
  
@@ -32,7 +32,6 @@
     -f archive-file 
     -F format 
     -i  index 
-   
     -l 
     -L contents-file 
      -N   -o   -r  
@@ -45,11 +44,9 @@
     -T  trigger 
     -v 
     -x 
-   
     -h  host 
     -p  port 
     -u 
-   
     archive-file 
   
  


diff --git a/doc/src/sgml/ref/pgaccess-ref.sgml b/doc/src/sgml/ref/pgaccess-ref.sgml

index 64acad88245e237b6c1bdee2abbc513d7c617a47..beda85f37a95edc7e5427bc8c9d8df49aed09f2a 100644 (file)

--- a/doc/src/sgml/ref/pgaccess-ref.sgml
+++ b/doc/src/sgml/ref/pgaccess-ref.sgml
@@ -1,5 +1,5 @@
 
 
@@ -378,31 +378,6 @@ select * from invoices where year=[parameter "Year of selection"]
   
  
 
- 
-  Diagnostics
-
-  
-   If pgaccess fails to start up, with an error message roughly like this:
-
-
-Error in startup script: couldn't load file "libpgtcl.so": libpgtcl.so: cannot open shared object file: No such file or directory
-    while executing
-"load ${libpgtclpath}[info sharedlibextension]"
-    (procedure "main" line 8)
-    invoked from within
-"main $argc $argv"
-    (file "/usr/local/pgsql/share/pgaccess/main.tcl" line 249)
-
-
-   then you need to configure your runtime linker to find the
-   libpgtcl.so and libpq.so
-   libraries, most likely by setting
-   the LD_LIBRARY_PATH environment variable.  Consult
-   the PostgreSQL installation instructions
-   for more information.
-  
- 
-
  
   Notes
 


diff --git a/doc/src/sgml/ref/postgres-ref.sgml b/doc/src/sgml/ref/postgres-ref.sgml

index 6240e34d63ec49d3bf656482fec4f18a91876db7..83236297bf9c04d18c91b563eae8d0fd59ddc766 100644 (file)

--- a/doc/src/sgml/ref/postgres-ref.sgml
+++ b/doc/src/sgml/ref/postgres-ref.sgml
@@ -1,5 +1,5 @@
 
 
@@ -78,7 +78,12 @@ Postgres documentation
   
    The postgres executable is the actual
    PostgreSQL server process that processes
-   queries.  The second form above is how
+   queries.  It is normally not called directly; instead a 
+   linkend="app-postmaster"> multi-user server is started.
+  
+
+  
+   The second form above is how
    postgres is invoked by the 
    linkend="app-postmaster"> (only
    conceptually, since both postmaster and
@@ -255,7 +260,7 @@ Postgres documentation
     
 
      
-      -f [ s | i | m | n | h ]
+      -f { s | i | m | n | h }
       
        
    Forbids the use of particular scan and join methods:


diff --git a/doc/src/sgml/ref/vacuumdb.sgml b/doc/src/sgml/ref/vacuumdb.sgml

index c3634ba186b160d041c54f57fb4cf588c5392544..1efa7fce93bd47ce101ea43af7017f37272ff705 100644 (file)

--- a/doc/src/sgml/ref/vacuumdb.sgml
+++ b/doc/src/sgml/ref/vacuumdb.sgml
@@ -1,5 +1,5 @@
 
 
@@ -26,7 +26,6 @@ Postgres documentation
    -d dbname
    --analyze-z
    --verbose-v
-   
    --table 'table
     ( column [,...] )'
    




This is the main PostgreSQL git repository.
RSS
Atom

diff --git a/doc/src/sgml/ref/pg_dump.sgml b/doc/src/sgml/ref/pg_dump.sgml
index 1fa64e38365b19c90e5600c4dc053c20fbe9eab5..ddcf5db63f8b76be72a2529008b6a6e1ae39493c 100644 (file)
--- a/doc/src/sgml/ref/pg_dump.sgml
+++ b/doc/src/sgml/ref/pg_dump.sgml
@@ -1,5 +1,5 @@
 
 
@@ -35,7 +35,6 @@ Postgres documentation
    -f file 
    -F format
    -i
-   
     -n -N 
    -o
    -O
@@ -45,11 +44,9 @@ Postgres documentation
    -v
    -x
    -Z 0...9
-   
    -h host
    -p port
    -u
-   
    dbname
   
  

diff --git a/doc/src/sgml/ref/pg_restore.sgml b/doc/src/sgml/ref/pg_restore.sgml
index dbd6ceb8504ccff09615ea9efa52c728bfd01059..246154a8df2d70179978bf56eb6a2ae87bc3bcee 100644 (file)
--- a/doc/src/sgml/ref/pg_restore.sgml
+++ b/doc/src/sgml/ref/pg_restore.sgml
@@ -1,4 +1,4 @@
-
+
 
 
  
@@ -32,7 +32,6 @@
     -f archive-file 
     -F format 
     -i  index 
-   
     -l 
     -L contents-file 
      -N   -o   -r  
@@ -45,11 +44,9 @@
     -T  trigger 
     -v 
     -x 
-   
     -h  host 
     -p  port 
     -u 
-   
     archive-file 
   
  

diff --git a/doc/src/sgml/ref/pgaccess-ref.sgml b/doc/src/sgml/ref/pgaccess-ref.sgml
index 64acad88245e237b6c1bdee2abbc513d7c617a47..beda85f37a95edc7e5427bc8c9d8df49aed09f2a 100644 (file)
--- a/doc/src/sgml/ref/pgaccess-ref.sgml
+++ b/doc/src/sgml/ref/pgaccess-ref.sgml
@@ -1,5 +1,5 @@
 
 
@@ -378,31 +378,6 @@ select * from invoices where year=[parameter "Year of selection"]
   
  
 
- 
-  Diagnostics
-
-  
-   If pgaccess fails to start up, with an error message roughly like this:
-
-
-Error in startup script: couldn't load file "libpgtcl.so": libpgtcl.so: cannot open shared object file: No such file or directory
-    while executing
-"load ${libpgtclpath}[info sharedlibextension]"
-    (procedure "main" line 8)
-    invoked from within
-"main $argc $argv"
-    (file "/usr/local/pgsql/share/pgaccess/main.tcl" line 249)
-
-
-   then you need to configure your runtime linker to find the
-   libpgtcl.so and libpq.so
-   libraries, most likely by setting
-   the LD_LIBRARY_PATH environment variable.  Consult
-   the PostgreSQL installation instructions
-   for more information.
-  
- 
-
  
   Notes
 

diff --git a/doc/src/sgml/ref/postgres-ref.sgml b/doc/src/sgml/ref/postgres-ref.sgml
index 6240e34d63ec49d3bf656482fec4f18a91876db7..83236297bf9c04d18c91b563eae8d0fd59ddc766 100644 (file)
--- a/doc/src/sgml/ref/postgres-ref.sgml
+++ b/doc/src/sgml/ref/postgres-ref.sgml
@@ -1,5 +1,5 @@
 
 
@@ -78,7 +78,12 @@ Postgres documentation
   
    The postgres executable is the actual
    PostgreSQL server process that processes
-   queries.  The second form above is how
+   queries.  It is normally not called directly; instead a 
+   linkend="app-postmaster"> multi-user server is started.
+  
+
+  
+   The second form above is how
    postgres is invoked by the 
    linkend="app-postmaster"> (only
    conceptually, since both postmaster and
@@ -255,7 +260,7 @@ Postgres documentation
     
 
      
-      -f [ s | i | m | n | h ]
+      -f { s | i | m | n | h }
       
        
    Forbids the use of particular scan and join methods:


diff --git a/doc/src/sgml/ref/vacuumdb.sgml b/doc/src/sgml/ref/vacuumdb.sgml

index c3634ba186b160d041c54f57fb4cf588c5392544..1efa7fce93bd47ce101ea43af7017f37272ff705 100644 (file)

--- a/doc/src/sgml/ref/vacuumdb.sgml
+++ b/doc/src/sgml/ref/vacuumdb.sgml
@@ -1,5 +1,5 @@
 
 
@@ -26,7 +26,6 @@ Postgres documentation
    -d dbname
    --analyze-z
    --verbose-v
-   
    --table 'table
     ( column [,...] )'
    

diff --git a/doc/src/sgml/ref/vacuumdb.sgml b/doc/src/sgml/ref/vacuumdb.sgml
index c3634ba186b160d041c54f57fb4cf588c5392544..1efa7fce93bd47ce101ea43af7017f37272ff705 100644 (file)
--- a/doc/src/sgml/ref/vacuumdb.sgml
+++ b/doc/src/sgml/ref/vacuumdb.sgml
@@ -1,5 +1,5 @@
 
 
@@ -26,7 +26,6 @@ Postgres documentation
    -d dbname
    --analyze-z
    --verbose-v
-   
    --table 'table
     ( column [,...] )'