Received: from malur.postgresql.org ([217.196.149.56])
	by arkaria.postgresql.org with esmtp (Exim 4.84_2)
	(envelope-from
 <pgsql-docs-owner+M8666=pgsql+2Ddocs=arkaria.postgresql.org@postgresql.org>)
	id 1bDw3W-000577-Jy
	for pgsql-docs@arkaria.postgresql.org; Fri, 17 Jun 2016 15:51:38 +0000
Received: from localhost ([127.0.0.1] helo=postgresql.org)
	by malur.postgresql.org with smtp (Exim 4.84_2)
	(envelope-from
 <pgsql-docs-owner+M8666=pgsql+2Ddocs=arkaria.postgresql.org@postgresql.org>)
	id 1bDw3W-0007l3-28
	for pgsql-docs@arkaria.postgresql.org; Fri, 17 Jun 2016 15:51:38 +0000
Received: from magus.postgresql.org ([2a02:c0:301:0:ffff::29])
	by malur.postgresql.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA384:256)
	(Exim 4.84_2)
	(envelope-from <bruce@momjian.us>)
	id 1bDw3A-0007Nc-EE
	for pgsql-docs@postgresql.org; Fri, 17 Jun 2016 15:51:16 +0000
Received: from momjian.us ([72.94.173.45])
	by magus.postgresql.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256)
	(Exim 4.84_2)
	(envelope-from <bruce@momjian.us>)
	id 1bDw36-0000PB-QV
	for pgsql-docs@postgresql.org; Fri, 17 Jun 2016 15:51:15 +0000
Received: from bruce by momjian.us with local (Exim 4.84_2)
	(envelope-from <bruce@momjian.us>)
	id 1bDw32-0000pZ-Tv
	for pgsql-docs@postgresql.org; Fri, 17 Jun 2016 11:51:08 -0400
Date: Fri, 17 Jun 2016 11:51:08 -0400
From: Bruce Momjian <bruce@momjian.us>
To: PostgreSQL-documentation <pgsql-docs@postgresql.org>
Subject: pg_rewind option clarification
Message-ID: <20160617155108.GC19359@momjian.us>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="s2ZSL+KKDSLx8OML"
Content-Disposition: inline
User-Agent: Mutt/1.5.23 (2014-03-12)
X-Pg-Spam-Score: -3.3 (---)
List-Archive: <http://archives.postgresql.org/pgsql-docs>
List-Help: <mailto:majordomo@postgresql.org?body=help>
List-ID: <pgsql-docs.postgresql.org>
List-Owner: <mailto:pgsql-docs-owner@postgresql.org>
List-Post: <mailto:pgsql-docs@postgresql.org>
List-Subscribe: <mailto:majordomo@postgresql.org?body=sub%20pgsql-docs>
List-Unsubscribe: <mailto:majordomo@postgresql.org?body=unsub%20pgsql-docs>
X-Mailing-List: pgsql-docs
Precedence: bulk
Sender: pgsql-docs-owner@postgresql.org


--s2ZSL+KKDSLx8OML
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline

This patch clarifies the documentation for when --source-pgdata and
--source-server can be used.

I would like to apply this to 9.6.

-- 
  Bruce Momjian  <bruce@momjian.us>        http://momjian.us
  EnterpriseDB                             http://enterprisedb.com

+ As you are, so once was I. As I am, so you will be. +
+                     Ancient Roman grave inscription +

--s2ZSL+KKDSLx8OML
Content-Type: text/x-diff; charset=us-ascii
Content-Disposition: attachment; filename="pg_rewind.diff"

diff --git a/doc/src/sgml/ref/pg_rewind.sgml b/doc/src/sgml/ref/pg_rewind.sgml
new file mode 100644
index afcc9b7..41bc4f2
*** a/doc/src/sgml/ref/pg_rewind.sgml
--- b/doc/src/sgml/ref/pg_rewind.sgml
*************** PostgreSQL documentation
*** 122,129 ****
        <listitem>
         <para>
          Specifies path to the data directory of the source server, to
!         synchronize the target with. When <option>--source-pgdata</> is
!         used, the source server must be cleanly shut down.
         </para>
        </listitem>
       </varlistentry>
--- 122,129 ----
        <listitem>
         <para>
          Specifies path to the data directory of the source server, to
!         synchronize the target with. This option requires the source server
!         to be cleanly shut down.
         </para>
        </listitem>
       </varlistentry>
*************** PostgreSQL documentation
*** 135,142 ****
          Specifies a libpq connection string to connect to the source
          <productname>PostgreSQL</> server to synchronize the target with.
          The connection must be a normal (non-replication) connection
!         with superuser access. The server must be up and running,
!         and must not be in recovery mode.
         </para>
        </listitem>
       </varlistentry>
--- 135,142 ----
          Specifies a libpq connection string to connect to the source
          <productname>PostgreSQL</> server to synchronize the target with.
          The connection must be a normal (non-replication) connection
!         with superuser access. This option requires the server to be running
!         and not in recovery mode.
         </para>
        </listitem>
       </varlistentry>

--s2ZSL+KKDSLx8OML
Content-Type: text/plain
Content-Disposition: inline
Content-Transfer-Encoding: 8bit
MIME-Version: 1.0


-- 
Sent via pgsql-docs mailing list (pgsql-docs@postgresql.org)
To make changes to your subscription:
http://www.postgresql.org/mailpref/pgsql-docs

--s2ZSL+KKDSLx8OML--