From 260d843d70e19e6d56bc6e2ad84d53cc5e31f377 Mon Sep 17 00:00:00 2001
From: Bruce Momjian <bruce@momjian.us>
Date: Mon, 22 Mar 2010 14:56:09 +0000
Subject: [PATCH] Re-order createuser and vacuumedb documentation options, for
 consistency.

Gabrielle (Roth)
---
 doc/src/sgml/ref/createuser.sgml | 112 +++++++++++++++----------------
 doc/src/sgml/ref/vacuumdb.sgml   |  22 +++---
 2 files changed, 67 insertions(+), 67 deletions(-)

diff --git a/doc/src/sgml/ref/createuser.sgml b/doc/src/sgml/ref/createuser.sgml
index 99582f8722..41e0bafd88 100644
--- a/doc/src/sgml/ref/createuser.sgml
+++ b/doc/src/sgml/ref/createuser.sgml
@@ -1,5 +1,5 @@
 <!--
-$PostgreSQL: pgsql/doc/src/sgml/ref/createuser.sgml,v 1.54 2010/02/19 14:36:45 momjian Exp $
+$PostgreSQL: pgsql/doc/src/sgml/ref/createuser.sgml,v 1.55 2010/03/22 14:56:09 momjian Exp $
 PostgreSQL documentation
 -->
 
@@ -78,22 +78,12 @@ PostgreSQL documentation
      </varlistentry>  
 
      <varlistentry>
-      <term><option>-s</></term>
-      <term><option>--superuser</></term>
-      <listitem>
-       <para>
-        The new user will be a superuser.
-       </para>
-      </listitem>
-     </varlistentry>
-
-     <varlistentry>
-      <term><option>-S</></term>
-      <term><option>--no-superuser</></term>
+      <term><option>-c <replaceable class="parameter">number</replaceable></></term>
+      <term><option>--connection-limit <replaceable class="parameter">number</replaceable></></term>
       <listitem>
        <para>
-        The new user will not be a superuser.
-        This is the default.
+        Set a maximum number of connections for the new user.
+        The default is to set no limit.
        </para>
       </listitem>
      </varlistentry>
@@ -120,81 +110,81 @@ PostgreSQL documentation
      </varlistentry>
 
      <varlistentry>
-      <term><option>-r</></term>
-      <term><option>--createrole</></term>
+      <term><option>-e</></term>
+      <term><option>--echo</></term>
       <listitem>
        <para>
-        The new user will be allowed to create new roles (that is,
-        this user will have <literal>CREATEROLE</> privilege).
+        Echo the commands that <application>createuser</application> generates
+        and sends to the server.
        </para>
       </listitem>
      </varlistentry>
 
      <varlistentry>
-      <term><option>-R</></term>
-      <term><option>--no-createrole</></term>
+      <term><option>-E</></term>
+      <term><option>--encrypted</></term>
       <listitem>
        <para>
-        The new user will not be allowed to create new roles.
-        This is the default.
+        Encrypts the user's password stored in the database. If not
+        specified, the default password behavior is used.
        </para>
       </listitem>
      </varlistentry>
 
      <varlistentry>
-      <term><option>-l</></term>
-      <term><option>--login</></term>
+      <term><option>-i</></term>
+      <term><option>--inherit</></term>
       <listitem>
        <para>
-        The new user will be allowed to log in (that is, the user name
-        can be used as the initial session user identifier).
+        The new role will automatically inherit privileges of roles
+        it is a member of.
         This is the default.
        </para>
       </listitem>
      </varlistentry>
 
      <varlistentry>
-      <term><option>-L</></term>
-      <term><option>--no-login</></term>
+      <term><option>-I</></term>
+      <term><option>--no-inherit</></term>
       <listitem>
        <para>
-        The new user will not be allowed to log in.
-        (A role without login privilege is still useful as a means of
-        managing database permissions.)
+        The new role will not automatically inherit privileges of roles
+        it is a member of.
        </para>
       </listitem>
      </varlistentry>
 
      <varlistentry>
-      <term><option>-i</></term>
-      <term><option>--inherit</></term>
+      <term><option>-l</></term>
+      <term><option>--login</></term>
       <listitem>
        <para>
-        The new role will automatically inherit privileges of roles
-        it is a member of.
+        The new user will be allowed to log in (that is, the user name
+        can be used as the initial session user identifier).
         This is the default.
        </para>
       </listitem>
      </varlistentry>
 
      <varlistentry>
