mirror of
				https://github.com/postgres/postgres.git
				synced 2025-11-03 09:13:20 +03:00 
			
		
		
		
	Fix man page markup for <cmdsynopsis> with multiple variants
Command synopses using <cmdsynopsis> with multiple variants previously used <sbr> 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 <sbr> is supposed to break lines within a synopsis, not between them. So fix that by using multiple <cmdsynopsis> elements inside <refsynopsisdiv>. backpatched to 9.0
This commit is contained in:
		@@ -26,7 +26,9 @@ PostgreSQL documentation
 | 
				
			|||||||
   <group><arg>--verbose</arg><arg>-v</arg></group>
 | 
					   <group><arg>--verbose</arg><arg>-v</arg></group>
 | 
				
			||||||
   <arg>--table | -t <replaceable>table</replaceable> </arg>
 | 
					   <arg>--table | -t <replaceable>table</replaceable> </arg>
 | 
				
			||||||
   <arg><replaceable>dbname</replaceable></arg>
 | 
					   <arg><replaceable>dbname</replaceable></arg>
 | 
				
			||||||
   <sbr>
 | 
					  </cmdsynopsis>
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					  <cmdsynopsis>
 | 
				
			||||||
   <command>clusterdb</command>
 | 
					   <command>clusterdb</command>
 | 
				
			||||||
   <arg rep="repeat"><replaceable>connection-option</replaceable></arg>
 | 
					   <arg rep="repeat"><replaceable>connection-option</replaceable></arg>
 | 
				
			||||||
   <group><arg>--verbose</arg><arg>-v</arg></group>
 | 
					   <group><arg>--verbose</arg><arg>-v</arg></group>
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -25,7 +25,9 @@ PostgreSQL documentation
 | 
				
			|||||||
   <arg rep="repeat"><replaceable>connection-option</replaceable></arg>
 | 
					   <arg rep="repeat"><replaceable>connection-option</replaceable></arg>
 | 
				
			||||||
   <arg choice="plain"><replaceable>langname</replaceable></arg>
 | 
					   <arg choice="plain"><replaceable>langname</replaceable></arg>
 | 
				
			||||||
   <arg><replaceable>dbname</replaceable></arg>
 | 
					   <arg><replaceable>dbname</replaceable></arg>
 | 
				
			||||||
   <sbr>
 | 
					  </cmdsynopsis>
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					  <cmdsynopsis>
 | 
				
			||||||
   <command>createlang</command>
 | 
					   <command>createlang</command>
 | 
				
			||||||
   <arg rep="repeat"><replaceable>connection-option</replaceable></arg>
 | 
					   <arg rep="repeat"><replaceable>connection-option</replaceable></arg>
 | 
				
			||||||
   <group choice="plain"><arg>--list</arg><arg>-l</arg></group>
 | 
					   <group choice="plain"><arg>--list</arg><arg>-l</arg></group>
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -25,7 +25,9 @@ PostgreSQL documentation
 | 
				
			|||||||
   <arg rep="repeat"><replaceable>connection-option</replaceable></arg>
 | 
					   <arg rep="repeat"><replaceable>connection-option</replaceable></arg>
 | 
				
			||||||
   <arg choice="plain"><replaceable>langname</replaceable></arg>
 | 
					   <arg choice="plain"><replaceable>langname</replaceable></arg>
 | 
				
			||||||
   <arg><replaceable>dbname</replaceable></arg>
 | 
					   <arg><replaceable>dbname</replaceable></arg>
 | 
				
			||||||
   <sbr>
 | 
					  </cmdsynopsis>
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					  <cmdsynopsis>
 | 
				
			||||||
   <command>droplang</command>
 | 
					   <command>droplang</command>
 | 
				
			||||||
   <arg rep="repeat"><replaceable>connection-option</replaceable></arg>
 | 
					   <arg rep="repeat"><replaceable>connection-option</replaceable></arg>
 | 
				
			||||||
   <group choice="plain"><arg>--list</arg><arg>-l</arg></group>
 | 
					   <group choice="plain"><arg>--list</arg><arg>-l</arg></group>
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -21,14 +21,14 @@ PostgreSQL documentation
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
 <refsynopsisdiv>
 | 
					 <refsynopsisdiv>
 | 
				
			||||||
  <cmdsynopsis>
 | 
					  <cmdsynopsis>
 | 
				
			||||||
 | 
					 | 
				
			||||||
   <command>pg_ctl</command>
 | 
					   <command>pg_ctl</command>
 | 
				
			||||||
   <arg choice="plain">init[db]</arg>
 | 
					   <arg choice="plain">init[db]</arg>
 | 
				
			||||||
   <arg>-s</arg>
 | 
					   <arg>-s</arg>
 | 
				
			||||||
   <arg>-D <replaceable>datadir</replaceable></arg>
 | 
					   <arg>-D <replaceable>datadir</replaceable></arg>
 | 
				
			||||||
   <arg>-o <replaceable>options</replaceable></arg>
 | 
					   <arg>-o <replaceable>options</replaceable></arg>
 | 
				
			||||||
   <sbr>
 | 
					  </cmdsynopsis>
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					  <cmdsynopsis>
 | 
				
			||||||
   <command>pg_ctl</command>
 | 
					   <command>pg_ctl</command>
 | 
				
			||||||
   <arg choice="plain">start</arg>
 | 
					   <arg choice="plain">start</arg>
 | 
				
			||||||
   <arg>-w</arg>
 | 
					   <arg>-w</arg>
 | 
				
			||||||
