@ -24,9 +24,9 @@
<arg choice="plain"><option>-B</option></arg>
<arg choice="plain"><option>-B</option></arg>
<arg choice="plain"><replaceable>newbindir</replaceable></arg>
<arg choice="plain"><replaceable>newbindir</replaceable></arg>
<arg choice="plain"><option>-d</option></arg>
<arg choice="plain"><option>-d</option></arg>
<arg choice="plain"><replaceable>olddata dir</replaceable></arg>
<arg choice="plain"><replaceable>oldconfig dir</replaceable></arg>
<arg choice="plain"><option>-D</option></arg>
<arg choice="plain"><option>-D</option></arg>
<arg choice="plain"><replaceable>newdata dir</replaceable></arg>
<arg choice="plain"><replaceable>newconfig dir</replaceable></arg>
<arg rep="repeat"><replaceable>option</replaceable></arg>
<arg rep="repeat"><replaceable>option</replaceable></arg>
</cmdsynopsis>
</cmdsynopsis>
</refsynopsisdiv>
</refsynopsisdiv>
@ -99,16 +99,16 @@
</varlistentry>
</varlistentry>
<varlistentry>
<varlistentry>
<term><option>-d</option> <replaceable>data dir</replaceable></term>
<term><option>-d</option> <replaceable>config dir</replaceable></term>
<term><option>--old-datadir=</option><replaceable>data dir</replaceable></term>
<term><option>--old-datadir=</option><replaceable>config dir</replaceable></term>
<listitem><para>the old cluster data directory; environment
<listitem><para>the old database cluster configuration directory; environment
variable <envar>PGDATAOLD</envar></para></listitem>
variable <envar>PGDATAOLD</envar></para></listitem>
</varlistentry>
</varlistentry>
<varlistentry>
<varlistentry>
<term><option>-D</option> <replaceable>data dir</replaceable></term>
<term><option>-D</option> <replaceable>config dir</replaceable></term>
<term><option>--new-datadir=</option><replaceable>data dir</replaceable></term>
<term><option>--new-datadir=</option><replaceable>config dir</replaceable></term>
<listitem><para>the new cluster data directory; environment
<listitem><para>the new database cluster configuration directory; environment
variable <envar>PGDATANEW</envar></para></listitem>
variable <envar>PGDATANEW</envar></para></listitem>
</varlistentry>
</varlistentry>
@ -476,7 +476,7 @@ pg_upgrade.exe
<title>Save configuration files</title>
<title>Save configuration files</title>
<para>
<para>
Save any configuration files from the old standbys' data
Save any configuration files from the old standbys' configuration
directories you need to keep, e.g. <filename>postgresql.conf</filename>,
directories you need to keep, e.g. <filename>postgresql.conf</filename>,
<literal>recovery.conf</literal>, because these will be overwritten or
<literal>recovery.conf</literal>, because these will be overwritten or
removed in the next step.
removed in the next step.