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

Commitf6689a3

Browse files
committed
Fixed a few "fixes" and bugs. Adjusted messages and options to GNU suggestions.
1 parent267c6c7 commitf6689a3

24 files changed

+613
-592
lines changed

‎doc/src/sgml/ref/createuser.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/createuser.sgml,v 1.7 1999/12/07 22:41:41 momjian Exp $
2+
$Header: /cvsroot/pgsql/doc/src/sgml/ref/createuser.sgml,v 1.8 2000/01/12 19:36:34 petere Exp $
33
Postgres documentation
44
-->
55

@@ -177,7 +177,7 @@ createuser [ <replaceable class="parameter">options</replaceable> ] [ <replaceab
177177
</varlistentry>
178178

179179
<varlistentry>
180-
<term><computeroutput>createuser:Creation of user "<replaceable class="parameter">username</replaceable>" failed.</computeroutput></term>
180+
<term><computeroutput>createuser:creation of user "<replaceable class="parameter">username</replaceable>" failed</computeroutput></term>
181181
<listitem>
182182
<para>
183183
Something went wrong. The user was not created.

‎doc/src/sgml/ref/dropuser.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/dropuser.sgml,v 1.2 1999/12/07 22:41:41 momjian Exp $
2+
$Header: /cvsroot/pgsql/doc/src/sgml/ref/dropuser.sgml,v 1.3 2000/01/12 19:36:34 petere Exp $
33
Postgres documentation
44
-->
55

@@ -127,7 +127,7 @@ dropuser [ <replaceable class="parameter">options</replaceable> ] [ <replaceable
127127
</varlistentry>
128128

129129
<varlistentry>
130-
<term><computeroutput>dropuser:Deletion of user "<replaceable class="parameter">username</replaceable>" failed.</computeroutput></term>
130+
<term><computeroutput>dropuser:deletion of user "<replaceable class="parameter">username</replaceable>" failed</computeroutput></term>
131131
<listitem>
132132
<para>
133133
Something went wrong. The user was not removed.

‎doc/src/sgml/ref/psql-ref.sgml

Lines changed: 13 additions & 76 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<!--
2-
$Header: /cvsroot/pgsql/doc/src/sgml/ref/psql-ref.sgml,v 1.18 1999/11/26 04:24:16 momjian Exp $
2+
$Header: /cvsroot/pgsql/doc/src/sgml/ref/psql-ref.sgml,v 1.19 2000/01/12 19:36:34 petere Exp $
33
Postgres documentation
44
-->
55

@@ -352,7 +352,7 @@ testdb=>
352352
</para>
353353

354354
<para>
355-
The command form <literal>\d?</literal> is identical, but any comments
355+
The command form <literal>\d+</literal> is identical, but any comments
356356
associated with the table columns are shown as well.
357357
</para>
358358

@@ -375,10 +375,6 @@ testdb=>
375375
Lists all available aggregate functions, together with the data type they operate on.
376376
If <replaceable class="parameter">pattern</replaceable>
377377
(a regular expression) is specified, only matching aggregates are shown.
378-
If the alternative command form <literal>\da?</literal> is used,
379-
comments are listed for each function as well. The command form
380-
<literal>\da+</literal> will show more information about each aggregate
381-
function, which is usually not of general interest.
382378
</para>
383379
</listitem>
384380
</varlistentry>
@@ -426,8 +422,7 @@ testdb=>
426422
If <replaceable class="parameter">pattern</replaceable>
427423
(a regular expression) is specified, only matching functions are shown.
428424
If the form <literal>\df+</literal> is used, additional information about
429-
each function is shown. Comments for each function can be shown with
430-
the <literal>\df?</literal> form.
425+
each function, including language and description is shown.
431426
</para>
432427
</listitem>
433428
</varlistentry>
@@ -447,7 +442,7 @@ testdb=>
447442
<para>
448443
If <replaceable class="parameter">pattern</replaceable> is specified,
449444
it is a regular expression restricts the listing to those objects
450-
whose name matches. If one appends a <quote>?</quote> to the command name,
445+
whose name matches. If one appends a <quote>+</quote> to the command name,
451446
each object is listed with its associated description, if any.
452447
</para>
453448
</listitem>
@@ -476,10 +471,6 @@ testdb=>
476471
interpretation of the backslash as a new command, you might also
477472
wish to quote the argument.)
478473
</para>
479-
<para>
480-
If the form <literal>\do?</literal> is used, comments are listed for
481-
each operator.
482-
</para>
483474
</listitem>
484475
</varlistentry>
485476

@@ -500,8 +491,7 @@ testdb=>
500491
<listitem>
501492
<para>
502493
Lists all data types or only those that match <replaceable class="parameter">pattern</replaceable>.
503-
The command forms <literal>\dT+</literal> and <literal>\dT?</literal> show extra information
504-
and the associated descriptions of the types, respectively.
494+
The command form <literal>\dT+</literal> shows extra information.
505495
</para>
506496
</listitem>
507497
</varlistentry>
@@ -648,7 +638,7 @@ Tue Oct 26 21:40:57 CEST 1999
648638
<listitem>
649639
<para>
650640
List all the databases in the server as well as their owners. Append a
651-
<quote>?</quote> (question mark) to the command name to see any descriptions
641+
<quote>+</quote> to the command name to see any descriptions
652642
for the databases as well. If your <productname>PostgreSQL</productname>
653643
installation was
654644
compiled with multibyte encoding support, the encoding scheme of each
@@ -723,8 +713,6 @@ lo_import 152801
723713
<para>
724714
Shows a list of all <productname>PostgreSQL</productname> <quote>large
725715
objects</quote> currently stored in the database along with their owners.
726-
Append a question mark to the command name (<literal>\lo_list?</literal>) to
727-
see the the associated comments as well.
728716
</para>
729717
</listitem>
730718
</varlistentry>
@@ -1203,11 +1191,9 @@ Access permissions for database "test"
12031191

12041192
<para>
12051193
If so configured, <application>psql</application> understands both standard
1206-
Unix short options, and <acronym>GNU</acronym>-style long options. Since the
1207-
latter are not available on all systems, you are advised to consider carefully
1208-
whether to use them, if you are writing scripts, etc. For support on the
1209-
<productname>PostgreSQL</productname> mailing lists, you are asked to only
1210-
use the standard short options.
1194+
Unix short options, and <acronym>GNU</acronym>-style long options. The latter
1195+
are not available on all systems, so you are advised to consider carefully
1196+
whether to use them.
12111197
</para>
12121198

12131199
<para>
@@ -1301,7 +1287,7 @@ Access permissions for database "test"
13011287

13021288

13031289
<varlistentry>
1304-
<term>-F, --field-sep <replaceable class="parameter">separator</replaceable></term>
1290+
<term>-F, --field-separator <replaceable class="parameter">separator</replaceable></term>
13051291
<listitem>
13061292
<para>
13071293
Use <replaceable class="parameter">separator</replaceable> as the field separator.
@@ -1358,7 +1344,7 @@ Access permissions for database "test"
13581344

13591345

13601346
<varlistentry>
1361-
<term>-o, --out <replaceable class="parameter">filename</replaceable></term>
1347+
<term>-o, --output <replaceable class="parameter">filename</replaceable></term>
13621348
<listitem>
13631349
<para>
13641350
Put all query output into file <replaceable class="parameter">filename</replaceable>.
@@ -1400,8 +1386,7 @@ Access permissions for database "test"
14001386
<listitem>
14011387
<para>
14021388
Specifies that <application>psql</application> should do its work quietly.
1403-
By default, it prints welcome messages, various informational output and
1404-
prompts for each query.
1389+
By default, it prints welcome messages and various informational output.
14051390
If this option is used, none of this happens. This is useful with the
14061391
<option>-c</option> option. Within <application>psql</application> you can
14071392
also set the <envar>quiet</envar> variable to achieve the same effect.
@@ -1511,35 +1496,7 @@ Access permissions for database "test"
15111496
<term>-V, --version</term>
15121497
<listitem>
15131498
<para>
1514-
Shows version information about <application>psql</application> and your
1515-
<productname>PostgreSQL</productname> database server, if it could be reached.
1516-
</para>
1517-
1518-
<para>
1519-
The output looks similar to this:
1520-
<programlisting>
1521-
~$ <userinput>psql -V</userinput>
1522-
Server: PostgreSQL 6.5.2 on i586-pc-linux-gnu, compiled by egcs
1523-
psql 6.6.0 on i586-pc-linux-gnu, compiled by gcc 2.8.1 (Oct 27 1999 15:15:04), long options,
1524-
readline, history, locale, assert checks
1525-
</programlisting>
1526-
The <quote>Server</quote> line is identical to the one returned by the
1527-
backend function <function>version()</function> and thus might vary
1528-
if you query different servers by using different connection
1529-
options.
1530-
</para>
1531-
1532-
<para>
1533-
The <quote>psql</quote> line is compiled into the <application>psql</application>
1534-
binary. It shows you which <productname>PostgreSQL</productname> release
1535-
it was distributed with and what optional features were compiled into it.
1536-
Although in general (as in the example above) you can use <application>psql</application>
1537-
and database servers from different versions (if they don't differ too much)
1538-
this is not recommended or
1539-
even necessary. The optional features indicate only <application>psql</application>'s
1540-
capabilities but if <application>psql</application> was configured with
1541-
the same source tree as the rest of the distribution, it gives you an
1542-
indication about other parts of the installation as well.
1499+
Shows the <application>psql</application> version.
15431500
</para>
15441501
</listitem>
15451502
</varlistentry>
@@ -2149,26 +2106,6 @@ Field separator is "oo".
21492106

21502107
</refsect2>
21512108

2152-
<refsect2>
2153-
<title>History and Lineage</title>
2154-
2155-
<para>
2156-
<application>psql</application> first appeared in <productname>Postgres95</productname>
2157-
to complement and later replace the <application>monitor</application> program. (You see this
2158-
name here or there in really old files. The author has never had the pleasure to use this
2159-
program though.) An uncountable number of people have added features since to reflect
2160-
the enhancements in the actual database server.
2161-
</para>
2162-
2163-
<para>
2164-
The present version is the result of a major clean-up and re-write in 1999 by
2165-
<ulink URL="mailto:peter_e@gmx.net">Peter Eisentraut</ulink> in preparation for release 7.0.
2166-
Many people had again contributed their ideas. A bunch of features were stolen
2167-
from various shells (in case you hadn't noticed), in particular
2168-
<application>tcsh</application>.
2169-
</para>
2170-
</refsect2>
2171-
21722109
<refsect2>
21732110
<title><acronym>GNU</acronym> readline</title>
21742111

0 commit comments

Comments
 (0)

[8]ページ先頭

©2009-2025 Movatter.jp