aboutsummaryrefslogtreecommitdiff
path: root/doc/src
diff options
context:
space:
mode:
authorHeikki Linnakangas <heikki.linnakangas@iki.fi>2014-09-25 13:26:18 +0300
committerHeikki Linnakangas <heikki.linnakangas@iki.fi>2014-09-25 13:37:19 +0300
commitb0d81adea650a4bc2b9391234345bb935b89a694 (patch)
tree38f431acc1f775adfae8db86d09cec72375b8b5b /doc/src
parentafd1d95f5bf0cb48af77e5897eb4c356b5371c7b (diff)
downloadpostgresql-b0d81adea650a4bc2b9391234345bb935b89a694.tar.gz
postgresql-b0d81adea650a4bc2b9391234345bb935b89a694.zip
Add -D option to specify data directory to pg_controldata and pg_resetxlog.
It was confusing that to other commands, like initdb and postgres, you would pass the data directory with "-D datadir", but pg_controldata and pg_resetxlog would take just plain path, without the "-D". With this patch, pg_controldata and pg_resetxlog also accept "-D datadir". Abhijit Menon-Sen, with minor kibitzing by me
Diffstat (limited to 'doc/src')
-rw-r--r--doc/src/sgml/ref/pg_controldata.sgml2
-rw-r--r--doc/src/sgml/ref/pg_resetxlog.sgml2
2 files changed, 2 insertions, 2 deletions
diff --git a/doc/src/sgml/ref/pg_controldata.sgml b/doc/src/sgml/ref/pg_controldata.sgml
index fbf40fcf9de..4a360d61fd3 100644
--- a/doc/src/sgml/ref/pg_controldata.sgml
+++ b/doc/src/sgml/ref/pg_controldata.sgml
@@ -23,7 +23,7 @@ PostgreSQL documentation
<cmdsynopsis>
<command>pg_controldata</command>
<arg choice="opt"><replaceable class="parameter">option</replaceable></arg>
- <arg choice="opt"><replaceable class="parameter">datadir</replaceable></arg>
+ <arg choice="opt"><arg choice="opt"><option>-D</option></arg> <replaceable class="parameter">datadir</replaceable></arg>
</cmdsynopsis>
</refsynopsisdiv>
diff --git a/doc/src/sgml/ref/pg_resetxlog.sgml b/doc/src/sgml/ref/pg_resetxlog.sgml
index 0b53bd68595..aba7185f355 100644
--- a/doc/src/sgml/ref/pg_resetxlog.sgml
+++ b/doc/src/sgml/ref/pg_resetxlog.sgml
@@ -30,7 +30,7 @@ PostgreSQL documentation
<arg choice="opt"><option>-m</option> <replaceable class="parameter">mxid</replaceable>,<replaceable class="parameter">mxid</replaceable></arg>
<arg choice="opt"><option>-O</option> <replaceable class="parameter">mxoff</replaceable></arg>
<arg choice="opt"><option>-l</option> <replaceable class="parameter">xlogfile</replaceable></arg>
- <arg choice="plain"><replaceable>datadir</replaceable></arg>
+ <arg choice="req"><arg choice="opt"><option>-D</option></arg> <replaceable class="parameter">datadir</replaceable></arg>
</cmdsynopsis>
</refsynopsisdiv>