Skip to content

Commit 260d843

Browse files
bmomjianbmomjian
committed
Re-order createuser and vacuumedb documentation options, for
consistency. Gabrielle (Roth)
1 parent 8d3c4aa commit 260d843

File tree

2 files changed

+67
-67
lines changed

2 files changed

+67
-67
lines changed

‎doc/src/sgml/ref/createuser.sgml

Lines changed: 56 additions & 56 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<!--
2-
$PostgreSQL: pgsql/doc/src/sgml/ref/createuser.sgml,v 1.54 2010/02/19 14:36:45 momjian Exp $
2+
$PostgreSQL: pgsql/doc/src/sgml/ref/createuser.sgml,v 1.55 2010/03/22 14:56:09 momjian Exp $
33
PostgreSQL documentation
44
-->
55

@@ -78,22 +78,12 @@ PostgreSQL documentation
7878
</varlistentry>
7979

8080
<varlistentry>
81-
<term><option>-s</></term>
82-
<term><option>--superuser</></term>
83-
<listitem>
84-
<para>
85-
The new user will be a superuser.
86-
</para>
87-
</listitem>
88-
</varlistentry>
89-
90-
<varlistentry>
91-
<term><option>-S</></term>
92-
<term><option>--no-superuser</></term>
81+
<term><option>-c <replaceable class="parameter">number</replaceable></></term>
82+
<term><option>--connection-limit <replaceable class="parameter">number</replaceable></></term>
9383
<listitem>
9484
<para>
95-
The new user will not be a superuser.
96-
This is the default.
85+
Set a maximum number of connections for the new user.
86+
The default is to set no limit.
9787
</para>
9888
</listitem>
9989
</varlistentry>
@@ -120,81 +110,81 @@ PostgreSQL documentation
120110
</varlistentry>
121111

122112
<varlistentry>
123-
<term><option>-r</></term>
124-
<term><option>--createrole</></term>
113+
<term><option>-e</></term>
114+
<term><option>--echo</></term>
125115
<listitem>
126116
<para>
127-
The new user will be allowed to create new roles (that is,
128-
this user will have <literal>CREATEROLE</> privilege).
117+
Echo the commands that <application>createuser</application> generates
118+
and sends to the server.
129119
</para>
130120
</listitem>
131121
</varlistentry>
132122

133123
<varlistentry>
134-
<term><option>-R</></term>
135-
<term><option>--no-createrole</></term>
124+
<term><option>-E</></term>
125+
<term><option>--encrypted</></term>
136126
<listitem>
137127
<para>
138-
The new user will not be allowed to create new roles.
139-
This is the default.
128+
Encrypts the user's password stored in the database. If not
129+
specified, the default password behavior is used.
140130
</para>
141131
</listitem>
142132
</varlistentry>
143133

144134
<varlistentry>
145-
<term><option>-l</></term>
146-
<term><option>--login</></term>
135+
<term><option>-i</></term>
136+
<term><option>--inherit</></term>
147137
<listitem>
148138
<para>
149-
The new user will be allowed to log in (that is, the user name
150-
can be used as the initial session user identifier).
139+
The new role will automatically inherit privileges of roles
140+
it is a member of.
151141
This is the default.
152142
</para>
153143
</listitem>
154144
</varlistentry>
155145

156146
<varlistentry>
157-
<term><option>-L</></term>
158-
<term><option>--no-login</></term>
147+
<term><option>-I</></term>
148+
<term><option>--no-inherit</></term>
159149
<listitem>
160150
<para>
161-
The new user will not be allowed to log in.
162-
(A role without login privilege is still useful as a means of
163-
managing database permissions.)
151+
The new role will not automatically inherit privileges of roles
152+
it is a member of.
164153
</para>
165154
</listitem>
166155
</varlistentry>
167156

168157
<varlistentry>
169-
<term><option>-i</></term>
170-
<term><option>--inherit</></term>
158+
<term><option>-l</></term>
159+
<term><option>--login</></term>
171160
<listitem>
172161
<para>
173-
The new role will automatically inherit privileges of roles
174-
it is a member of.
162+
The new user will be allowed to log in (that is, the user name
163+
can be used as the initial session user identifier).
175164
This is the default.
176165
</para>
177166
</listitem>
178167
</varlistentry>
179168

