diff options
Diffstat (limited to 'doc/src')
| -rw-r--r-- | doc/src/sgml/config.sgml | 11 | ||||
| -rw-r--r-- | doc/src/sgml/libpq.sgml | 10 |
2 files changed, 11 insertions, 10 deletions
diff --git a/doc/src/sgml/config.sgml b/doc/src/sgml/config.sgml index 9631492ea5a..7e0c7647a4a 100644 --- a/doc/src/sgml/config.sgml +++ b/doc/src/sgml/config.sgml @@ -1,4 +1,4 @@ -<!-- $PostgreSQL: pgsql/doc/src/sgml/config.sgml,v 1.291 2010/07/03 22:52:25 momjian Exp $ --> +<!-- $PostgreSQL: pgsql/doc/src/sgml/config.sgml,v 1.292 2010/07/06 21:14:25 rhaas Exp $ --> <chapter Id="runtime-config"> <title>Server Configuration</title> @@ -523,11 +523,12 @@ SET ENABLE_SEQSCAN TO OFF; </indexterm> <listitem> <para> - On systems that support the <symbol>TCP_KEEPIDLE</symbol> socket option, specifies the + On systems that support the <symbol>TCP_KEEPIDLE</symbol> or + <symbol>TCP_KEEPALIVE</> socket option, specifies the number of seconds between sending keepalives on an otherwise idle - connection. A value of zero uses the system default. If <symbol>TCP_KEEPIDLE</symbol> is - not supported, this parameter must be zero. This parameter is ignored for - connections made via a Unix-domain socket. + connection. A value of zero uses the system default. If neither of + these socket options is supported, this parameter must be zero. This + parameter is ignored for connections made via a Unix-domain socket. </para> </listitem> </varlistentry> diff --git a/doc/src/sgml/libpq.sgml b/doc/src/sgml/libpq.sgml index 9f74024d457..f70541bb7f1 100644 --- a/doc/src/sgml/libpq.sgml +++ b/doc/src/sgml/libpq.sgml @@ -1,4 +1,4 @@ -<!-- $PostgreSQL: pgsql/doc/src/sgml/libpq.sgml,v 1.311 2010/06/29 22:29:14 momjian Exp $ --> +<!-- $PostgreSQL: pgsql/doc/src/sgml/libpq.sgml,v 1.312 2010/07/06 21:14:25 rhaas Exp $ --> <chapter id="libpq"> <title><application>libpq</application> - C Library</title> @@ -298,10 +298,10 @@ <para> Controls the number of seconds of inactivity after which TCP should send a keepalive message to the server. A value of zero uses the - system default. This parameter is ignored if the - <symbol>TCP_KEEPIDLE</> socket option is not supported, for - connections made via a Unix-domain socket, or if keepalives are - disabled. + system default. This parameter is ignored if the neither the + <symbol>TCP_KEEPIDLE</> nor the <symbol>TCP_KEEPALIVE</> socket + options are supported, for connections made via a Unix-domain + socket, or if keepalives are disabled. </para> </listitem> </varlistentry> |