diff --git a/doc/src/sgml/ref/clusterdb.sgml b/doc/src/sgml/ref/clusterdb.sgml
index e0246b3bca20a4e89fda4a81e038dfcc8689f97d..097ea912f1c7f6a0578fb7bbb3e43a9987d2cfe7 100644
--- a/doc/src/sgml/ref/clusterdb.sgml
+++ b/doc/src/sgml/ref/clusterdb.sgml
@@ -23,16 +23,16 @@ PostgreSQL documentation
<cmdsynopsis>
<command>clusterdb</command>
<arg rep="repeat"><replaceable>connection-option</replaceable></arg>
- <group><arg><option>--verbose</option></arg><arg><option>-v</option></arg></group>
- <arg><group choice="plain"><arg><option>--table</option></arg><arg><option>-t</option></arg></group> <replaceable>table</replaceable> </arg>
- <arg><replaceable>dbname</replaceable></arg>
+ <group choice="opt"><arg choice="plain"><option>--verbose</option></arg><arg choice="plain"><option>-v</option></arg></group>
+ <arg choice="opt"><group choice="plain"><arg choice="plain"><option>--table</option></arg><arg choice="plain"><option>-t</option></arg></group> <replaceable>table</replaceable> </arg>
+ <arg choice="opt"><replaceable>dbname</replaceable></arg>
</cmdsynopsis>
<cmdsynopsis>
<command>clusterdb</command>
<arg rep="repeat"><replaceable>connection-option</replaceable></arg>
- <group><arg><option>--verbose</option></arg><arg><option>-v</option></arg></group>
- <group><arg><option>--all</option></arg><arg><option>-a</option></arg></group>
+ <group choice="opt"><arg choice="plain"><option>--verbose</option></arg><arg choice="plain"><option>-v</option></arg></group>
+ <group choice="plain"><arg choice="plain"><option>--all</option></arg><arg choice="plain"><option>-a</option></arg></group>
</cmdsynopsis>
</refsynopsisdiv>
diff --git a/doc/src/sgml/ref/createdb.sgml b/doc/src/sgml/ref/createdb.sgml
index cbbc5c05455371a5e0efeb7bc2ef190b45d4c08f..7dbedc2e90987d6479ed5a50f6a300380803fa9c 100644
--- a/doc/src/sgml/ref/createdb.sgml
+++ b/doc/src/sgml/ref/createdb.sgml
@@ -24,8 +24,8 @@ PostgreSQL documentation
<command>createdb</command>
<arg rep="repeat"><replaceable>connection-option</replaceable></arg>
<arg rep="repeat"><replaceable>option</replaceable></arg>
- <arg><replaceable>dbname</replaceable></arg>
- <arg><replaceable>description</replaceable></arg>
+ <arg choice="opt"><replaceable>dbname</replaceable>
+ <arg choice="opt"><replaceable>description</replaceable></arg></arg>
</cmdsynopsis>
</refsynopsisdiv>
diff --git a/doc/src/sgml/ref/createlang.sgml b/doc/src/sgml/ref/createlang.sgml
index 4ca32fba39a70583276075f2f1576e984d9a45e2..2bc43627e5462614dcd7b3361cc9d024b9f8e698 100644
--- a/doc/src/sgml/ref/createlang.sgml
+++ b/doc/src/sgml/ref/createlang.sgml
@@ -24,14 +24,14 @@ PostgreSQL documentation
<command>createlang</command>
<arg rep="repeat"><replaceable>connection-option</replaceable></arg>
<arg choice="plain"><replaceable>langname</replaceable></arg>
- <arg><replaceable>dbname</replaceable></arg>
+ <arg choice="opt"><replaceable>dbname</replaceable></arg>
</cmdsynopsis>
<cmdsynopsis>
<command>createlang</command>
<arg rep="repeat"><replaceable>connection-option</replaceable></arg>
- <group choice="plain"><arg><option>--list</option></arg><arg><option>-l</option></arg></group>
- <arg choice="plain"><replaceable>dbname</replaceable></arg>
+ <group choice="plain"><arg choice="plain"><option>--list</option></arg><arg choice="plain"><option>-l</option></arg></group>
+ <arg choice="opt"><replaceable>dbname</replaceable></arg>
</cmdsynopsis>
</refsynopsisdiv>
diff --git a/doc/src/sgml/ref/createuser.sgml b/doc/src/sgml/ref/createuser.sgml
index 9942cd66f610636b02831fe0e9e5831e19eab4bb..dedc97f2233c7579e35c3c11cada8f22a5f86e93 100644
--- a/doc/src/sgml/ref/createuser.sgml
+++ b/doc/src/sgml/ref/createuser.sgml
@@ -24,7 +24,7 @@ PostgreSQL documentation
<command>createuser</command>
<arg rep="repeat"><replaceable>connection-option</replaceable></arg>
<arg rep="repeat"><replaceable>option</replaceable></arg>
- <arg><replaceable>username</replaceable></arg>
+ <arg choice="opt"><replaceable>username</replaceable></arg>
</cmdsynopsis>
</refsynopsisdiv>
diff --git a/doc/src/sgml/ref/droplang.sgml b/doc/src/sgml/ref/droplang.sgml
index 2bfdbfe8885bfa47c41df3bb53d265c53d5d4215..81b954a68f0843bac6e1be61cdac104c514c3022 100644
--- a/doc/src/sgml/ref/droplang.sgml
+++ b/doc/src/sgml/ref/droplang.sgml
@@ -24,14 +24,14 @@ PostgreSQL documentation
<command>droplang</command>
<arg rep="repeat"><replaceable>connection-option</replaceable></arg>
<arg choice="plain"><replaceable>langname</replaceable></arg>
- <arg><replaceable>dbname</replaceable></arg>
+ <arg choice="opt"><replaceable>dbname</replaceable></arg>
</cmdsynopsis>
<cmdsynopsis>
<command>droplang</command>
<arg rep="repeat"><replaceable>connection-option</replaceable></arg>
- <group choice="plain"><arg><option>--list</option></arg><arg><option>-l</option></arg></group>
- <arg choice="plain"><replaceable>dbname</replaceable></arg>
+ <group choice="plain"><arg choice="plain"><option>--list</option></arg><arg choice="plain"><option>-l</option></arg></group>
+ <arg choice="opt"><replaceable>dbname</replaceable></arg>
</cmdsynopsis>
</refsynopsisdiv>
diff --git a/doc/src/sgml/ref/dropuser.sgml b/doc/src/sgml/ref/dropuser.sgml
index bc6feafe9f21016c0a4327135b85fe152ddbbb6b..891bbd60371136bab8eab4327d1c3b412aa5199c 100644
--- a/doc/src/sgml/ref/dropuser.sgml
+++ b/doc/src/sgml/ref/dropuser.sgml
@@ -24,7 +24,7 @@ PostgreSQL documentation
<command>dropuser</command>
<arg rep="repeat"><replaceable>connection-option</replaceable></arg>
<arg rep="repeat"><replaceable>option</replaceable></arg>
- <arg><replaceable>username</replaceable></arg>
+ <arg choice="opt"><replaceable>username</replaceable></arg>
</cmdsynopsis>
</refsynopsisdiv>
diff --git a/doc/src/sgml/ref/initdb.sgml b/doc/src/sgml/ref/initdb.sgml
index 092df33d10074f11b3865e77450dc3566f4dc39b..89f392eaeb04e00c9fc0d85042296ed7fdb4f7a2 100644
--- a/doc/src/sgml/ref/initdb.sgml
+++ b/doc/src/sgml/ref/initdb.sgml
@@ -25,8 +25,8 @@ PostgreSQL documentation
<arg rep="repeat"><replaceable>option</replaceable></arg>
<group choice="plain">
<group choice="opt">
- <arg><option>--pgdata</option></arg>
- <arg><option>-D</option></arg>
+ <arg choice="plain"><option>--pgdata</option></arg>
+ <arg choice="plain"><option>-D</option></arg>
</group>
<replaceable> directory</replaceable>
</group>
diff --git a/doc/src/sgml/ref/pg_controldata.sgml b/doc/src/sgml/ref/pg_controldata.sgml
index d39b6e18f88e8845558ef58498e83081644e306f..7926acb918083ca61edcad4f56ce2029b7b1e523 100644
--- a/doc/src/sgml/ref/pg_controldata.sgml
+++ b/doc/src/sgml/ref/pg_controldata.sgml
@@ -22,8 +22,8 @@ PostgreSQL documentation
<refsynopsisdiv>
<cmdsynopsis>
<command>pg_controldata</command>
- <arg><replaceable class="parameter">option</replaceable></arg>
- <arg><replaceable class="parameter">datadir</replaceable></arg>
+ <arg choice="opt"><replaceable class="parameter">option</replaceable></arg>
+ <arg choice="opt"><replaceable class="parameter">datadir</replaceable></arg>
</cmdsynopsis>
</refsynopsisdiv>
diff --git a/doc/src/sgml/ref/pg_ctl-ref.sgml b/doc/src/sgml/ref/pg_ctl-ref.sgml
index fcc34ecb967dcdeeed0862e59db69b7924d35d68..1409e0c44e4ff7ea49d65e37c895f792e9fab2ef 100644
--- a/doc/src/sgml/ref/pg_ctl-ref.sgml
+++ b/doc/src/sgml/ref/pg_ctl-ref.sgml
@@ -23,36 +23,36 @@ PostgreSQL documentation
<cmdsynopsis>
<command>pg_ctl</command>
<arg choice="plain"><option>init[db]</option></arg>
- <arg><option>-s</option></arg>
- <arg><option>-D</option> <replaceable>datadir</replaceable></arg>
- <arg><option>-o</option> <replaceable>initdb-options</replaceable></arg>
+ <arg choice="opt"><option>-s</option></arg>
+ <arg choice="opt"><option>-D</option> <replaceable>datadir</replaceable></arg>
+ <arg choice="opt"><option>-o</option> <replaceable>initdb-options</replaceable></arg>
</cmdsynopsis>
<cmdsynopsis>
<command>pg_ctl</command>
<arg choice="plain"><option>start</option></arg>
- <arg><option>-w</option></arg>
- <arg><option>-t</option> <replaceable>seconds</replaceable></arg>
- <arg><option>-s</option></arg>
- <arg><option>-D</option> <replaceable>datadir</replaceable></arg>
- <arg><option>-l</option> <replaceable>filename</replaceable></arg>
- <arg><option>-o</option> <replaceable>options</replaceable></arg>
- <arg><option>-p</option> <replaceable>path</replaceable></arg>
- <arg><option>-c</option></arg>
+ <arg choice="opt"><option>-w</option></arg>
+ <arg choice="opt"><option>-t</option> <replaceable>seconds</replaceable></arg>
+ <arg choice="opt"><option>-s</option></arg>
+ <arg choice="opt"><option>-D</option> <replaceable>datadir</replaceable></arg>
+ <arg choice="opt"><option>-l</option> <replaceable>filename</replaceable></arg>
+ <arg choice="opt"><option>-o</option> <replaceable>options</replaceable></arg>
+ <arg choice="opt"><option>-p</option> <replaceable>path</replaceable></arg>
+ <arg choice="opt"><option>-c</option></arg>
</cmdsynopsis>
<cmdsynopsis>
<command>pg_ctl</command>
<arg choice="plain"><option>stop</option></arg>
- <arg><option>-W</option></arg>
- <arg><option>-t</option> <replaceable>seconds</replaceable></arg>
- <arg><option>-s</option></arg>
- <arg><option>-D</option> <replaceable>datadir</replaceable></arg>
- <arg><option>-m</option>
+ <arg choice="opt"><option>-W</option></arg>
+ <arg choice="opt"><option>-t</option> <replaceable>seconds</replaceable></arg>
+ <arg choice="opt"><option>-s</option></arg>
+ <arg choice="opt"><option>-D</option> <replaceable>datadir</replaceable></arg>
+ <arg choice="opt"><option>-m</option>
<group choice="plain">
- <arg><option>s[mart]</option></arg>
- <arg><option>f[ast]</option></arg>
- <arg><option>i[mmediate]</option></arg>
+ <arg choice="plain"><option>s[mart]</option></arg>
+ <arg choice="plain"><option>f[ast]</option></arg>
+ <arg choice="plain"><option>i[mmediate]</option></arg>
</group>
</arg>
</cmdsynopsis>
@@ -60,39 +60,39 @@ PostgreSQL documentation
<cmdsynopsis>
<command>pg_ctl</command>
<arg choice="plain"><option>restart</option></arg>
- <arg><option>-w</option></arg>
- <arg><option>-t</option> <replaceable>seconds</replaceable></arg>
- <arg><option>-s</option></arg>
- <arg><option>-D</option> <replaceable>datadir</replaceable></arg>
- <arg><option>-c</option></arg>
- <arg><option>-m</option>
+ <arg choice="opt"><option>-w</option></arg>
+ <arg choice="opt"><option>-t</option> <replaceable>seconds</replaceable></arg>
+ <arg choice="opt"><option>-s</option></arg>
+ <arg choice="opt"><option>-D</option> <replaceable>datadir</replaceable></arg>
+ <arg choice="opt"><option>-c</option></arg>
+ <arg choice="opt"><option>-m</option>
<group choice="plain">
- <arg><option>s[mart]</option></arg>
- <arg><option>f[ast]</option></arg>
- <arg><option>i[mmediate]</option></arg>
+ <arg choice="plain"><option>s[mart]</option></arg>
+ <arg choice="plain"><option>f[ast]</option></arg>
+ <arg choice="plain"><option>i[mmediate]</option></arg>
</group>
</arg>
- <arg><option>-o</option> <replaceable>options</replaceable></arg>
+ <arg choice="opt"><option>-o</option> <replaceable>options</replaceable></arg>
</cmdsynopsis>
<cmdsynopsis>
<command>pg_ctl</command>
<arg choice="plain"><option>reload</option></arg>
- <arg><option>-s</option></arg>
- <arg><option>-D</option> <replaceable>datadir</replaceable></arg>
+ <arg choice="opt"><option>-s</option></arg>
+ <arg choice="opt"><option>-D</option> <replaceable>datadir</replaceable></arg>
</cmdsynopsis>
<cmdsynopsis>
<command>pg_ctl</command>
<arg choice="plain"><option>status</option></arg>
- <arg><option>-D</option> <replaceable>datadir</replaceable></arg>
+ <arg choice="opt"><option>-D</option> <replaceable>datadir</replaceable></arg>
</cmdsynopsis>
<cmdsynopsis>
<command>pg_ctl</command>
<arg choice="plain"><option>promote</option></arg>
- <arg><option>-s</option></arg>
- <arg><option>-D</option> <replaceable>datadir</replaceable></arg>
+ <arg choice="opt"><option>-s</option></arg>
+ <arg choice="opt"><option>-D</option> <replaceable>datadir</replaceable></arg>
</cmdsynopsis>
<cmdsynopsis>
@@ -105,26 +105,26 @@ PostgreSQL documentation
<cmdsynopsis>
<command>pg_ctl</command>
<arg choice="plain"><option>register</option></arg>
- <arg><option>-N</option> <replaceable>servicename</replaceable></arg>
- <arg><option>-U</option> <replaceable>username</replaceable></arg>
- <arg><option>-P</option> <replaceable>password</replaceable></arg>
- <arg><option>-D</option> <replaceable>datadir</replaceable></arg>
- <arg><option>-S</option>
+ <arg choice="opt"><option>-N</option> <replaceable>servicename</replaceable></arg>
+ <arg choice="opt"><option>-U</option> <replaceable>username</replaceable></arg>
+ <arg choice="opt"><option>-P</option> <replaceable>password</replaceable></arg>
+ <arg choice="opt"><option>-D</option> <replaceable>datadir</replaceable></arg>
+ <arg choice="opt"><option>-S</option>
<group choice="plain">
- <arg><option>a[uto]</option></arg>
- <arg><option>d[emand]</option></arg>
+ <arg choice="plain"><option>a[uto]</option></arg>
+ <arg choice="plain"><option>d[emand]</option></arg>
</group>
</arg>
- <arg><option>-w</option></arg>
- <arg><option>-t</option> <replaceable>seconds</replaceable></arg>
- <arg><option>-s</option></arg>
- <arg><option>-o</option> <replaceable>options</replaceable></arg>
+ <arg choice="opt"><option>-w</option></arg>
+ <arg choice="opt"><option>-t</option> <replaceable>seconds</replaceable></arg>
+ <arg choice="opt"><option>-s</option></arg>
+ <arg choice="opt"><option>-o</option> <replaceable>options</replaceable></arg>
</cmdsynopsis>
<cmdsynopsis>
<command>pg_ctl</command>
<arg choice="plain"><option>unregister</option></arg>
- <arg><option>-N</option> <replaceable>servicename</replaceable></arg>
+ <arg choice="opt"><option>-N</option> <replaceable>servicename</replaceable></arg>
</cmdsynopsis>
</refsynopsisdiv>
diff --git a/doc/src/sgml/ref/pg_dump.sgml b/doc/src/sgml/ref/pg_dump.sgml
index 6b315009ff7954062ef53ecfb55d2251aa1d824e..a5e53043267be3b2a72387e9b50020dfb1821edf 100644
--- a/doc/src/sgml/ref/pg_dump.sgml
+++ b/doc/src/sgml/ref/pg_dump.sgml
@@ -27,7 +27,7 @@ PostgreSQL documentation
<command>pg_dump</command>
<arg rep="repeat"><replaceable>connection-option</replaceable></arg>
<arg rep="repeat"><replaceable>option</replaceable></arg>
- <arg><replaceable>dbname</replaceable></arg>
+ <arg choice="opt"><replaceable>dbname</replaceable></arg>
</cmdsynopsis>
</refsynopsisdiv>
diff --git a/doc/src/sgml/ref/pg_resetxlog.sgml b/doc/src/sgml/ref/pg_resetxlog.sgml
index 3a7dfb3c73e7bc593e07c31ffddde1164ba727df..fe67a3d1f20f467c62d779a8b3cf4985fed84eea 100644
--- a/doc/src/sgml/ref/pg_resetxlog.sgml
+++ b/doc/src/sgml/ref/pg_resetxlog.sgml
@@ -22,14 +22,14 @@ PostgreSQL documentation
<refsynopsisdiv>
<cmdsynopsis>
<command>pg_resetxlog</command>
- <arg><option>-f</option></arg>
- <arg><option>-n</option></arg>
- <arg><option>-o</option> <replaceable class="parameter">oid</replaceable></arg>
- <arg><option>-x</option> <replaceable class="parameter">xid</replaceable></arg>
- <arg><option>-e</option> <replaceable class="parameter">xid_epoch</replaceable></arg>
- <arg><option>-m</option> <replaceable class="parameter">mxid</replaceable></arg>
- <arg><option>-O</option> <replaceable class="parameter">mxoff</replaceable></arg>
- <arg><option>-l</option> <replaceable class="parameter">timelineid</replaceable>,<replaceable class="parameter">fileid</replaceable>,<replaceable class="parameter">seg</replaceable></arg>
+ <arg choice="opt"><option>-f</option></arg>
+ <arg choice="opt"><option>-n</option></arg>
+ <arg choice="opt"><option>-o</option> <replaceable class="parameter">oid</replaceable></arg>
+ <arg choice="opt"><option>-x</option> <replaceable class="parameter">xid</replaceable></arg>
+ <arg choice="opt"><option>-e</option> <replaceable class="parameter">xid_epoch</replaceable></arg>
+ <arg choice="opt"><option>-m</option> <replaceable class="parameter">mxid</replaceable></arg>
+ <arg choice="opt"><option>-O</option> <replaceable class="parameter">mxoff</replaceable></arg>
+ <arg choice="opt"><option>-l</option> <replaceable class="parameter">timelineid</replaceable>,<replaceable class="parameter">fileid</replaceable>,<replaceable class="parameter">seg</replaceable></arg>
<arg choice="plain"><replaceable>datadir</replaceable></arg>
</cmdsynopsis>
</refsynopsisdiv>
diff --git a/doc/src/sgml/ref/pg_restore.sgml b/doc/src/sgml/ref/pg_restore.sgml
index 6c3326668ff8bb9b895797e8750403ed637f495e..47e972223e69db06af079fdf8639018a47fc9492 100644
--- a/doc/src/sgml/ref/pg_restore.sgml
+++ b/doc/src/sgml/ref/pg_restore.sgml
@@ -25,7 +25,7 @@
<command>pg_restore</command>
<arg rep="repeat"><replaceable>connection-option</replaceable></arg>
<arg rep="repeat"><replaceable>option</replaceable></arg>
- <arg><replaceable>filename</replaceable></arg>
+ <arg choice="opt"><replaceable>filename</replaceable></arg>
</cmdsynopsis>
</refsynopsisdiv>
diff --git a/doc/src/sgml/ref/psql-ref.sgml b/doc/src/sgml/ref/psql-ref.sgml
index bdcadf3692864dd665bec195067f2c5d55c8c695..487df7461769873b40bc69466b2c0af786b22dd8 100644
--- a/doc/src/sgml/ref/psql-ref.sgml
+++ b/doc/src/sgml/ref/psql-ref.sgml
@@ -25,8 +25,8 @@ PostgreSQL documentation
<cmdsynopsis>
<command>psql</command>
<arg rep="repeat"><replaceable class="parameter">option</replaceable></arg>
- <arg><replaceable class="parameter">dbname</replaceable>
- <arg><replaceable class="parameter">username</replaceable></arg></arg>
+ <arg choice="opt"><replaceable class="parameter">dbname</replaceable>
+ <arg choice="opt"><replaceable class="parameter">username</replaceable></arg></arg>
</cmdsynopsis>
</refsynopsisdiv>
diff --git a/doc/src/sgml/ref/reindexdb.sgml b/doc/src/sgml/ref/reindexdb.sgml
index 526fd7681789a30cecdb5c91548796598472e9be..7b2f72d04f8fa652bf1d2df0ec01fc9c9a7f2a42 100644
--- a/doc/src/sgml/ref/reindexdb.sgml
+++ b/doc/src/sgml/ref/reindexdb.sgml
@@ -25,27 +25,27 @@ PostgreSQL documentation
<arg rep="repeat"><replaceable>connection-option</replaceable></arg>
<group choice="opt">
<group choice="plain">
- <arg><option>--table</option></arg>
- <arg><option>-t</option></arg>
+ <arg choice="plain"><option>--table</option></arg>
+ <arg choice="plain"><option>-t</option></arg>
</group>
<replaceable>table</replaceable>
</group>
<group choice="opt">
<group choice="plain">
- <arg><option>--index</option></arg>
- <arg><option>-i</option></arg>
+ <arg choice="plain"><option>--index</option></arg>
+ <arg choice="plain"><option>-i</option></arg>
</group>
<replaceable>index</replaceable>
</group>
- <arg><replaceable>dbname</replaceable></arg>
+ <arg choice="opt"><replaceable>dbname</replaceable></arg>
</cmdsynopsis>
<cmdsynopsis>
<command>reindexdb</command>
<arg rep="repeat"><replaceable>connection-option</replaceable></arg>
<group choice="plain">
- <arg><option>--all</option></arg>
- <arg><option>-a</option></arg>
+ <arg choice="plain"><option>--all</option></arg>
+ <arg choice="plain"><option>-a</option></arg>
</group>
</cmdsynopsis>
@@ -53,10 +53,10 @@ PostgreSQL documentation
<command>reindexdb</command>
<arg rep="repeat"><replaceable>connection-option</replaceable></arg>
<group choice="plain">
- <arg><option>--system</option></arg>
- <arg><option>-s</option></arg>
+ <arg choice="plain"><option>--system</option></arg>
+ <arg choice="plain"><option>-s</option></arg>
</group>
- <arg><replaceable>dbname</replaceable></arg>
+ <arg choice="opt"><replaceable>dbname</replaceable></arg>
</cmdsynopsis>
</refsynopsisdiv>
diff --git a/doc/src/sgml/ref/vacuumdb.sgml b/doc/src/sgml/ref/vacuumdb.sgml
index c008611a5af3866eedfaa37a71c023bb3ead2e65..c60ba4424fe75b3f79042aa762cc996ee65ebf01 100644
--- a/doc/src/sgml/ref/vacuumdb.sgml
+++ b/doc/src/sgml/ref/vacuumdb.sgml
@@ -24,15 +24,15 @@ PostgreSQL documentation
<command>vacuumdb</command>
<arg rep="repeat"><replaceable>connection-option</replaceable></arg>
<arg rep="repeat"><replaceable>option</replaceable></arg>
- <arg>
+ <arg choice="opt">
<group choice="plain">
- <arg><option>--table</option></arg>
- <arg><option>-t</option></arg>
+ <arg choice="plain"><option>--table</option></arg>
+ <arg choice="plain"><option>-t</option></arg>
</group>
<replaceable>table</replaceable>
- <arg>( <replaceable class="parameter">column</replaceable> [,...] )</arg>
+ <arg choice="opt">( <replaceable class="parameter">column</replaceable> [,...] )</arg>
</arg>
- <arg><replaceable>dbname</replaceable></arg>
+ <arg choice="opt"><replaceable>dbname</replaceable></arg>
</cmdsynopsis>
<cmdsynopsis>
@@ -40,8 +40,8 @@ PostgreSQL documentation
<arg rep="repeat"><replaceable>connection-option</replaceable></arg>
<arg rep="repeat"><replaceable>option</replaceable></arg>
<group choice="plain">
- <arg><option>--all</option></arg>
- <arg><option>-a</option></arg>
+ <arg choice="plain"><option>--all</option></arg>
+ <arg choice="plain"><option>-a</option></arg>
</group>
</cmdsynopsis>
</refsynopsisdiv>
diff --git a/doc/src/sgml/sql.sgml b/doc/src/sgml/sql.sgml
index c19e8232baa89997da96f8610a5232d463f9ff3b..ba92607966c33700d84b82ce94dcb80dcec19aa9 100644
--- a/doc/src/sgml/sql.sgml
+++ b/doc/src/sgml/sql.sgml
@@ -1103,7 +1103,7 @@ SELECT sname, pname from supplier
<arg choice="opt"> NATURAL </arg>
<group choice="opt">
<arg choice="opt"> INNER </arg>
- <arg>
+ <arg choice="plain">
<group choice="req">
<arg choice="plain"> LEFT </arg>
<arg choice="plain"> RIGHT </arg>
@@ -1115,8 +1115,8 @@ SELECT sname, pname from supplier
<command> JOIN </command>
<arg choice="req"> <replaceable class="parameter">T2</replaceable> </arg>
<group choice="req">
- <arg> ON <replaceable>search condition</replaceable></arg>
- <arg> USING ( <replaceable>join column list</replaceable> ) </arg>
+ <arg choice="plain"> ON <replaceable>search condition</replaceable></arg>
+ <arg choice="plain"> USING ( <replaceable>join column list</replaceable> ) </arg>
</group>
</cmdsynopsis>
@@ -1141,7 +1141,7 @@ SELECT sname, pname from supplier
<varlistentry>
<term>
<cmdsynopsis>
- <arg> INNER </arg>
+ <arg choice="opt"> INNER </arg>
<command> JOIN </command>
</cmdsynopsis>
</term>
@@ -1163,7 +1163,7 @@ SELECT sname, pname from supplier
<term>
<cmdsynopsis>
<arg choice="plain"> LEFT </arg>
- <arg> OUTER </arg>
+ <arg choice="opt"> OUTER </arg>
<command> JOIN </command>
</cmdsynopsis>
</term>
@@ -1185,7 +1185,7 @@ SELECT sname, pname from supplier
<term>
<cmdsynopsis>
<arg choice="plain"> RIGHT </arg>
- <arg> OUTER </arg>
+ <arg choice="opt"> OUTER </arg>
<command> JOIN </command>
</cmdsynopsis>
</term>
@@ -1207,7 +1207,7 @@ SELECT sname, pname from supplier
<term>
<cmdsynopsis>
<arg choice="plain"> FULL </arg>
- <arg> OUTER </arg>
+ <arg choice="opt"> OUTER </arg>
<command> JOIN </command>
</cmdsynopsis>
</term>