@@ -39,8 +39,9 @@ PostgreSQL documentation
 | 
				
			|||||||
   <arg>-o <replaceable>options</replaceable></arg>
 | 
					   <arg>-o <replaceable>options</replaceable></arg>
 | 
				
			||||||
   <arg>-p <replaceable>path</replaceable></arg>
 | 
					   <arg>-p <replaceable>path</replaceable></arg>
 | 
				
			||||||
   <arg>-c</arg>
 | 
					   <arg>-c</arg>
 | 
				
			||||||
   <sbr>
 | 
					  </cmdsynopsis>
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					  <cmdsynopsis>
 | 
				
			||||||
   <command>pg_ctl</command>
 | 
					   <command>pg_ctl</command>
 | 
				
			||||||
   <arg choice="plain">stop</arg>
 | 
					   <arg choice="plain">stop</arg>
 | 
				
			||||||
   <arg>-W</arg>
 | 
					   <arg>-W</arg>
 | 
				
			||||||
@@ -54,8 +55,9 @@ PostgreSQL documentation
 | 
				
			|||||||
       <arg>i[mmediate]</arg>
 | 
					       <arg>i[mmediate]</arg>
 | 
				
			||||||
     </group>
 | 
					     </group>
 | 
				
			||||||
   </arg>
 | 
					   </arg>
 | 
				
			||||||
   <sbr>
 | 
					  </cmdsynopsis>
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					  <cmdsynopsis>
 | 
				
			||||||
   <command>pg_ctl</command>
 | 
					   <command>pg_ctl</command>
 | 
				
			||||||
   <arg choice="plain">restart</arg>
 | 
					   <arg choice="plain">restart</arg>
 | 
				
			||||||
   <arg>-w</arg>
 | 
					   <arg>-w</arg>
 | 
				
			||||||
@@ -71,25 +73,29 @@ PostgreSQL documentation
 | 
				
			|||||||
     </group>
 | 
					     </group>
 | 
				
			||||||
   </arg>
 | 
					   </arg>
 | 
				
			||||||
   <arg>-o <replaceable>options</replaceable></arg>
 | 
					   <arg>-o <replaceable>options</replaceable></arg>
 | 
				
			||||||
   <sbr>
 | 
					  </cmdsynopsis>
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					  <cmdsynopsis>
 | 
				
			||||||
   <command>pg_ctl</command>
 | 
					   <command>pg_ctl</command>
 | 
				
			||||||
   <arg choice="plain">reload</arg>
 | 
					   <arg choice="plain">reload</arg>
 | 
				
			||||||
   <arg>-s</arg>
 | 
					   <arg>-s</arg>
 | 
				
			||||||
   <arg>-D <replaceable>datadir</replaceable></arg>
 | 
					   <arg>-D <replaceable>datadir</replaceable></arg>
 | 
				
			||||||
   <sbr>
 | 
					  </cmdsynopsis>
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					  <cmdsynopsis>
 | 
				
			||||||
   <command>pg_ctl</command>
 | 
					   <command>pg_ctl</command>
 | 
				
			||||||
   <arg choice="plain">status</arg>
 | 
					   <arg choice="plain">status</arg>
 | 
				
			||||||
   <arg>-D <replaceable>datadir</replaceable></arg>
 | 
					   <arg>-D <replaceable>datadir</replaceable></arg>
 | 
				
			||||||
   <sbr>
 | 
					  </cmdsynopsis>
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					  <cmdsynopsis>
 | 
				
			||||||
   <command>pg_ctl</command>
 | 
					   <command>pg_ctl</command>
 | 
				
			||||||
   <arg choice="plain">kill</arg>
 | 
					   <arg choice="plain">kill</arg>
 | 
				
			||||||
   <arg><replaceable>signal_name</replaceable></arg>
 | 
					   <arg><replaceable>signal_name</replaceable></arg>
 | 
				
			||||||
   <arg><replaceable>process_id</replaceable></arg>
 | 
					   <arg><replaceable>process_id</replaceable></arg>
 | 
				
			||||||
   <sbr>
 | 
					  </cmdsynopsis>
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					  <cmdsynopsis>
 | 
				
			||||||
   <command>pg_ctl</command>
 | 
					   <command>pg_ctl</command>
 | 
				
			||||||
   <arg choice="plain">register</arg>
 | 
					   <arg choice="plain">register</arg>
 | 
				
			||||||
   <arg>-N <replaceable>servicename</replaceable></arg>
 | 
					   <arg>-N <replaceable>servicename</replaceable></arg>
 | 
				
			||||||
