Fix man page markup for with multiple variants

Command synopses using  with multiple variants previously used
 to break lines between variants.  The new man page toolchain introduced
in 9.0 makes a mess out of that, and that markup was probably wrong all along,
because  is supposed to break lines within a synopsis, not between them.
So fix that by using multiple  elements inside .

backpatched to 9.0

diff --git a/doc/src/sgml/ref/clusterdb.sgml b/doc/src/sgml/ref/clusterdb.sgml
index 4a3a339557278547add6bb3b66bbbba44a869119..f57f0b3dddb2eea461a09663cb0df4455b876aa9 100644 (file)
--- a/doc/src/sgml/ref/clusterdb.sgml
+++ b/doc/src/sgml/ref/clusterdb.sgml
@@ -26,7 +26,9 @@ PostgreSQL documentation
    --verbose-v
    --table | -t table 
    dbname
-   
+  
+
+  
    clusterdb
    connection-option
    --verbose-v

diff --git a/doc/src/sgml/ref/createlang.sgml b/doc/src/sgml/ref/createlang.sgml
index 5db5e6cd41296e385c4e982bfc0758033d83836b..e157396de70445e422ee1fe85b738338b1df96bc 100644 (file)
--- a/doc/src/sgml/ref/createlang.sgml
+++ b/doc/src/sgml/ref/createlang.sgml
@@ -25,7 +25,9 @@ PostgreSQL documentation
    connection-option
    langname
    dbname
-   
+  
+
+  
    createlang
    connection-option
    --list-l

diff --git a/doc/src/sgml/ref/droplang.sgml b/doc/src/sgml/ref/droplang.sgml
index a92cd932eb1fdd8d69fe41b98822939f5c4f4586..f0e2bf9594621f2131de013e1827d7cae50f161e 100644 (file)
--- a/doc/src/sgml/ref/droplang.sgml
+++ b/doc/src/sgml/ref/droplang.sgml
@@ -25,7 +25,9 @@ PostgreSQL documentation
    connection-option
    langname
    dbname
-   
+  
+
+  
    droplang
    connection-option
    --list-l

diff --git a/doc/src/sgml/ref/pg_ctl-ref.sgml b/doc/src/sgml/ref/pg_ctl-ref.sgml
index 7494b5debb0f7edf0a54c58bb5f648817c576fa3..df3794f8cd3903d0fbdaf6cdc2b6b4e1b9d3cdce 100644 (file)
--- a/doc/src/sgml/ref/pg_ctl-ref.sgml
+++ b/doc/src/sgml/ref/pg_ctl-ref.sgml
@@ -21,14 +21,14 @@ PostgreSQL documentation
 
  
   
-
    pg_ctl
    init[db]
    -s
    -D datadir
    -o options
-   >
+  >
 
+  
    pg_ctl
    start
    -w
@@ -39,8 +39,9 @@ PostgreSQL documentation
    -o options
    -p path
    -c
-   >
+  >
 
+  
    pg_ctl
    stop
    -W
@@ -54,8 +55,9 @@ PostgreSQL documentation
        i[mmediate]
      
    
-   >
+  >
 
+  
    pg_ctl
    restart
    -w
@@ -71,25 +73,29 @@ PostgreSQL documentation
      
    
    -o options
-   >
+  >
 
+  
    pg_ctl
    reload
    -s
    -D datadir
-   >
+  >
 
+  
    pg_ctl
    status
    -D datadir
-   >
+  >
 
+  
    pg_ctl
    kill
    signal_name
    process_id
-   >
+  >
 
+  
    pg_ctl
    register
    -N servicename
@@ -99,12 +105,12 @@ PostgreSQL documentation
    -w
    -t seconds
    -o options
-   >
+  >
 
+  
    pg_ctl
    unregister
    -N servicename
-
   
  
 

diff --git a/doc/src/sgml/ref/reindexdb.sgml b/doc/src/sgml/ref/reindexdb.sgml
index fb680ece70db60748c76781e0fa7d8250451c295..ddbf0ca65f09c9c1ab3e85129d4b60efc2b282c7 100644 (file)
--- a/doc/src/sgml/ref/reindexdb.sgml
+++ b/doc/src/sgml/ref/reindexdb.sgml
@@ -26,11 +26,15 @@ PostgreSQL documentation
    --table | -t table 
    --index | -i index 
    dbname
-   
+  
+
+  
    reindexdb
    connection-option
    --all | -a
-   
+  
+
+  
    reindexdb
    connection-option
    --system | -s

diff --git a/doc/src/sgml/ref/vacuumdb.sgml b/doc/src/sgml/ref/vacuumdb.sgml
index 43e6d5effc812323868658c20c0108e88dcb4d11..b4833f12525775d78ba8342748455e21e6d3d434 100644 (file)
--- a/doc/src/sgml/ref/vacuumdb.sgml
+++ b/doc/src/sgml/ref/vacuumdb.sgml
@@ -32,7 +32,9 @@ PostgreSQL documentation
     ( column [,...] )
    
    dbname
-   
+  
+
+  
    vacuumdb
    connection-option
    --full-f