Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commita0aab48

Browse files
committed
Okay, that should put us back in sync. These two patches (src & doc) are
against the sources from one hour ago and contain all the portable andupto date stuff.A few other CVS "householding" things you might want to take care of:* Remove the src/bin/cleardbdir directory* Remove the file src/bin/psql/sql_help.h from the repository, as it isa derived file and is build by the release_prep.Peter Eisentraut
1 parent54847b2 commita0aab48

20 files changed

+361
-196
lines changed

‎doc/src/sgml/install.sgml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -808,15 +808,15 @@ $ nohup postmaster -i > pgserver.log 2>&1 &
808808
<para>
809809
Create a database by typing
810810
<ProgramListing>
811-
$ createdb
811+
$ createdb test
812812
</ProgramListing>
813813
</para>
814814
</step>
815815
<Step Performance="required">
816816
<para>
817817
Connect to the new database:
818818
<ProgramListing>
819-
$ psql
819+
$ psql test
820820
</ProgramListing>
821821
</para>
822822
</step>
@@ -840,7 +840,7 @@ postgres=> \q
840840
<para>
841841
Remove the test database (unless you will want to use it later for other tests):
842842
<ProgramListing>
843-
$destroydb
843+
$dropdb test
844844
</ProgramListing>
845845
</para>
846846
</step>
@@ -1028,7 +1028,7 @@ For example,
10281028
After running the regression tests, type
10291029

10301030
<ProgramListing>
1031-
$destroydb regression
1031+
$dropdb regression
10321032
$ cd /usr/src/pgsql/postgresql-6.5.3/src/test/regress
10331033
$ gmake clean
10341034
</ProgramListing>
@@ -1241,7 +1241,7 @@ Create the database foo:
12411241

12421242
<ProgramListing>
12431243
template1=> create database foo;
1244-
CREATEDB
1244+
CREATE DATABASE
12451245
</ProgramListing>
12461246

