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

Commit4cca131

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 parent86b561f commit4cca131

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>
@@ -1567,14 +1568,14 @@ Tue Oct 26 21:40:57 CEST 1999
15671568

15681569

15691570
<varlistentry>
1570-
<term><literal>\g</literal> [{<replaceable class="parameter">filename</replaceable>| <literal>|</literal><replaceable class="parameter">command</replaceable> } ]</term>
1571-
1571+
<term><literal>\g [ <replaceable class="parameter">filename</replaceable>]</literal></term>
1572+
<term><literal>\g [ |<replaceable class="parameter">command</replaceable> ]</literal></term>
15721573
<listitem>
15731574
<para>
1574-
Sends the current query input buffer to the server and
1575+
Sends the current query input buffer to the server, and
15751576
optionally stores the query's output in <replaceable
15761577
class="parameter">filename</replaceable> or pipes the output
1577-
into a separate Unixshellexecuting <replaceable
1578+
to theshellcommand <replaceable
15781579
class="parameter">command</replaceable>. A bare
15791580
<literal>\g</literal> is virtually equivalent to a semicolon. A
15801581
<literal>\g</literal> with argument is a <quote>one-shot</quote>
@@ -1608,7 +1609,7 @@ Tue Oct 26 21:40:57 CEST 1999
16081609

16091610

16101611
<varlistentry>
1611-
<term><literal>\H</literal></term>
1612+
<term><literal>\H</literal> or <literal>\html</literal></term>
16121613
<listitem>
16131614
<para>
16141615
Turns on <acronym>HTML</acronym> query output format. If the
@@ -1622,7 +1623,7 @@ Tue Oct 26 21:40:57 CEST 1999
16221623

16231624

16241625
<varlistentry>
1625-
<term><literal>\i <replaceable class="parameter">filename</replaceable></literal></term>
1626+
<term><literal>\i</literal> or <literal>\include</literal> <replaceable class="parameter">filename</replaceable></term>
16261627
<listitem>
16271628
<para>
16281629
Reads input from the file <replaceable
@@ -1741,15 +1742,15 @@ lo_import 152801
17411742

17421743

17431744
<varlistentry>
1744-
<term><literal>\o</literal>[ {<replaceable class="parameter">filename</replaceable>| <literal>|</literal><replaceable class="parameter">command</replaceable>} ]</term>
1745-
1745+
<term><literal>\o</literal>or <literal>\out [<replaceable class="parameter">filename</replaceable>]</literal></term>
1746+
<term><literal>\o</literal> or <literal>\out [ |<replaceable class="parameter">command</replaceable> ]</literal></term>
17461747
<listitem>
17471748
<para>
1748-
Saves future query results to the file <replaceable
1749-
class="parameter">filename</replaceable> orpipes future results
1750-
into a separate Unixshellto execute <replaceable
1751-
class="parameter">command</replaceable>. If noarguments are
1752-
specified, the query outputwill be reset to the standard output.
1749+
Arranges to save future query results to the file <replaceable
1750+
class="parameter">filename</replaceable> orpipe future results
1751+
to theshellcommand <replaceable
1752+
class="parameter">command</replaceable>. If noargument is
1753+
specified, the query outputis reset to the standard output.
17531754
</para>
17541755

17551756
<para><quote>Query results</quote> includes all tables, command
@@ -1770,7 +1771,7 @@ lo_import 152801
17701771

17711772

17721773
<varlistentry>
1773-
<term><literal>\p</literal></term>
1774+
<term><literal>\p</literal> or <literal>\print</literal></term>
17741775
<listitem>
17751776
<para>
17761777
Print the current query buffer to the standard output.
@@ -2161,7 +2162,7 @@ lo_import 152801
21612162

21622163

21632164
<varlistentry>
2164-
<term><literal>\r</literal></term>
2165+
<term><literal>\r</literal> or <literal>\reset</literal></term>
21652166
<listitem>
21662167
<para>
21672168
Resets (clears) the query buffer.
@@ -2288,12 +2289,12 @@ lo_import 152801
22882289

22892290

22902291
<varlistentry>
2291-
<term><literal>\w</literal> <replaceable class="parameter">filename</replaceable></term>
2292-
<term><literal>\w</literal> <literal>|</><replaceable class="parameter">command</replaceable></term>
2292+
<term><literal>\w</literal>or <literal>\write</literal><replaceable class="parameter">filename</replaceable></term>
2293+
<term><literal>\w</literal>or <literal>\write</literal><literal>|</><replaceable class="parameter">command</replaceable></term>
22932294
<listitem>
22942295
<para>
22952296
Outputs the current query buffer to the file <replaceable
2296-
class="parameter">filename</replaceable> or pipes it to theUnix
2297+
class="parameter">filename</replaceable> or pipes it to theshell
22972298
command <replaceable class="parameter">command</replaceable>.
22982299
</para>
22992300
</listitem>
@@ -2334,7 +2335,7 @@ lo_import 152801
23342335
<term><literal>\! [ <replaceable class="parameter">command</replaceable> ]</literal></term>
23352336
<listitem>
23362337
<para>
2337-
Escapes to a separateUnixshell or executes theUnix command
2338+
Escapes to a separate shell or executes theshell command
23382339
<replaceable class="parameter">command</replaceable>. The
23392340
arguments are not further interpreted; the shell will see them
23402341
as-is.

0 commit comments

Comments
 (0)

[8]ページ先頭

©2009-2025 Movatter.jp