aboutsummaryrefslogtreecommitdiff
path: root/doc/src
diff options
context:
space:
mode:
Diffstat (limited to 'doc/src')
-rw-r--r--doc/src/sgml/config.sgml19
-rw-r--r--doc/src/sgml/libpq.sgml19
2 files changed, 20 insertions, 18 deletions
diff --git a/doc/src/sgml/config.sgml b/doc/src/sgml/config.sgml
index f79612a429f..036228df436 100644
--- a/doc/src/sgml/config.sgml
+++ b/doc/src/sgml/config.sgml
@@ -856,8 +856,8 @@ include_dir 'conf.d'
Specifies the number of seconds of inactivity after which TCP
should send a keepalive message to the client. A value of 0 uses
the system default.
- This parameter is supported only on systems that support the
- <symbol>TCP_KEEPIDLE</> or <symbol>TCP_KEEPALIVE</> symbols, and on
+ This parameter is supported only on systems that support
+ <symbol>TCP_KEEPIDLE</> or an equivalent socket option, and on
Windows; on other systems, it must be zero.
In sessions connected via a Unix-domain socket, this parameter is
ignored and always reads as zero.
@@ -882,9 +882,9 @@ include_dir 'conf.d'
Specifies the number of seconds after which a TCP keepalive message
that is not acknowledged by the client should be retransmitted.
A value of 0 uses the system default.
- This parameter is supported only on systems that support the
- <symbol>TCP_KEEPINTVL</> symbol, and on Windows; on other systems, it
- must be zero.
+ This parameter is supported only on systems that support
+ <symbol>TCP_KEEPINTVL</> or an equivalent socket option, and on
+ Windows; on other systems, it must be zero.
In sessions connected via a Unix-domain socket, this parameter is
ignored and always reads as zero.
</para>
@@ -906,10 +906,11 @@ include_dir 'conf.d'
<listitem>
<para>
Specifies the number of TCP keepalives that can be lost before
- the server's connection to the client is considered dead. A value of 0
- uses the system default. This parameter is
- supported only on systems that support the <symbol>TCP_KEEPCNT</>
- symbol; on other systems, it must be zero.
+ the server's connection to the client is considered dead.
+ A value of 0 uses the system default.
+ This parameter is supported only on systems that support
+ <symbol>TCP_KEEPCNT</> or an equivalent socket option;
+ on other systems, it must be zero.
In sessions connected via a Unix-domain socket, this parameter is
ignored and always reads as zero.
</para>
diff --git a/doc/src/sgml/libpq.sgml b/doc/src/sgml/libpq.sgml
index b438d22294d..b5efb502cde 100644
--- a/doc/src/sgml/libpq.sgml
+++ b/doc/src/sgml/libpq.sgml
@@ -1073,10 +1073,10 @@ postgresql://%2Fvar%2Flib%2Fpostgresql/dbname
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 for connections made via a
- Unix-domain socket, or if keepalives are disabled. It is only supported
- on systems where the <symbol>TCP_KEEPIDLE</> or <symbol>TCP_KEEPALIVE</>
- socket option is available, and on Windows; on other systems, it has no
- effect.
+ Unix-domain socket, or if keepalives are disabled.
+ It is only supported on systems where <symbol>TCP_KEEPIDLE</> or
+ an equivalent socket option is available, and on Windows; on other
+ systems, it has no effect.
</para>
</listitem>
</varlistentry>
@@ -1089,9 +1089,9 @@ postgresql://%2Fvar%2Flib%2Fpostgresql/dbname
that is not acknowledged by the server should be retransmitted. A
value of zero uses the system default. This parameter is ignored for
connections made via a Unix-domain socket, or if keepalives are disabled.
- It is only supported on systems where the <symbol>TCP_KEEPINTVL</>
- socket option is available, and on Windows; on other systems, it has no
- effect.
+ It is only supported on systems where <symbol>TCP_KEEPINTVL</> or
+ an equivalent socket option is available, and on Windows; on other
+ systems, it has no effect.
</para>
</listitem>
</varlistentry>
@@ -1104,8 +1104,9 @@ postgresql://%2Fvar%2Flib%2Fpostgresql/dbname
client's connection to the server is considered dead. A value of
zero uses the system default. This parameter is ignored for
connections made via a Unix-domain socket, or if keepalives are disabled.
- It is only supported on systems where the <symbol>TCP_KEEPCNT</>
- socket option is available; on other systems, it has no effect.
+ It is only supported on systems where <symbol>TCP_KEEPCNT</> or
+ an equivalent socket option is available; on other systems, it has no
+ effect.
</para>
</listitem>
</varlistentry>