12471247
(Get in the habit of including those SQL semicolons. Psql won't execute

‎doc/src/sgml/manage-ag.sgml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,7 @@ You are currently connected to the database: <replaceable>dbname</replaceable>
143143
mydb, you can destroy it using the following Unix command:
144144

145145
<programlisting>
146-
%destroydb <replaceable class="parameter">dbname</replaceable>
146+
%dropdb <replaceable class="parameter">dbname</replaceable>
147147
</programlisting>
148148

149149
This action physically removes all of the Unix files

‎doc/src/sgml/manage.sgml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -283,7 +283,7 @@ TBD
283283
If you are the database administrator for the database
284284
<Database>mydb</Database>, you can destroy it using the following Unix command:
285285
<ProgramListing>
286-
%destroydb mydb
286+
%dropdb mydb
287287
</ProgramListing>
288288
This action physically removes all of the Unix files
289289
associated with the database and cannot be undone, so

‎doc/src/sgml/ref/createdb.sgml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<!--
2-
$Header: /cvsroot/pgsql/doc/src/sgml/ref/createdb.sgml,v 1.7 1999/12/04 04:53:15 momjian Exp $
2+
$Header: /cvsroot/pgsql/doc/src/sgml/ref/createdb.sgml,v 1.8 1999/12/07 22:41:41 momjian Exp $
33
Postgres documentation
44
-->
55

@@ -96,7 +96,7 @@ createdb [ <replaceable class="parameter">options</replaceable> ] <replaceable c
9696
</varlistentry>
9797

9898
<varlistentry>
99-
<term>-D, --dbpath <replaceable class="parameter">datadir</replaceable></term>
99+
<term>-D, --location <replaceable class="parameter">datadir</replaceable></term>
100100
<listitem>
101101
<para>
102102
Specifies the alternate database location for this database installation.
@@ -120,7 +120,7 @@ createdb [ <replaceable class="parameter">options</replaceable> ] <replaceable c
120120
<listitem>
121121
<para>
122122
Specifies the name of the database to be created. The name must be
123-
unique among all <productname>Postgres</productname> databases in this installation.
123+
unique among all <productname>PostgreSQL</productname> databases in this installation.
124124
</para>
125125
</listitem>
126126
</varlistentry>
@@ -167,7 +167,7 @@ createdb [ <replaceable class="parameter">options</replaceable> ] <replaceable c
167167
</varlistentry>
168168

169169
<varlistentry>
170-
<term><computeroutput>createdb: Comment creation failed.</computeroutput></term>
170+
<term><computeroutput>createdb: Comment creation failed. (Database was created.)</computeroutput></term>
171171
<listitem>
172172
<para>
173173
The comment/description for the database could not be created.
@@ -235,11 +235,11 @@ CREATE DATABASE
235235
<para>
236236
To create the database <literal>demo</literal>
237237
using the postmaster on host eden, port 5000, using the <literal>LATIN1</literal>
238-
encoding schemeand look at the underlying query:
238+
encoding schemewith a look at the underlying query:
239239

240240
<programlisting>
241241
$ <userinput>createdb -p 5000 -h eden -E LATIN1 -e demo</userinput>
242-
QUERY:CREATE DATABASE "demo" WITH ENCODING = 'LATIN1'
242+
CREATE DATABASE "demo" WITH ENCODING = 'LATIN1'
243243
CREATE DATABASE
244244
</programlisting>
245245
</para>

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

Lines changed: 15 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<!--
2-
$Header: /cvsroot/pgsql/doc/src/sgml/ref/createuser.sgml,v 1.6 1999/12/04 04:53:15 momjian Exp $
2+
$Header: /cvsroot/pgsql/doc/src/sgml/ref/createuser.sgml,v 1.7 1999/12/07 22:41:41 momjian Exp $
33
Postgres documentation
44
-->
55

@@ -125,6 +125,16 @@ createuser [ <replaceable class="parameter">options</replaceable> ] [ <replaceab
125125
</listitem>
126126
</varlistentry>
127127

128+
<varlistentry>
129+
<term>-i, --sysid <replaceable class="parameter">uid</replaceable></term>
130+
<listitem>
131+
<para>
132+
Allows you to pick a non-default user id for the new user. This is not
133+
necessary, but some people like it.
134+
</para>
135+
</listitem>
136+
</varlistentry>
137+
128138
<varlistentry>
129139
<term><replaceable class="parameter">username</replaceable></term>
130140
<listitem>
@@ -142,11 +152,9 @@ createuser [ <replaceable class="parameter">options</replaceable> ] [ <replaceab
142152

143153
<para>
144154
The options <literal>-h</literal>, <literal>-p</literal>, and <literal>-e</literal>,
145-
are passed on literally to <xref linkend="APP-PSQL" endterm="APP-PSQL-title">. If you
146-
need the <application>psql</application> options <literal>-U</literal> and
147-
<literal>-W</literal> as well, you can uncomment the
148-
respective lines in the source. They are disabled by default because of the potential
149-
conceptual confusion between existing and new users.
155+
are passed on literally to <xref linkend="APP-PSQL" endterm="APP-PSQL-title">. The
156+
<application>psql</application> options <literal>-U</literal> and <literal>-W</literal>
157+
are available as well, but their use can be confusing in this context.
150158
</para>
151159
</refsect2>
152160

@@ -243,7 +251,7 @@ CREATE USER
243251

244252
<programlisting>
245253
$ <userinput>createuser -p 5000 -h eden -D -A -e joe</userinput>
246-
QUERY:CREATE USER "joe" NOCREATEDB NOCREATEUSER
254+
CREATE USER "joe" NOCREATEDB NOCREATEUSER
247255
CREATE USER
248256
</programlisting>
249257
</para>

‎doc/src/sgml/ref/drop_user.sgml

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<!--
2-
$Header: /cvsroot/pgsql/doc/src/sgml/ref/drop_user.sgml,v 1.8 1999/12/04 04:53:15 momjian Exp $
2+
$Header: /cvsroot/pgsql/doc/src/sgml/ref/drop_user.sgml,v 1.9 1999/12/07 22:41:41 momjian Exp $
33
Postgres documentation
44
-->
55

@@ -94,9 +94,7 @@ ERROR: removeUser: user "<replaceable class="parameter">name</replaceable>" does
9494
user from the database,
9595
along with any databases owned by the user. It
9696
does not remove tables, views, or triggers owned by the
97-
named user in databases not owned by the user. This statement
98-
can be used in place of the <application>dropuser</application>
99-
script, regardless of how the user was created.
97+
named user in databases not owned by the user.
10098
</para>
10199

102100
<refsect2 id="R2-SQL-DROPUSER-3">

‎doc/src/sgml/ref/dropdb.sgml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<!--
2-
$Header: /cvsroot/pgsql/doc/src/sgml/ref/dropdb.sgml,v 1.1 1999/12/04 04:53:15 momjian Exp $
2+
$Header: /cvsroot/pgsql/doc/src/sgml/ref/dropdb.sgml,v 1.2 1999/12/07 22:41:41 momjian Exp $
33
Postgres documentation
44
-->
55

@@ -207,7 +207,7 @@ DROP DATABASE
207207
$ <userinput>dropdb -p 5000 -h eden -i -e demo</userinput>
208208
Database "demo" will be permanently deleted.
209209
Are you sure? (y/n) <userinput>y</userinput>
210-
QUERY:DROP DATABASE "demo"
210+
DROP DATABASE "demo"
211211
DROP DATABASE
212212
</programlisting>
213213
</para>

‎doc/src/sgml/ref/dropuser.sgml

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<!--
2-
$Header: /cvsroot/pgsql/doc/src/sgml/ref/dropuser.sgml,v 1.1 1999/12/04 04:53:15 momjian Exp $
2+
$Header: /cvsroot/pgsql/doc/src/sgml/ref/dropuser.sgml,v 1.2 1999/12/07 22:41:41 momjian Exp $
33
Postgres documentation
44
-->
55

@@ -101,11 +101,9 @@ dropuser [ <replaceable class="parameter">options</replaceable> ] [ <replaceable
101101

102102
<para>
103103
The options <literal>-h</literal>, <literal>-p</literal>, and <literal>-e</literal>,
104-
are passed on literally to <xref linkend="APP-PSQL" endterm="APP-PSQL-title">. If you
105-
need the <application>psql</application> options <literal>-U</literal> and
106-
<literal>-W</literal> as well, you can uncomment the
107-
respective lines in the source. They are disabled by default because of the potential
108-
conceptual confusion between existing and new users.
104+
are passed on literally to <xref linkend="APP-PSQL" endterm="APP-PSQL-title">. The
105+
<application>psql</application> options <literal>-U</literal> and <literal>-W</literal>
106+
are available as well, but they can be confusing in this context.
109107
</para>
110108
</refsect2>
111109

@@ -201,7 +199,7 @@ DROP USER
201199
$ <userinput>dropuser -p 5000 -h eden -i -e joe</userinput>
202200
User "joe" and any owned databases will be permanently deleted.
203201
Are you sure? (y/n) <userinput>y</userinput>
204-
QUERY:DROP USER "joe"
202+
DROP USER "joe"
205203
DROP USER
206204
</programlisting>
207205
</para>

‎doc/src/sgml/ref/vacuum.sgml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<!--
2-
$Header: /cvsroot/pgsql/doc/src/sgml/ref/vacuum.sgml,v 1.6 1999/11/28 02:17:04 tgl Exp $
2+
$Header: /cvsroot/pgsql/doc/src/sgml/ref/vacuum.sgml,v 1.7 1999/12/07 22:41:41 momjian Exp $
33
Postgres documentation
44
-->
55

@@ -24,7 +24,7 @@ Postgres documentation
2424
</refsynopsisdivinfo>
2525
<synopsis>
2626
VACUUM [ VERBOSE ] [ ANALYZE ] [ <replaceable class="PARAMETER">table</replaceable> ]
27-
VACUUM [ VERBOSE ] ANALYZE [ <replaceable class="PARAMETER">ER">t</replaceable>BLE> [ (<replaceable class="PARAMETER">column</replaceable> [, ...] ) ] ]
27+
VACUUM [ VERBOSE ] ANALYZE [ <replaceable class="PARAMETER">table</replaceable> [ (<replaceable class="PARAMETER">column</replaceable> [, ...] ) ] ]
2828
</synopsis>
2929

3030
<refsect2 id="R2-SQL-VACUUM-1">

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp