Received: from maia.hub.org (unknown [200.46.204.183])
	by mail.postgresql.org (Postfix) with ESMTP id 0BC976323C0
	for <pgsql-docs-postgresql.org@mail.postgresql.org>;
	Thu, 25 Feb 2010 05:44:54 -0400 (AST)
Received: from mail.postgresql.org ([200.46.204.86])
	by maia.hub.org (mx1.hub.org [200.46.204.183]) (amavisd-maia,
	port 10024) with ESMTP id 26974-06 for
	<pgsql-docs-postgresql.org@mail.postgresql.org>;
	Thu, 25 Feb 2010 09:44:39 +0000 (UTC)
X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6
Received: from exprod7og109.obsmtp.com (exprod7og109.obsmtp.com [64.18.2.171])
	by mail.postgresql.org (Postfix) with SMTP id BAC95632387
	for <pgsql-docs@postgresql.org>; Thu, 25 Feb 2010 05:44:09 -0400 (AST)
Received: from source ([209.85.211.182]) by exprod7ob109.postini.com
	([64.18.6.12]) with SMTP
	ID DSNKS4ZGaPEKk82tTtdPnnH8BijsOZzeWg2L@postini.com;
	Thu, 25 Feb 2010 01:44:09 PST
Received: by ywh12 with SMTP id 12so2851089ywh.10
	for <pgsql-docs@postgresql.org>; Thu, 25 Feb 2010 01:44:07 -0800 (PST)
Received: by 10.100.235.10 with SMTP id i10mr1299231anh.110.1267090571017;
	Thu, 25 Feb 2010 01:36:11 -0800 (PST)
Received: from ?192.168.1.117? (dsl-hkibrasgw2-ff67c300-165.dhcp.inet.fi
	[88.195.103.165])
	by mx.google.com with ESMTPS id 9sm1154831yxf.5.2010.02.25.01.36.08
	(version=TLSv1/SSLv3 cipher=RC4-MD5);
	Thu, 25 Feb 2010 01:36:10 -0800 (PST)
Message-ID: <4B864485.6010800@enterprisedb.com>
Date: Thu, 25 Feb 2010 11:36:05 +0200
From: Heikki Linnakangas <heikki.linnakangas@enterprisedb.com>
Organization: EnterpriseDB
User-Agent: Mozilla-Thunderbird 2.0.0.22 (X11/20090706)
MIME-Version: 1.0
To: Thom Brown <thombrown@gmail.com>
CC: Fujii Masao <masao.fujii@gmail.com>, pgsql-docs@postgresql.org
Subject: Re: Confusing link in streaming replication section
References: <bddc86151002101443t69d6e2e7rd6c76ea6287e6061@mail.gmail.com>
	<3f0b79eb1002111757y3d11102n7fdfcee8f332f6d4@mail.gmail.com>
	<bddc86151002120815m5b9e6922p90aba868b5dae9d7@mail.gmail.com>
	<3f0b79eb1002241845p782c5e49v53a48be5aa67abf0@mail.gmail.com>
	<bddc86151002250003r2c85958bsc47ebc0b5c7ed545@mail.gmail.com>
	<3f0b79eb1002250020y81e9f44g54e3021edcaebdc3@mail.gmail.com>
	<4B863FA6.90706@enterprisedb.com>
	<bddc86151002250119n7372e967rd7733e6969b74f4f@mail.gmail.com>
In-Reply-To: <bddc86151002250119n7372e967rd7733e6969b74f4f@mail.gmail.com>
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: 7bit
X-Virus-Scanned: Maia Mailguard 1.0.1
X-Spam-Status: No, hits=-0.838 tagged_above=-10 required=5
	tests=BAYES_00=-2.599, FS_REPLICA=1.041, SARE_SPEC_REPLICA=0.72
X-Spam-Level: 
X-Archive-Number: 201002/36
X-Sequence-Number: 5352

Thom Brown wrote:
> On 25 February 2010 09:15, Heikki Linnakangas
> <heikki.linnakangas@enterprisedb.com> wrote:
>> Fujii Masao wrote:
>>> On Thu, Feb 25, 2010 at 5:03 PM, Thom Brown <thombrown@gmail.com> wrote:
>>>> It looks as if Heikki has already changed the page anyway, which
>>>> includes and example of a parameter setting for primary_conninfo and
>>>> removes links to the libpq connection stuff.  Problem solved :)
>>> Yeah, Heikki removed the link from
>>> http://developer.postgresql.org/pgdocs/postgres/streaming-replication.html#STREAMING-REPLICATION-SETUP
>>>
>>> but it still exists in
>>> http://developer.postgresql.org/pgdocs/postgres/standby-settings.html
>>>
>>> So I think that we still need to modify the document about
>>> primary_conninfo to suit your need. No?
>> Yeah, it's not very clear as it is.
>>
>> How about this:
>>
>> --- a/doc/src/sgml/recovery-config.sgml
>> +++ b/doc/src/sgml/recovery-config.sgml
>> @@ -193,7 +193,8 @@ restore_command = 'copy "C:\\server\\archivedir\\%f"
>> "%p"'
>>         <listitem>
>>          <para>
>>           Specifies a connection string to be used for the standby server
>> -          to connect with the primary. This string is in the same format as
>> +          to connect with the primary. This string is in the format
>> +          accepted by the libpq <function>PQconnectdb</function> function,
>>           described in <xref linkend="libpq-connect">. If any option is
>>           unspecified in this string, then the corresponding environment
>>           variable (see <xref linkend="libpq-envars">) is checked. If the
>>
> 
> Yes, that'll do :)

Ok, committed.

-- 
  Heikki Linnakangas
  EnterpriseDB   http://www.enterprisedb.com