On Fri, Oct 24, 2014 at 7:42 PM, Robert Haas <robertmh...@gmail.com> wrote:
> [rhaas pgsql]$ patch -p1 < ~/Downloads/20141023_pg_recvlogical_fixes.patch
> patching file doc/src/sgml/ref/pg_recvlogical.sgml
> Hunk #1 succeeded at 270 with fuzz 1 (offset 165 lines).
> Hunk #2 FAILED at 282.
> Hunk #3 FAILED at 295.
> Hunk #4 FAILED at 308.
> 3 out of 4 hunks FAILED -- saving rejects to file
> doc/src/sgml/ref/pg_recvlogical.sgml.rej
Sorry, I did not rebase much these days, there were conflicts with 52c1ae2...
--
Michael
*** a/doc/src/sgml/ref/pg_recvlogical.sgml
--- b/doc/src/sgml/ref/pg_recvlogical.sgml
***************
*** 230,236 **** PostgreSQL documentation
<variablelist>
<varlistentry>
<term><option>-d <replaceable>database</replaceable></option></term>
! <term><option>--dbname <replaceable>database</replaceable></option></term>
<listitem>
<para>
The database to connect to. See the description of the actions for
--- 230,236 ----
<variablelist>
<varlistentry>
<term><option>-d <replaceable>database</replaceable></option></term>
! <term><option>--dbname=<replaceable>database</replaceable></option></term>
<listitem>
<para>
The database to connect to. See the description of the actions for
***************
*** 243,249 **** PostgreSQL documentation
<varlistentry>
<term><option>-h <replaceable>hostname-or-ip</replaceable></option></term>
! <term><option>--host <replaceable>hostname-or-ip</replaceable></option></term>
<listitem>
<para>
Specifies the host name of the machine on which the server is
--- 243,249 ----
<varlistentry>
<term><option>-h <replaceable>hostname-or-ip</replaceable></option></term>
! <term><option>--host=<replaceable>hostname-or-ip</replaceable></option></term>
<listitem>
<para>
Specifies the host name of the machine on which the server is
***************
*** 257,263 **** PostgreSQL documentation
<varlistentry>
<term><option>-p <replaceable>port</replaceable></option></term>
! <term><option>--port <replaceable>port</replaceable></option></term>
<listitem>
<para>
Specifies the TCP port or local Unix domain socket file
--- 257,263 ----
<varlistentry>
<term><option>-p <replaceable>port</replaceable></option></term>
! <term><option>--port=<replaceable>port</replaceable></option></term>
<listitem>
<para>
Specifies the TCP port or local Unix domain socket file
***************
*** 270,276 **** PostgreSQL documentation
<varlistentry>
<term><option>-U <replaceable>user</replaceable></option></term>
! <term><option>--username <replaceable>user</replaceable></option></term>
<listitem>
<para>
Username to connect as. Defaults to current operating system user
--- 270,276 ----
<varlistentry>
<term><option>-U <replaceable>user</replaceable></option></term>
! <term><option>--username=<replaceable>user</replaceable></option></term>
<listitem>
<para>
Username to connect as. Defaults to current operating system user
--
Sent via pgsql-hackers mailing list (pgsql-hackers@postgresql.org)
To make changes to your subscription:
http://www.postgresql.org/mailpref/pgsql-hackers