-      <term><option>-I</></term>
-      <term><option>--no-inherit</></term>
+      <term><option>-L</></term>
+      <term><option>--no-login</></term>
       <listitem>
        <para>
-        The new role will not automatically inherit privileges of roles
-        it is a member of.
+        The new user will not be allowed to log in.
+        (A role without login privilege is still useful as a means of
+        managing database permissions.)
        </para>
       </listitem>
      </varlistentry>
 
      <varlistentry>
-      <term><option>-c <replaceable class="parameter">number</replaceable></></term>
-      <term><option>--connection-limit <replaceable class="parameter">number</replaceable></></term>
+      <term><option>-N</></term>
+      <term><option>--unencrypted</></term>
       <listitem>
        <para>
-        Set a maximum number of connections for the new user.
-        The default is to set no limit.
+        Does not encrypt the user's password stored in the database. If
+        not specified, the default password behavior is used.
        </para>
       </listitem>
      </varlistentry>
@@ -212,34 +202,44 @@ PostgreSQL documentation
      </varlistentry>
 
      <varlistentry>
-      <term><option>-E</></term>
-      <term><option>--encrypted</></term>
+      <term><option>-r</></term>
+      <term><option>--createrole</></term>
       <listitem>
        <para>
-        Encrypts the user's password stored in the database. If not
-        specified, the default password behavior is used.
+        The new user will be allowed to create new roles (that is,
+        this user will have <literal>CREATEROLE</> privilege).
        </para>
       </listitem>
      </varlistentry>
 
      <varlistentry>
-      <term><option>-N</></term>
-      <term><option>--unencrypted</></term>
+      <term><option>-R</></term>
+      <term><option>--no-createrole</></term>
       <listitem>
        <para>
-        Does not encrypt the user's password stored in the database. If
-        not specified, the default password behavior is used.
+        The new user will not be allowed to create new roles.
+        This is the default.
        </para>
       </listitem>
      </varlistentry>
 
      <varlistentry>
-      <term><option>-e</></term>
-      <term><option>--echo</></term>
+      <term><option>-s</></term>
+      <term><option>--superuser</></term>
       <listitem>
        <para>
-        Echo the commands that <application>createuser</application> generates
-        and sends to the server.
+        The new user will be a superuser.
+       </para>
+      </listitem>
+     </varlistentry>
+
+     <varlistentry>
+      <term><option>-S</></term>
+      <term><option>--no-superuser</></term>
+      <listitem>
+       <para>
+        The new user will not be a superuser.
+        This is the default.
        </para>
       </listitem>
      </varlistentry>
diff --git a/doc/src/sgml/ref/vacuumdb.sgml b/doc/src/sgml/ref/vacuumdb.sgml
index 76324df160..3644eb97fa 100644
--- a/doc/src/sgml/ref/vacuumdb.sgml
+++ b/doc/src/sgml/ref/vacuumdb.sgml
@@ -1,5 +1,5 @@
 <!--
-$PostgreSQL: pgsql/doc/src/sgml/ref/vacuumdb.sgml,v 1.52 2010/02/19 14:36:45 momjian Exp $
+$PostgreSQL: pgsql/doc/src/sgml/ref/vacuumdb.sgml,v 1.53 2010/03/22 14:56:09 momjian Exp $
 PostgreSQL documentation
 -->
 
@@ -127,16 +127,6 @@ PostgreSQL documentation
       </listitem>
      </varlistentry>
 
-     <varlistentry>
-      <term><option>-Z</option></term>
-      <term><option>--analyze-only</option></term>
-      <listitem>
-       <para>
-        Only calculate statistics for use by the optimizer (no vacuum).
-       </para>
-      </listitem>
-     </varlistentry>
-
      <varlistentry>
       <term><option>-q</></term>
       <term><option>--quiet</></term>
@@ -195,6 +185,16 @@ PostgreSQL documentation
       </listitem>
      </varlistentry>
 
+     <varlistentry>
+      <term><option>-Z</option></term>
+      <term><option>--analyze-only</option></term>
+      <listitem>
+       <para>
+        Only calculate statistics for use by the optimizer (no vacuum).
+       </para>
+      </listitem>
+     </varlistentry>
+
      <varlistentry>
        <term><option>-?</></term>
        <term><option>--help</></term>
-- 
2.40.0