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

Commita3e3dde

Browse files
committed
Assorted minor fixes for psql metacommand docs.
Document the long forms of \H \i \ir \o \p \r \w ... apparently, we havea long and dishonorable history of leaving out the unabbreviated names ofpsql backslash commands.Avoid saying "Unix shell"; we can just say "shell" with equal clarity,and not leave Windows users wondering whether the feature works for them.Improve consistency of documentation of \g \o \w metacommands. There'sno reason to use slightly different wording or markup for each one.
1 parenta99ec2b commita3e3dde

File tree

1 file changed

+21
-20
lines changed

1 file changed

+21
-20
lines changed

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

Lines changed: 21 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -573,7 +573,8 @@ EOF
573573
determined at compile time.
574574
Since the database server uses the same default, you will not have
575575
to specify the port in most cases. The default user name is your
576-
Unix user name, as is the default database name. Note that you cannot
576+
operating-system user name, as is the default database name.
577+
Note that you cannot
577578
just connect to any database under any user name. Your database
578579
administrator should have informed you about your access rights.
579580
</para>
@@ -1459,14 +1460,14 @@ Tue Oct 26 21:40:57 CEST 1999
14591460

14601461

14611462
<varlistentry>
1462-
<term><literal>\g</literal> [{<replaceable class="parameter">filename</replaceable>| <literal>|</literal><replaceable class="parameter">command</replaceable> } ]</term>
1463-
1463+
<term><literal>\g [ <replaceable class="parameter">filename</replaceable>]</literal></term>
1464+
<term><literal>\g [ |<replaceable class="parameter">command</replaceable> ]</literal></term>
14641465
<listitem>
14651466
<para>
1466-
Sends the current query input buffer to the server and
1467+
Sends the current query input buffer to the server, and
14671468
optionally stores the query's output in <replaceable
14681469
class="parameter">filename</replaceable> or pipes the output
1469-
into a separate Unixshellexecuting <replaceable
1470+
to theshellcommand <replaceable
14701471
class="parameter">command</replaceable>. A bare
14711472
<literal>\g</literal> is virtually equivalent to a semicolon. A
14721473
<literal>\g</literal> with argument is a <quote>one-shot</quote>
@@ -1500,7 +1501,7 @@ Tue Oct 26 21:40:57 CEST 1999
15001501

15011502

15021503
<varlistentry>
1503-
<term><literal>\H</literal></term>
1504+
<term><literal>\H</literal> or <literal>\html</literal></term>
15041505
<listitem>
15051506
<para>
15061507
Turns on <acronym>HTML</acronym> query output format. If the
@@ -1514,7 +1515,7 @@ Tue Oct 26 21:40:57 CEST 1999
15141515

15151516

15161517
<varlistentry>
1517-
<term><literal>\i <replaceable class="parameter">filename</replaceable></literal></term>
1518+
<term><literal>\i</literal> or <literal>\include</literal> <replaceable class="parameter">filename</replaceable></term>
15181519
<listitem>
15191520
<para>
15201521
Reads input from the file <replaceable
@@ -1633,15 +1634,15 @@ lo_import 152801
16331634

16341635

16351636
<varlistentry>
1636-
<term><literal>\o</literal>[ {<replaceable class="parameter">filename</replaceable>| <literal>|</literal><replaceable class="parameter">command</replaceable>} ]</term>
1637-
1637+
<term><literal>\o</literal>or <literal>\out [<replaceable class="parameter">filename</replaceable>]</literal></term>
1638+
<term><literal>\o</literal> or <literal>\out [ |<replaceable class="parameter">command</replaceable> ]</literal></term>
16381639
<listitem>
16391640
<para>
1640-
Saves future query results to the file <replaceable
1641-
class="parameter">filename</replaceable> orpipes future results
1642-
into a separate Unixshellto execute <replaceable
1643-
class="parameter">command</replaceable>. If noarguments are
1644-
specified, the query outputwill be reset to the standard output.
1641+
Arranges to save future query results to the file <replaceable
1642+
class="parameter">filename</replaceable> orpipe future results
1643+
to theshellcommand <replaceable
1644+
class="parameter">command</replaceable>. If noargument is
1645+
specified, the query outputis reset to the standard output.
16451646
</para>
16461647

16471648
<para>
@@ -1663,7 +1664,7 @@ lo_import 152801
16631664

16641665

16651666
<varlistentry>
1666-
<term><literal>\p</literal></term>
1667+
<term><literal>\p</literal> or <literal>\print</literal></term>
16671668
<listitem>
16681669
<para>
16691670
Print the current query buffer to the standard output.
@@ -2060,7 +2061,7 @@ lo_import 152801
20602061

20612062

20622063
<varlistentry>
2063-
<term><literal>\r</literal></term>
2064+
<term><literal>\r</literal> or <literal>\reset</literal></term>
20642065
<listitem>
20652066
<para>
20662067
Resets (clears) the query buffer.
@@ -2160,12 +2161,12 @@ lo_import 152801
21602161

21612162

21622163
<varlistentry>
2163-
<term><literal>\w</literal> <replaceable class="parameter">filename</replaceable></term>
2164-
<term><literal>\w</literal> <literal>|</><replaceable class="parameter">command</replaceable></term>
2164+
<term><literal>\w</literal>or <literal>\write</literal><replaceable class="parameter">filename</replaceable></term>
2165+
<term><literal>\w</literal>or <literal>\write</literal><literal>|</><replaceable class="parameter">command</replaceable></term>
21652166
<listitem>
21662167
<para>
21672168
Outputs the current query buffer to the file <replaceable
2168-
class="parameter">filename</replaceable> or pipes it to theUnix
2169+
class="parameter">filename</replaceable> or pipes it to theshell
21692170
command <replaceable class="parameter">command</replaceable>.
21702171
</para>
21712172
</listitem>
@@ -2206,7 +2207,7 @@ lo_import 152801
22062207
<term><literal>\! [ <replaceable class="parameter">command</replaceable> ]</literal></term>
22072208
<listitem>
22082209
<para>
2209-
Escapes to a separateUnixshell or executes theUnix command
2210+
Escapes to a separate shell or executes theshell command
22102211
<replaceable class="parameter">command</replaceable>. The
22112212
arguments are not further interpreted; the shell will see them
22122213
as-is.

0 commit comments

Comments
 (0)

[8]ページ先頭

©2009-2025 Movatter.jp