Movatterモバイル変換


[0]ホーム

URL:


Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Sign up
Appearance settings

Commitfb5a7d8

Browse files
committed
doc: Fix confusing positioning of notes in connection settings
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
1 parentb0f6c43 commitfb5a7d8

File tree

1 file changed

+6
-24
lines changed

1 file changed

+6
-24
lines changed

‎doc/src/sgml/config.sgml

Lines changed: 6 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -950,18 +950,14 @@ include_dir 'conf.d'
950950
the operating system should send a TCP keepalive message to the client.
951951
If this value is specified without units, it is taken as seconds.
952952
A value of 0 (the default) selects the operating system's default.
953+
On Windows, setting a value of 0 will set this parameter to 2 hours,
954+
since Windows does not provide a way to read the system default value.
953955
This parameter is supported only on systems that support
954956
<symbol>TCP_KEEPIDLE</symbol> or an equivalent socket option, and on
955957
Windows; on other systems, it must be zero.
956958
In sessions connected via a Unix-domain socket, this parameter is
957959
ignored and always reads as zero.
958960
</para>
959-
<note>
960-
<para>
961-
On Windows, setting a value of 0 will set this parameter to 2 hours,
962-
since Windows does not provide a way to read the system default value.
963-
</para>
964-
</note>
965961
</listitem>
966962
</varlistentry>
967963

@@ -977,18 +973,14 @@ include_dir 'conf.d'
977973
that has not been acknowledged by the client should be retransmitted.
978974
If this value is specified without units, it is taken as seconds.
979975
A value of 0 (the default) selects the operating system's default.
976+
On Windows, setting a value of 0 will set this parameter to 1 second,
977+
since Windows does not provide a way to read the system default value.
980978
This parameter is supported only on systems that support
981979
<symbol>TCP_KEEPINTVL</symbol> or an equivalent socket option, and on
982980
Windows; on other systems, it must be zero.
983981
In sessions connected via a Unix-domain socket, this parameter is
984982
ignored and always reads as zero.
985983
</para>
986-
<note>
987-
<para>
988-
On Windows, setting a value of 0 will set this parameter to 1 second,
989-
since Windows does not provide a way to read the system default value.
990-
</para>
991-
</note>
992984
</listitem>
993985
</varlistentry>
994986

@@ -1004,16 +996,11 @@ include_dir 'conf.d'
1004996
the server's connection to the client is considered dead.
1005997
A value of 0 (the default) selects the operating system's default.
1006998
This parameter is supported only on systems that support
1007-
<symbol>TCP_KEEPCNT</symbol> or an equivalent socket option;
999+
<symbol>TCP_KEEPCNT</symbol> or an equivalent socket option (which does not include Windows);
10081000
on other systems, it must be zero.
10091001
In sessions connected via a Unix-domain socket, this parameter is
10101002
ignored and always reads as zero.
10111003
</para>
1012-
<note>
1013-
<para>
1014-
This parameter is not supported on Windows, and must be zero.
1015-
</para>
1016-
</note>
10171004
</listitem>
10181005
</varlistentry>
10191006

@@ -1030,15 +1017,10 @@ include_dir 'conf.d'
10301017
If this value is specified without units, it is taken as milliseconds.
10311018
A value of 0 (the default) selects the operating system's default.
10321019
This parameter is supported only on systems that support
1033-
<symbol>TCP_USER_TIMEOUT</symbol>; on other systems, it must be zero.
1020+
<symbol>TCP_USER_TIMEOUT</symbol> (which does not include Windows); on other systems, it must be zero.
10341021
In sessions connected via a Unix-domain socket, this parameter is
10351022
ignored and always reads as zero.
10361023
</para>
1037-
<note>
1038-
<para>
1039-
This parameter is not supported on Windows, and must be zero.
1040-
</para>
1041-
</note>
10421024
</listitem>
10431025
</varlistentry>
10441026

0 commit comments

Comments
 (0)

[8]ページ先頭

©2009-2025 Movatter.jp