mirror of
https://github.com/postgres/postgres.git
synced 2025-05-06 19:59:18 +03:00
Re-order createuser and vacuumedb documentation options, for
consistency. Gabrielle (Roth)
This commit is contained in:
Bruce Momjian
parent
8d3c4aa614
commit
260d843d70
@ -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
|
PostgreSQL documentation
|
||||||
-->
|
-->
|
||||||
|
|
||||||
@ -78,22 +78,12 @@ PostgreSQL documentation
|
|||||||
</varlistentry>
|
</varlistentry>
|
||||||
|
|
||||||
<varlistentry>
|
<varlistentry>
|
||||||
<term><option>-s</></term>
|
<term><option>-c <replaceable class="parameter">number</replaceable></></term>
|
||||||
<term><option>--superuser</></term>
|
<term><option>--connection-limit <replaceable class="parameter">number</replaceable></></term>
|
||||||
<listitem>
|
<listitem>
|
||||||
<para>
|
<para>
|
||||||
The new user will be a superuser.
|
Set a maximum number of connections for the new user.
|
||||||
</para>
|
The default is to set no limit.
|
||||||
</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>
|
</para>
|
||||||
</listitem>
|
</listitem>
|
||||||
</varlistentry>
|
</varlistentry>
|
||||||
@ -120,27 +110,50 @@ PostgreSQL documentation
|
|||||||
</varlistentry>
|
</varlistentry>
|
||||||
|
|
||||||
<varlistentry>
|
<varlistentry>
|
||||||
<term><option>-r</></term>
|
<term><option>-e</></term>
|
||||||
<term><option>--createrole</></term>
|
<term><option>--echo</></term>
|
||||||
<listitem>
|
<listitem>
|
||||||
<para>
|
<para>
|
||||||
The new user will be allowed to create new roles (that is,
|
Echo the commands that <application>createuser</application> generates
|
||||||
this user will have <literal>CREATEROLE</> privilege).
|
and sends to the server.
|
||||||
</para>
|
</para>
|
||||||
</listitem>
|
</listitem>
|
||||||
</varlistentry>
|
</varlistentry>
|
||||||
|
|
||||||
<varlistentry>
|
<varlistentry>
|
||||||
<term><option>-R</></term>
|
<term><option>-E</></term>
|
||||||
<term><option>--no-createrole</></term>
|
<term><option>--encrypted</></term>
|
||||||
<listitem>
|
<listitem>
|
||||||
<para>
|
<para>
|
||||||
The new user will not be allowed to create new roles.
|
Encrypts the user's password stored in the database. If not
|
||||||
|
specified, the default password behavior is used.
|
||||||
|
</para>
|
||||||
|
</listitem>
|
||||||
|
</varlistentry>
|
||||||
|
|
||||||
|
<varlistentry>
|
||||||
|
<term><option>-i</></term>
|
||||||
|
<term><option>--inherit</></term>
|
||||||
|
<listitem>
|
||||||
|
<para>
|
||||||
|
The new role will automatically inherit privileges of roles
|
||||||
|
it is a member of.
|
||||||
This is the default.
|
This is the default.
|
||||||
</para>
|
</para>
|
||||||
</listitem>
|
</listitem>
|
||||||
</varlistentry>
|
</varlistentry>
|
||||||
|
|
||||||
|
<varlistentry>
|
||||||
|
<term><option>-I</></term>
|
||||||
|
<term><option>--no-inherit</></term>
|
||||||
|
<listitem>
|
||||||
|
<para>
|
||||||
|
The new role will not automatically inherit privileges of roles
|
||||||
|
it is a member of.
|
||||||
|
</para>
|
||||||
|
</listitem>
|
||||||
|
</varlistentry>
|
||||||
|
|
||||||
<varlistentry>
|
<varlistentry>
|
||||||
<term><option>-l</></term>
|
<term><option>-l</></term>
|
||||||
<term><option>--login</></term>
|
<term><option>--login</></term>
|
||||||
@ -166,35 +179,12 @@ PostgreSQL documentation
|
|||||||
</varlistentry>
|
</varlistentry>
|
||||||
|
|
||||||
<varlistentry>
|
<varlistentry>
|
||||||
<term><option>-i</></term>
|
<term><option>-N</></term>
|
||||||
<term><option>--inherit</></term>
|
<term><option>--unencrypted</></term>
|
||||||
<listitem>
|
<listitem>
|
||||||
<para>
|
<para>
|
||||||
The new role will automatically inherit privileges of roles
|
Does not encrypt the user's password stored in the database. If
|
||||||
it is a member of.
|
not specified, the default password behavior is used.
|
||||||
This is the default.
|
|
||||||
</para>
|
|
||||||
</listitem>
|
|
||||||
</varlistentry>
|
|
||||||
|
|
||||||
<varlistentry>
|
|
||||||
<term><option>-I</></term>
|
|
||||||
<term><option>--no-inherit</></term>
|
|
||||||
<listitem>
|
|
||||||
<para>
|
|
||||||
The new role will not automatically inherit privileges of roles
|
|
||||||
it is a member of.
|
|
||||||
</para>
|
|
||||||
</listitem>
|
|
||||||
</varlistentry>
|
|
||||||
|
|
||||||
<varlistentry>
|
|
||||||
<term><option>-c <replaceable class="parameter">number</replaceable></></term>
|
|
||||||
<term><option>--connection-limit <replaceable class="parameter">number</replaceable></></term>
|
|
||||||
<listitem>
|
|
||||||
<para>
|
|
||||||
Set a maximum number of connections for the new user.
|
|
||||||
The default is to set no limit.
|
|
||||||
</para>
|
</para>
|
||||||
</listitem>
|
</listitem>
|
||||||
</varlistentry>
|
</varlistentry>
|
||||||
@ -212,34 +202,44 @@ PostgreSQL documentation
|
|||||||
</varlistentry>
|
</varlistentry>
|
||||||
|
|
||||||
<varlistentry>
|
<varlistentry>
|
||||||
<term><option>-E</></term>
|
<term><option>-r</></term>
|
||||||
<term><option>--encrypted</></term>
|
<term><option>--createrole</></term>
|
||||||
<listitem>
|
<listitem>
|
||||||
<para>
|
<para>
|
||||||
Encrypts the user's password stored in the database. If not
|
The new user will be allowed to create new roles (that is,
|
||||||
specified, the default password behavior is used.
|
this user will have <literal>CREATEROLE</> privilege).
|
||||||
</para>
|
</para>
|
||||||
</listitem>
|
</listitem>
|
||||||
</varlistentry>
|
</varlistentry>
|
||||||
|
|
||||||
<varlistentry>
|
<varlistentry>
|
||||||
<term><option>-N</></term>
|
<term><option>-R</></term>
|
||||||
<term><option>--unencrypted</></term>
|
<term><option>--no-createrole</></term>
|
||||||
<listitem>
|
<listitem>
|
||||||
<para>
|
<para>
|
||||||
Does not encrypt the user's password stored in the database. If
|
The new user will not be allowed to create new roles.
|
||||||
not specified, the default password behavior is used.
|
This is the default.
|
||||||
</para>
|
</para>
|
||||||
</listitem>
|
</listitem>
|
||||||
</varlistentry>
|
</varlistentry>
|
||||||
|
|
||||||
<varlistentry>
|
<varlistentry>
|
||||||
<term><option>-e</></term>
|
<term><option>-s</></term>
|
||||||
<term><option>--echo</></term>
|
<term><option>--superuser</></term>
|
||||||
<listitem>
|
<listitem>
|
||||||
<para>
|
<para>
|
||||||
Echo the commands that <application>createuser</application> generates
|
The new user will be a superuser.
|
||||||
and sends to the server.
|
</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>
|
</para>
|
||||||
</listitem>
|
</listitem>
|
||||||
</varlistentry>
|
</varlistentry>
|
||||||
|
|||||||
@ -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
|
PostgreSQL documentation
|
||||||
-->
|
-->
|
||||||
|
|
||||||
@ -127,16 +127,6 @@ PostgreSQL documentation
|
|||||||
</listitem>
|
</listitem>
|
||||||
</varlistentry>
|
</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>
|
<varlistentry>
|
||||||
<term><option>-q</></term>
|
<term><option>-q</></term>
|
||||||
<term><option>--quiet</></term>
|
<term><option>--quiet</></term>
|
||||||
@ -195,6 +185,16 @@ PostgreSQL documentation
|
|||||||
</listitem>
|
</listitem>
|
||||||
</varlistentry>
|
</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>
|
<varlistentry>
|
||||||
<term><option>-?</></term>
|
<term><option>-?</></term>
|
||||||
<term><option>--help</></term>
|
<term><option>--help</></term>
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user