mirrors/postgres
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

doc: Fix confusing positioning of notes in connection settings

Browse Source 
Reported-by: Jonathan S. Katz <jkatz@postgresql.org>
Reviewed-by: Daniel Gustafsson <daniel@yesql.se>
Discussion: https://www.postgresql.org/message-id/flat/6f825d42-a1ce-492a-2ea7-c83e6e65fa8b%40postgresql.org
This commit is contained in:
Peter Eisentraut 2023-06-07 17:54:53 +02:00
parent b0f6c43716
commit fb5a7d84d2
1 changed files with 6 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
doc/src/sgml/config.sgml
View File

@ -950,18 +950,14 @@ include_dir 'conf.d'
the operating system should send a TCP keepalive message to the client. the operating system should send a TCP keepalive message to the client.
If this value is specified without units, it is taken as seconds. If this value is specified without units, it is taken as seconds.
A value of 0 (the default) selects the operating system's default. A value of 0 (the default) selects the operating system's default.
On Windows, setting a value of 0 will set this parameter to 2 hours,
since Windows does not provide a way to read the system default value.
This parameter is supported only on systems that support This parameter is supported only on systems that support
<symbol>TCP_KEEPIDLE</symbol> or an equivalent socket option, and on <symbol>TCP_KEEPIDLE</symbol> or an equivalent socket option, and on
Windows; on other systems, it must be zero. Windows; on other systems, it must be zero.
In sessions connected via a Unix-domain socket, this parameter is In sessions connected via a Unix-domain socket, this parameter is
ignored and always reads as zero. ignored and always reads as zero.
</para> </para>
<note>
<para>
On Windows, setting a value of 0 will set this parameter to 2 hours,
since Windows does not provide a way to read the system default value.
</para>
</note>
</listitem> </listitem>
</varlistentry> </varlistentry>
@ -977,18 +973,14 @@ include_dir 'conf.d'
that has not been acknowledged by the client should be retransmitted. that has not been acknowledged by the client should be retransmitted.
If this value is specified without units, it is taken as seconds. If this value is specified without units, it is taken as seconds.
A value of 0 (the default) selects the operating system's default. A value of 0 (the default) selects the operating system's default.
On Windows, setting a value of 0 will set this parameter to 1 second,
since Windows does not provide a way to read the system default value.
This parameter is supported only on systems that support This parameter is supported only on systems that support
<symbol>TCP_KEEPINTVL</symbol> or an equivalent socket option, and on <symbol>TCP_KEEPINTVL</symbol> or an equivalent socket option, and on
Windows; on other systems, it must be zero. Windows; on other systems, it must be zero.
In sessions connected via a Unix-domain socket, this parameter is In sessions connected via a Unix-domain socket, this parameter is
ignored and always reads as zero. ignored and always reads as zero.
</para> </para>
<note>
<para>
On Windows, setting a value of 0 will set this parameter to 1 second,
since Windows does not provide a way to read the system default value.
</para>
</note>
</listitem> </listitem>
</varlistentry> </varlistentry>
@ -1004,16 +996,11 @@ include_dir 'conf.d'
the server's connection to the client is considered dead. the server's connection to the client is considered dead.
A value of 0 (the default) selects the operating system's default. A value of 0 (the default) selects the operating system's default.
This parameter is supported only on systems that support This parameter is supported only on systems that support
<symbol>TCP_KEEPCNT</symbol> or an equivalent socket option; <symbol>TCP_KEEPCNT</symbol> or an equivalent socket option (which does not include Windows);
on other systems, it must be zero. on other systems, it must be zero.
In sessions connected via a Unix-domain socket, this parameter is In sessions connected via a Unix-domain socket, this parameter is
ignored and always reads as zero. ignored and always reads as zero.
</para> </para>
<note>
<para>
This parameter is not supported on Windows, and must be zero.
</para>
</note>
</listitem> </listitem>
</varlistentry> </varlistentry>
@ -1030,15 +1017,10 @@ include_dir 'conf.d'
If this value is specified without units, it is taken as milliseconds. If this value is specified without units, it is taken as milliseconds.
A value of 0 (the default) selects the operating system's default. A value of 0 (the default) selects the operating system's default.
This parameter is supported only on systems that support This parameter is supported only on systems that support
<symbol>TCP_USER_TIMEOUT</symbol>; on other systems, it must be zero. <symbol>TCP_USER_TIMEOUT</symbol> (which does not include Windows); on other systems, it must be zero.
In sessions connected via a Unix-domain socket, this parameter is In sessions connected via a Unix-domain socket, this parameter is
ignored and always reads as zero. ignored and always reads as zero.
</para> </para>
<note>
<para>
This parameter is not supported on Windows, and must be zero.
</para>
</note>
</listitem> </listitem>
</varlistentry> </varlistentry>