180169
<varlistentry>
181-
<term><option>-I</></term>
182-
<term><option>--no-inherit</></term>
170+
<term><option>-L</></term>
171+
<term><option>--no-login</></term>
183172
<listitem>
184173
<para>
185-
The new role will not automatically inherit privileges of roles
186-
it is a member of.
174+
The new user will not be allowed to log in.
175+
(A role without login privilege is still useful as a means of
176+
managing database permissions.)
187177
</para>
188178
</listitem>
189179
</varlistentry>
190180

191181
<varlistentry>
192-
<term><option>-c <replaceable class="parameter">number</replaceable></></term>
193-
<term><option>--connection-limit <replaceable class="parameter">number</replaceable></></term>
182+
<term><option>-N</></term>
183+
<term><option>--unencrypted</></term>
194184
<listitem>
195185
<para>
196-
Set a maximum number of connections for the new user.
197-
The default is to set no limit.
186+
Does not encrypt the user's password stored in the database. If
187+
not specified, the default password behavior is used.
198188
</para>
199189
</listitem>
200190
</varlistentry>
@@ -212,34 +202,44 @@ PostgreSQL documentation
212202
</varlistentry>
213203

214204
<varlistentry>
215-
<term><option>-E</></term>
216-
<term><option>--encrypted</></term>
205+
<term><option>-r</></term>
206+
<term><option>--createrole</></term>
217207
<listitem>
218208
<para>
219-
Encrypts the user's password stored in the database. If not
220-
specified, the default password behavior is used.
209+
The new user will be allowed to create new roles (that is,
210+
this user will have <literal>CREATEROLE</> privilege).
221211
</para>
222212
</listitem>
223213
</varlistentry>
224214

225215
<varlistentry>
226-
<term><option>-N</></term>
227-
<term><option>--unencrypted</></term>
216+
<term><option>-R</></term>
217+
<term><option>--no-createrole</></term>
228218
<listitem>
229219
<para>
230-
Does not encrypt the user's password stored in the database. If
231-
not specified, the default password behavior is used.
220+
The new user will not be allowed to create new roles.
221+
This is the default.
232222
</para>
233223
</listitem>
234224
</varlistentry>
235225

236226
<varlistentry>
237-
<term><option>-e</></term>
238-
<term><option>--echo</></term>
227+
<term><option>-s</></term>
228+
<term><option>--superuser</></term>
239229
<listitem>
240230
<para>
241-
Echo the commands that <application>createuser</application> generates
242-
and sends to the server.
231+
The new user will be a superuser.
232+
</para>
233+
</listitem>
234+
</varlistentry>
235+
236+
<varlistentry>
237+
<term><option>-S</></term>
238+
<term><option>--no-superuser</></term>
239+
<listitem>
240+
<para>
241+
The new user will not be a superuser.
242+
This is the default.
243243
</para>
244244
</listitem>
245245
</varlistentry>

‎doc/src/sgml/ref/vacuumdb.sgml

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<!--
2-
$PostgreSQL: pgsql/doc/src/sgml/ref/vacuumdb.sgml,v 1.52 2010/02/19 14:36:45 momjian Exp $
2+
$PostgreSQL: pgsql/doc/src/sgml/ref/vacuumdb.sgml,v 1.53 2010/03/22 14:56:09 momjian Exp $
33
PostgreSQL documentation
44
-->
55

@@ -127,16 +127,6 @@ PostgreSQL documentation
127127
</listitem>
128128
</varlistentry>
129129

130-
<varlistentry>
131-
<term><option>-Z</option></term>
132-
<term><option>--analyze-only</option></term>
133-
<listitem>
134-
<para>
135-
Only calculate statistics for use by the optimizer (no vacuum).
136-
</para>
137-
</listitem>
138-
</varlistentry>
139-
140130
<varlistentry>
141131
<term><option>-q</></term>
142132
<term><option>--quiet</></term>
@@ -195,6 +185,16 @@ PostgreSQL documentation
195185
</listitem>
196186
</varlistentry>
197187

188+
<varlistentry>
189+
<term><option>-Z</option></term>
190+
<term><option>--analyze-only</option></term>
191+
<listitem>
192+
<para>
193+
Only calculate statistics for use by the optimizer (no vacuum).
194+
</para>
195+
</listitem>
196+
</varlistentry>
197+
198198
<varlistentry>
199199
<term><option>-?</></term>
200200
<term><option>--help</></term>

0 commit comments

Comments
 (0)