aboutsummaryrefslogtreecommitdiff
path: root/doc/src
diff options
context:
space:
mode:
Diffstat (limited to 'doc/src')
-rw-r--r--doc/src/sgml/ref/initdb.sgml4
-rw-r--r--doc/src/sgml/ref/pg_dump.sgml28
-rw-r--r--doc/src/sgml/ref/psql-ref.sgml89
3 files changed, 61 insertions, 60 deletions
diff --git a/doc/src/sgml/ref/initdb.sgml b/doc/src/sgml/ref/initdb.sgml
index 3ce99e248b4..6efb2e442d5 100644
--- a/doc/src/sgml/ref/initdb.sgml
+++ b/doc/src/sgml/ref/initdb.sgml
@@ -276,8 +276,8 @@ PostgreSQL documentation
</varlistentry>
<varlistentry>
- <term><option>-T <replaceable>CFG</></option></term>
- <term><option>--text-search-config=<replaceable>CFG</></option></term>
+ <term><option>-T <replaceable>config</></option></term>
+ <term><option>--text-search-config=<replaceable>config</></option></term>
<listitem>
<para>
Sets the default text search configuration.
diff --git a/doc/src/sgml/ref/pg_dump.sgml b/doc/src/sgml/ref/pg_dump.sgml
index bb0bf5d5662..bafa031e1a8 100644
--- a/doc/src/sgml/ref/pg_dump.sgml
+++ b/doc/src/sgml/ref/pg_dump.sgml
@@ -817,6 +817,20 @@ PostgreSQL documentation
</varlistentry>
<varlistentry>
+ <term><option>--no-sync</option></term>
+ <listitem>
+ <para>
+ By default, <command>pg_dump</command> will wait for all files
+ to be written safely to disk. This option causes
+ <command>pg_dump</command> to return without waiting, which is
+ faster, but means that a subsequent operating system crash can leave
+ the dump corrupt. Generally, this option is useful for testing
+ but should not be used when dumping data from production installation.
+ </para>
+ </listitem>
+ </varlistentry>
+
+ <varlistentry>
<term><option>--no-synchronized-snapshots</></term>
<listitem>
<para>
@@ -857,20 +871,6 @@ PostgreSQL documentation
</varlistentry>
<varlistentry>
- <term><option>--no-sync</option></term>
- <listitem>
- <para>
- By default, <command>pg_dump</command> will wait for all files
- to be written safely to disk. This option causes
- <command>pg_dump</command> to return without waiting, which is
- faster, but means that a subsequent operating system crash can leave
- the dump corrupt. Generally, this option is useful for testing
- but should not be used when dumping data from production installation.
- </para>
- </listitem>
- </varlistentry>
-
- <varlistentry>
<term><option>--quote-all-identifiers</></term>
<listitem>
<para>
diff --git a/doc/src/sgml/ref/psql-ref.sgml b/doc/src/sgml/ref/psql-ref.sgml
index 3b866128623..e6eba21edab 100644
--- a/doc/src/sgml/ref/psql-ref.sgml
+++ b/doc/src/sgml/ref/psql-ref.sgml
@@ -1251,6 +1251,23 @@ testdb=&gt;
<varlistentry>
+ <term><literal>\dD[S+] [ <link linkend="APP-PSQL-patterns"><replaceable class="parameter">pattern</replaceable></link> ]</literal></term>
+ <listitem>
+ <para>
+ Lists domains. If <replaceable
+ class="parameter">pattern</replaceable>
+ is specified, only domains whose names match the pattern are shown.
+ By default, only user-created objects are shown; supply a
+ pattern or the <literal>S</literal> modifier to include system
+ objects.
+ If <literal>+</literal> is appended to the command name, each object
+ is listed with its associated permissions and description.
+ </para>
+ </listitem>
+ </varlistentry>
+
+
+ <varlistentry>
<term><literal>\ddp [ <link linkend="APP-PSQL-patterns"><replaceable class="parameter">pattern</replaceable></link> ]</literal></term>
<listitem>
<para>
@@ -1273,23 +1290,6 @@ testdb=&gt;
<varlistentry>
- <term><literal>\dD[S+] [ <link linkend="APP-PSQL-patterns"><replaceable class="parameter">pattern</replaceable></link> ]</literal></term>
- <listitem>
- <para>
- Lists domains. If <replaceable
- class="parameter">pattern</replaceable>
- is specified, only domains whose names match the pattern are shown.
- By default, only user-created objects are shown; supply a
- pattern or the <literal>S</literal> modifier to include system
- objects.
- If <literal>+</literal> is appended to the command name, each object
- is listed with its associated permissions and description.
- </para>
- </listitem>
- </varlistentry>
-
-
- <varlistentry>
<term><literal>\dE[S+] [ <link linkend="APP-PSQL-patterns"><replaceable class="parameter">pattern</replaceable></link> ]</literal></term>
<term><literal>\di[S+] [ <link linkend="APP-PSQL-patterns"><replaceable class="parameter">pattern</replaceable></link> ]</literal></term>
<term><literal>\dm[S+] [ <link linkend="APP-PSQL-patterns"><replaceable class="parameter">pattern</replaceable></link> ]</literal></term>
@@ -1945,18 +1945,6 @@ Tue Oct 26 21:40:57 CEST 1999
<varlistentry>
- <term><literal>\gx [ <replaceable class="parameter">filename</replaceable> ]</literal></term>
- <term><literal>\gx [ |<replaceable class="parameter">command</replaceable> ]</literal></term>
- <listitem>
- <para>
- <literal>\gx</literal> is equivalent to <literal>\g</literal>, but
- forces expanded output mode for this query. See <literal>\x</literal>.
- </para>
- </listitem>
- </varlistentry>
-
-
- <varlistentry>
<term><literal>\gexec</literal></term>
<listitem>
@@ -2046,6 +2034,19 @@ hello 10
</listitem>
</varlistentry>
+
+ <varlistentry>
+ <term><literal>\gx [ <replaceable class="parameter">filename</replaceable> ]</literal></term>
+ <term><literal>\gx [ |<replaceable class="parameter">command</replaceable> ]</literal></term>
+ <listitem>
+ <para>
+ <literal>\gx</literal> is equivalent to <literal>\g</literal>, but
+ forces expanded output mode for this query. See <literal>\x</literal>.
+ </para>
+ </listitem>
+ </varlistentry>
+
+
<varlistentry>
<term><literal>\h</literal> or <literal>\help</literal> <literal>[ <replaceable class="parameter">command</replaceable> ]</literal></term>
<listitem>
@@ -2118,21 +2119,6 @@ hello 10
<varlistentry>
- <term><literal>\ir</literal> or <literal>\include_relative</literal> <replaceable class="parameter">filename</replaceable></term>
- <listitem>
- <para>
- The <literal>\ir</> command is similar to <literal>\i</>, but resolves
- relative file names differently. When executing in interactive mode,
- the two commands behave identically. However, when invoked from a
- script, <literal>\ir</literal> interprets file names relative to the
- directory in which the script is located, rather than the current
- working directory.
- </para>
- </listitem>
- </varlistentry>
-
-
- <varlistentry>
<term><literal>\if</literal> <replaceable class="parameter">expression</replaceable></term>
<term><literal>\elif</literal> <replaceable class="parameter">expression</replaceable></term>
<term><literal>\else</literal></term>
@@ -2222,6 +2208,21 @@ SELECT
<varlistentry>
+ <term><literal>\ir</literal> or <literal>\include_relative</literal> <replaceable class="parameter">filename</replaceable></term>
+ <listitem>
+ <para>
+ The <literal>\ir</> command is similar to <literal>\i</>, but resolves
+ relative file names differently. When executing in interactive mode,
+ the two commands behave identically. However, when invoked from a
+ script, <literal>\ir</literal> interprets file names relative to the
+ directory in which the script is located, rather than the current
+ working directory.
+ </para>
+ </listitem>
+ </varlistentry>
+
+
+ <varlistentry>
<term><literal>\l[+]</literal> or <literal>\list[+] [ <link linkend="APP-PSQL-patterns"><replaceable class="parameter">pattern</replaceable></link> ]</literal></term>
<listitem>
<para>