Doc: enhance "Upstream server connection" documentation.

diff --git a/doc.ja/src/sgml/watchdog.sgml b/doc.ja/src/sgml/watchdog.sgml
index 01562f12ed9a5f0d458f4650ab697841cbbb9599..fae4f98cfa064c9499a93d7b47ddddd8ea02c407 100644 (file)
--- a/doc.ja/src/sgml/watchdog.sgml
+++ b/doc.ja/src/sgml/watchdog.sgml
@@ -286,7 +286,24 @@
   <!--
   <title>Upstream server connection</title>
   -->
-  <title>上流サーバへの接続</title>
+  <title>上位サーバへの接続</title>
+
+  <para>
+   <!--
+   Upstream servers are the clients (DB clients) served by
+   <productname>Pgpool-II</productname>.
+   Even if <productname>Pgpool-II</productname> is alive and
+   connected to <productname>PostgreSQL</productname>, 
+   if the link with the upstream server is broken,
+   <productname>Pgpool-II</productname> cannot provide services.
+   Therefore, the watchdog also monitors connections to upstream servers
+   from the <productname>Pgpool-II</productname>.
+   -->
+   <productname>Pgpool-II</productname>のサービス提供先（DB クライアント）のサーバを上位サーバと呼びます。 
+   <productname>Pgpool-II</productname>が生きていて<productname>PostgreSQL</productname>と繋がっている場合でも、
+   上位サーバとのリンクが切れていれば、<productname>Pgpool-II</productname>はサービスを提供できません。
+   そのため、watchdogは上位サーバとのリンクが繋がっているかどうかも監視します。
+  </para>
 
   <variablelist>
 
@@ -302,7 +319,9 @@
     <listitem>
      <para>
       <!--
-      Specifies the list of trusted servers to check the up stream connections.
+      Specifies the list of trusted servers to check the upstream connections.
+      For example, a list of upstream servers or routers between
+      <productname>Pgpool-II</productname> and upstream servers.
       Each server in the list is required to respond to ping.
       Specify a comma separated list of servers such as
       <literal>"hostA,hostB,hostC"</literal>.
@@ -311,7 +330,8 @@
       Therefore, it is recommended to specify multiple servers.
       Please note that you should not assign PostgreSQL servers to this parameter.
       -->
-      上位接続を確認するための信頼できるサーバのリストを指定します。
+      上位サーバとの接続を確認するための信頼できるサーバのリストを指定します。
+      例えば、上位サーバ、あるいは上位サーバへの経路上にあるルーターのリストを指定します。
       リスト中の各サーバは、pingの応答に答える必要があります。
       <literal>"hostA,hostB,hostC"</literal>のようにカンマで区切って複数のサーバを指定できます。
       全てのサーバに到達できなくなると、watchdogは<productname>Pgpool-II</productname>に障害が発生したと判断します。

diff --git a/doc/src/sgml/watchdog.sgml b/doc/src/sgml/watchdog.sgml
index 5f8512a21172dc32a1b07deb75251bdf6cf6a347..4c85dbec08e1dea8aba5954589b7034c9e5c11a6 100644 (file)
--- a/doc/src/sgml/watchdog.sgml
+++ b/doc/src/sgml/watchdog.sgml
@@ -207,6 +207,17 @@ pgpool_port2 = 9999
  <sect2 id="config-watchdog-upstream-connections">
   <title>Upstream server connection</title>
 
+  <para>
+   Upstream servers are the clients (DB clients) served by
+   <productname>Pgpool-II</productname>.
+   Even if <productname>Pgpool-II</productname> is alive and
+   connected to <productname>PostgreSQL</productname>, 
+   if the link with the upstream server is broken,
+   <productname>Pgpool-II</productname> cannot provide services.
+   Therefore, the watchdog also monitors connections to upstream servers
+   from the <productname>Pgpool-II</productname>.
+  </para>
+
   <variablelist>
 
    <varlistentry id="guc-trusted-servers" xreflabel="trusted_servers">
@@ -217,7 +228,9 @@ pgpool_port2 = 9999
     </term>
     <listitem>
      <para>
-      Specifies the list of trusted servers to check the up stream connections.
+      Specifies the list of trusted servers to check the upstream connections.
+      For example, the list of upstream servers or routers between
+      <productname>Pgpool-II</productname> and upstream servers.
       Each server in the list is required to respond to ping.
       Specify a comma separated list of servers such as
       <literal>"hostA,hostB,hostC"</literal>.

diff --git a/src/sample/pgpool.conf.sample-stream b/src/sample/pgpool.conf.sample-stream
index fbe7fc82788418918e50e68b752dc7434187acd9..1b075617226855a9b0ec9e96a6bede2d2b9c0fd4 100644 (file)
--- a/src/sample/pgpool.conf.sample-stream
+++ b/src/sample/pgpool.conf.sample-stream
@@ -694,7 +694,7 @@ backend_clustering_mode = 'streaming_replication'
                                     # Activates watchdog
                                     # (change requires restart)
 
-# -Connection to up stream servers -
+# -Connection to upstream servers -
 
 #trusted_servers = ''
                                     # trusted server list which are used