summaryrefslogtreecommitdiff
path: root/doc/src
diff options
context:
space:
mode:
authorBruce Momjian2014-08-25 20:30:26 +0000
committerBruce Momjian2014-08-25 20:30:26 +0000
commitebe30ad59bb2d127f576be07e036a473999c4b80 (patch)
treed37728e245428d8df7d3e3297b6e82e64f48b493 /doc/src
parentbf1c866597a0e59a30b13a66f3ae505655b61853 (diff)
pg_ctl, pg_upgrade: allow multiple -o/-O options, append them
Report by Pavel Raiskup
Diffstat (limited to 'doc/src')
-rw-r--r--doc/src/sgml/pgupgrade.sgml6
-rw-r--r--doc/src/sgml/ref/pg_ctl-ref.sgml3
-rw-r--r--doc/src/sgml/ref/postgres-ref.sgml3
3 files changed, 8 insertions, 4 deletions
diff --git a/doc/src/sgml/pgupgrade.sgml b/doc/src/sgml/pgupgrade.sgml
index b79f0db7de4..dd57c5ca5ad 100644
--- a/doc/src/sgml/pgupgrade.sgml
+++ b/doc/src/sgml/pgupgrade.sgml
@@ -130,14 +130,16 @@
<term><option>-o</option> <replaceable class="parameter">options</replaceable></term>
<term><option>--old-options</option> <replaceable class="parameter">options</replaceable></term>
<listitem><para>options to be passed directly to the
- old <command>postgres</command> command</para></listitem>
+ old <command>postgres</command> command; multiple
+ option invocations are appended</para></listitem>
</varlistentry>
<varlistentry>
<term><option>-O</option> <replaceable class="parameter">options</replaceable></term>
<term><option>--new-options</option> <replaceable class="parameter">options</replaceable></term>
<listitem><para>options to be passed directly to the
- new <command>postgres</command> command</para></listitem>
+ new <command>postgres</command> command; multiple
+ option invocations are appended</para></listitem>
</varlistentry>
<varlistentry>
diff --git a/doc/src/sgml/ref/pg_ctl-ref.sgml b/doc/src/sgml/ref/pg_ctl-ref.sgml
index 23681294b87..29f882bd76e 100644
--- a/doc/src/sgml/ref/pg_ctl-ref.sgml
+++ b/doc/src/sgml/ref/pg_ctl-ref.sgml
@@ -302,7 +302,8 @@ PostgreSQL documentation
<listitem>
<para>
Specifies options to be passed directly to the
- <command>postgres</command> command.
+ <command>postgres</command> command; multiple
+ option invocations are appended.
</para>
<para>
The options should usually be surrounded by single or double
diff --git a/doc/src/sgml/ref/postgres-ref.sgml b/doc/src/sgml/ref/postgres-ref.sgml
index cdfdaa0b397..845d96940b0 100644
--- a/doc/src/sgml/ref/postgres-ref.sgml
+++ b/doc/src/sgml/ref/postgres-ref.sgml
@@ -288,7 +288,8 @@ PostgreSQL documentation
class="parameter">extra-options</replaceable> are passed to
all server processes started by this
<command>postgres</command> process. If the option string contains
- any spaces, the entire string must be quoted.
+ any spaces, the entire string must be quoted; multiple
+ option invocations are appended.
</para>
<para>