@@ -99,12 +105,12 @@ PostgreSQL documentation
 | 
				
			|||||||
   <arg>-w</arg>
 | 
					   <arg>-w</arg>
 | 
				
			||||||
   <arg>-t <replaceable>seconds</replaceable></arg>
 | 
					   <arg>-t <replaceable>seconds</replaceable></arg>
 | 
				
			||||||
   <arg>-o <replaceable>options</replaceable></arg>
 | 
					   <arg>-o <replaceable>options</replaceable></arg>
 | 
				
			||||||
   <sbr>
 | 
					  </cmdsynopsis>
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					  <cmdsynopsis>
 | 
				
			||||||
   <command>pg_ctl</command>
 | 
					   <command>pg_ctl</command>
 | 
				
			||||||
   <arg choice="plain">unregister</arg>
 | 
					   <arg choice="plain">unregister</arg>
 | 
				
			||||||
   <arg>-N <replaceable>servicename</replaceable></arg>
 | 
					   <arg>-N <replaceable>servicename</replaceable></arg>
 | 
				
			||||||
 | 
					 | 
				
			||||||
  </cmdsynopsis>
 | 
					  </cmdsynopsis>
 | 
				
			||||||
 </refsynopsisdiv>
 | 
					 </refsynopsisdiv>
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -26,11 +26,15 @@ PostgreSQL documentation
 | 
				
			|||||||
   <arg>--table | -t <replaceable>table</replaceable> </arg>
 | 
					   <arg>--table | -t <replaceable>table</replaceable> </arg>
 | 
				
			||||||
   <arg>--index | -i <replaceable>index</replaceable> </arg>
 | 
					   <arg>--index | -i <replaceable>index</replaceable> </arg>
 | 
				
			||||||
   <arg><replaceable>dbname</replaceable></arg>
 | 
					   <arg><replaceable>dbname</replaceable></arg>
 | 
				
			||||||
   <sbr>
 | 
					  </cmdsynopsis>
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					  <cmdsynopsis>
 | 
				
			||||||
   <command>reindexdb</command>
 | 
					   <command>reindexdb</command>
 | 
				
			||||||
   <arg rep="repeat"><replaceable>connection-option</replaceable></arg>
 | 
					   <arg rep="repeat"><replaceable>connection-option</replaceable></arg>
 | 
				
			||||||
   <arg>--all | -a</arg>
 | 
					   <arg>--all | -a</arg>
 | 
				
			||||||
   <sbr>
 | 
					  </cmdsynopsis>
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					  <cmdsynopsis>
 | 
				
			||||||
   <command>reindexdb</command>
 | 
					   <command>reindexdb</command>
 | 
				
			||||||
   <arg rep="repeat"><replaceable>connection-option</replaceable></arg>
 | 
					   <arg rep="repeat"><replaceable>connection-option</replaceable></arg>
 | 
				
			||||||
   <arg>--system | -s</arg>
 | 
					   <arg>--system | -s</arg>
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -32,7 +32,9 @@ PostgreSQL documentation
 | 
				
			|||||||
    <arg>( <replaceable class="parameter">column</replaceable> [,...] )</arg>
 | 
					    <arg>( <replaceable class="parameter">column</replaceable> [,...] )</arg>
 | 
				
			||||||
   </arg>
 | 
					   </arg>
 | 
				
			||||||
   <arg><replaceable>dbname</replaceable></arg>
 | 
					   <arg><replaceable>dbname</replaceable></arg>
 | 
				
			||||||
   <sbr>
 | 
					  </cmdsynopsis>
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					  <cmdsynopsis>
 | 
				
			||||||
   <command>vacuumdb</command>
 | 
					   <command>vacuumdb</command>
 | 
				
			||||||
   <arg rep="repeat"><replaceable>connection-option</replaceable></arg>
 | 
					   <arg rep="repeat"><replaceable>connection-option</replaceable></arg>
 | 
				
			||||||
   <group><arg>--full</arg><arg>-f</arg></group>
 | 
					   <group><arg>--full</arg><arg>-f</arg></group>
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user