pgpool2.git / summary / log / commit / refs
commit e312bd05fbfc6cb68201df0f7511c895966f6994
Author: pengbo <pengbo@sraoss.co.jp>
Date: Tue Jul 25 07:38:31 2017 +0000
Fix Pgpool-II document typo.
doc.ja/src/sgml/ref/pgpool_adm_pcp_attach_node.sgml | 6 +++---
doc.ja/src/sgml/ref/pgpool_adm_pcp_detach_node.sgml | 8 ++++----
doc.ja/src/sgml/ref/pgpool_adm_pcp_node_count.sgml | 7 +++++--
doc.ja/src/sgml/ref/pgpool_adm_pcp_node_info.sgml | 6 +++---
doc.ja/src/sgml/ref/pgpool_adm_pcp_pool_status.sgml | 7 +++++--
doc.ja/src/sgml/ref/pgpool_reset.sgml | 4 ++--
doc.ja/src/sgml/ref/pgpool_set.sgml | 11 ++---------
doc.ja/src/sgml/ref/pgpool_show.sgml | 2 +-
doc.ja/src/sgml/stream-check.sgml | 3 ++-
doc/src/sgml/ref/pgpool_adm_pcp_attach_node.sgml | 6 +++---
doc/src/sgml/ref/pgpool_adm_pcp_detach_node.sgml | 6 +++---
doc/src/sgml/ref/pgpool_adm_pcp_node_count.sgml | 4 ++--
doc/src/sgml/ref/pgpool_adm_pcp_node_info.sgml | 6 +++---
doc/src/sgml/ref/pgpool_adm_pcp_pool_status.sgml | 4 ++--
doc/src/sgml/ref/pgpool_reset.sgml | 4 ++--
doc/src/sgml/ref/pgpool_set.sgml | 2 +-
doc/src/sgml/ref/pgpool_show.sgml | 2 +-
17 files changed, 44 insertions(+), 44 deletions(-)
diff --git a/doc.ja/src/sgml/ref/pgpool_adm_pcp_attach_node.sgml b/doc.ja/src/sgml/ref/pgpool_adm_pcp_attach_node.sgml
index 02372b6cf..d1e01d979 100644
--- a/doc.ja/src/sgml/ref/pgpool_adm_pcp_attach_node.sgml
+++ b/doc.ja/src/sgml/ref/pgpool_adm_pcp_attach_node.sgml
@@ -35,7 +35,7 @@ Pgpool-II documentation
<paramdef>text <parameter>password</parameter></paramdef>
<paramdef>out <parameter>node_attached boolean</parameter></paramdef>
</funcprototype>
-
+
<funcprototype>
<funcdef><function>pcp_attach_node</function> returns record</funcdef>
<paramdef>integer <parameter>node_id</parameter></paramdef>
@@ -121,8 +121,8 @@ pcpサーバの外部サーバ名
-->
使用例です。
<programlisting>
-test=# SELECT * FROM pcp_attach_node(1,'localhost',11001,'t-ishii','t-ishii');
- node_attached
+test=# SELECT * FROM pgpool_adm_pcp_attach_node(1,'localhost',11001,'t-ishii','t-ishii');
+ node_attached
---------------
t
(1 row)
diff --git a/doc.ja/src/sgml/ref/pgpool_adm_pcp_detach_node.sgml b/doc.ja/src/sgml/ref/pgpool_adm_pcp_detach_node.sgml
index a688ea8a8..b9a5d406c 100644
--- a/doc.ja/src/sgml/ref/pgpool_adm_pcp_detach_node.sgml
+++ b/doc.ja/src/sgml/ref/pgpool_adm_pcp_detach_node.sgml
@@ -36,7 +36,7 @@ Pgpool-II documentation
<paramdef>text <parameter>password</parameter></paramdef>
<paramdef>out <parameter>node_detached boolean</parameter></paramdef>
</funcprototype>
-
+
<funcprototype>
<funcdef><function>pcp_detach_node</function> returns record</funcdef>
<paramdef>integer <parameter>node_id</parameter></paramdef>
@@ -54,7 +54,7 @@ Pgpool-II documentation
-->
<title>説明</title>
<para>
-<!--
+<!--
<function>pcp_detach_node</function> detaches a node
from <productname>Pgpool-II</productname>.
-->
@@ -136,8 +136,8 @@ pcpサーバの外部サーバ名
-->
使用例です。
<programlisting>
-test=# SELECT * FROM pcp_detach_node(1, 'false', 'localhost',11001,'t-ishii','t-ishii');
- node_detached
+test=# SELECT * FROM pgpool_adm_pcp_detach_node(1, 'false', 'localhost',11001,'t-ishii','t-ishii');
+ node_detached
---------------
t
(1 row)
diff --git a/doc.ja/src/sgml/ref/pgpool_adm_pcp_node_count.sgml b/doc.ja/src/sgml/ref/pgpool_adm_pcp_node_count.sgml
index f0790f6d2..307088afd 100644
--- a/doc.ja/src/sgml/ref/pgpool_adm_pcp_node_count.sgml
+++ b/doc.ja/src/sgml/ref/pgpool_adm_pcp_node_count.sgml
@@ -43,7 +43,10 @@ Pgpool-II documentation
</refsynopsisdiv>
<refsect1 id="R3-PCP-NODE-COUNT-3">
+<!--
<title>Description</title>
+-->
+ <title>説明</title>
<para>
<!--
<function>pcp_node_count</function> retrieves number of DB nodes.
@@ -101,8 +104,8 @@ pcpサーバの外部サーバ名
-->
使用例です。
<programlisting>
-test=# SELECT * FROM pcp_node_count('localhost',11001,'t-ishii','t-ishii');
- node_count
+test=# SELECT * FROM pgpool_adm_pcp_node_count('localhost',11001,'t-ishii','t-ishii');
+ node_count
------------
2
(1 row)
diff --git a/doc.ja/src/sgml/ref/pgpool_adm_pcp_node_info.sgml b/doc.ja/src/sgml/ref/pgpool_adm_pcp_node_info.sgml
index 3711acbca..cd3c36a52 100644
--- a/doc.ja/src/sgml/ref/pgpool_adm_pcp_node_info.sgml
+++ b/doc.ja/src/sgml/ref/pgpool_adm_pcp_node_info.sgml
@@ -37,7 +37,7 @@ Pgpool-II documentation
<paramdef>out <parameter>status text</parameter></paramdef>
<paramdef>out <parameter>weight float4</parameter></paramdef>
</funcprototype>
-
+
<funcprototype>
<funcdef><function>pcp_node_info</function> returns record</funcdef>
<paramdef>integer <parameter>node_id</parameter></paramdef>
@@ -124,8 +124,8 @@ pcpサーバの外部サーバ名
-->
使用例です。
<programlisting>
-test=# SELECT * FROM pcp_node_info(0,'',11001,'t-ishii','t-ishii');
- host | port | status | weight
+test=# SELECT * FROM pgpool_adm_pcp_node_info(0,'',11001,'t-ishii','t-ishii');
+ host | port | status | weight
------+-------+-------------------+--------
/tmp | 11002 | Connection in use | 0
(1 row)
diff --git a/doc.ja/src/sgml/ref/pgpool_adm_pcp_pool_status.sgml b/doc.ja/src/sgml/ref/pgpool_adm_pcp_pool_status.sgml
index 09ea15e0d..a5f16a5bf 100644
--- a/doc.ja/src/sgml/ref/pgpool_adm_pcp_pool_status.sgml
+++ b/doc.ja/src/sgml/ref/pgpool_adm_pcp_pool_status.sgml
@@ -49,7 +49,10 @@ pgpool.confのパラメータを取得する関数
</refsynopsisdiv>
<refsect1 id="R3-PCP-POOL-STATUS-3">
+<!--
<title>Description</title>
+-->
+ <title>説明</title>
<para>
<!--
<function>pcp_pool_status</function> retrieves parameters in
@@ -108,8 +111,8 @@ pcpサーバの外部サーバ名
-->
使用例です。
<programlisting>
- test=# SELECT * FROM pcp_pool_status('localhost',11001,'t-ishii','t-ishii') WHERE item ~ 'backend.*0';
- item | value | description
+ test=# SELECT * FROM pgpool_adm_pcp_pool_status('localhost',11001,'t-ishii','t-ishii') WHERE item ~ 'backend.*0';
+ item | value | description
-------------------------+------------------------------------------------+-------------------------------
backend_hostname0 | /tmp | backend #0 hostname
backend_port0 | 11002 | backend #0 port number
diff --git a/doc.ja/src/sgml/ref/pgpool_reset.sgml b/doc.ja/src/sgml/ref/pgpool_reset.sgml
index 17795cff7..4c47f2b5b 100644
--- a/doc.ja/src/sgml/ref/pgpool_reset.sgml
+++ b/doc.ja/src/sgml/ref/pgpool_reset.sgml
@@ -24,8 +24,8 @@ PostgreSQL documentation
<refsynopsisdiv>
<synopsis>
-RESET <replaceable class="PARAMETER">configuration_parameter</replaceable>
-RESET ALL
+PGPOOL RESET <replaceable class="PARAMETER">configuration_parameter</replaceable>
+PGPOOL RESET ALL
</synopsis>
</refsynopsisdiv>
diff --git a/doc.ja/src/sgml/ref/pgpool_set.sgml b/doc.ja/src/sgml/ref/pgpool_set.sgml
index ed00b82c5..7893ad3dd 100644
--- a/doc.ja/src/sgml/ref/pgpool_set.sgml
+++ b/doc.ja/src/sgml/ref/pgpool_set.sgml
@@ -24,7 +24,7 @@ PostgreSQL documentation
<refsynopsisdiv>
<synopsis>
-SET <replaceable class="PARAMETER">configuration_parameter</replaceable> { TO | = } { <replaceable class="PARAMETER">value</replaceable> | '<replaceable class="PARAMETER">value</replaceable>' | DEFAULT }
+PGPOOL SET <replaceable class="PARAMETER">configuration_parameter</replaceable> { TO | = } { <replaceable class="PARAMETER">value</replaceable> | '<replaceable class="PARAMETER">value</replaceable>' | DEFAULT }
</synopsis>
</refsynopsisdiv>
@@ -51,14 +51,7 @@ SET <replaceable class="PARAMETER">configuration_parameter</replaceable> { TO |
session.
-->
- <command>PGPOOL SET</command> は現行セッションで <productname>Pgpool-II</productname> の設定パラメータを変更します。
- このコマンドは <productname>PostgreSQL</productname> の
- <ulink url="http://www.postgresql.jp/document/9.5/html/sql-set.html">
- <command>SET</command></ulink> コマンドと似っていますが、
- <productname>PostgreSQL</productname> の <command>SET</command> コマンドと区別するために、
- <acronym>PGPOOL</acronym> というキーワードが追加されました。
- <xref linkend="runtime-config"> に列挙されているパラメータの多くは <command>PGPOOL SET</command> で変更ですますが、
- 現行セッションで使用される値にのみ影響することにご注意ください。
+<command>PGPOOL SET</command> は現行セッションで <productname>Pgpool-II</productname> の設定パラメータを変更します。このコマンドは <productname>PostgreSQL</productname> の<ulink url="http://www.postgresql.jp/document/9.5/html/sql-set.html"><command>SET</command></ulink> コマンドと似っていますが、<productname>PostgreSQL</productname> の <command>SET</command> コマンドと区別するために、<acronym>PGPOOL</acronym> というキーワードが追加されました。<xref linkend="runtime-config"> に列挙されているパラメータの多くは <command>PGPOOL SET</command> で変更できますが、現行セッションで使用される値にのみ影響することにご注意ください。
</para>
</refsect1>
diff --git a/doc.ja/src/sgml/ref/pgpool_show.sgml b/doc.ja/src/sgml/ref/pgpool_show.sgml
index f45106de7..c0bac14c4 100644
--- a/doc.ja/src/sgml/ref/pgpool_show.sgml
+++ b/doc.ja/src/sgml/ref/pgpool_show.sgml
@@ -168,7 +168,7 @@ PGPOOL SHOW ALL
<!--
Show the current setting of the parameter <varname>port</varname>:
-->
- パラメータ <varname>port</varname> の現在の設定値を表示:
+ パラメータ <xref linkend="guc-port"> の現在の設定値を表示:
<programlisting>
PGPOOL SHOW port;
diff --git a/doc.ja/src/sgml/stream-check.sgml b/doc.ja/src/sgml/stream-check.sgml
index 677f37f7f..c5c065d99 100644
--- a/doc.ja/src/sgml/stream-check.sgml
+++ b/doc.ja/src/sgml/stream-check.sgml
@@ -257,8 +257,9 @@
</row>
<row>
-<!--
<entry><literal>'if_over_threshold'</literal></entry>
+<!--
+ <entry>Only log the standby delay, when it exceeds <xref linkend="guc-delay-threshold"> value</entry>
-->
<entry><xref linkend="guc-delay-threshold">の値を超えた時だけ、スタンバイの遅延がログ出力される</entry>
</row>
diff --git a/doc/src/sgml/ref/pgpool_adm_pcp_attach_node.sgml b/doc/src/sgml/ref/pgpool_adm_pcp_attach_node.sgml
index 0cfa9b72c..5a5db29d1 100644
--- a/doc/src/sgml/ref/pgpool_adm_pcp_attach_node.sgml
+++ b/doc/src/sgml/ref/pgpool_adm_pcp_attach_node.sgml
@@ -31,7 +31,7 @@ Pgpool-II documentation
<paramdef>text <parameter>password</parameter></paramdef>
<paramdef>out <parameter>node_attached boolean</parameter></paramdef>
</funcprototype>
-
+
<funcprototype>
<funcdef><function>pcp_attach_node</function> returns record</funcdef>
<paramdef>integer <parameter>node_id</parameter></paramdef>
@@ -90,8 +90,8 @@ Pgpool-II documentation
<para>
Here is an example output:
<programlisting>
-test=# SELECT * FROM pcp_attach_node(1,'localhost',11001,'t-ishii','t-ishii');
- node_attached
+test=# SELECT * FROM pgpool_adm_pcp_attach_node(1,'localhost',11001,'t-ishii','t-ishii');
+ node_attached
---------------
t
(1 row)
diff --git a/doc/src/sgml/ref/pgpool_adm_pcp_detach_node.sgml b/doc/src/sgml/ref/pgpool_adm_pcp_detach_node.sgml
index ceb7d10ee..ad4af4849 100644
--- a/doc/src/sgml/ref/pgpool_adm_pcp_detach_node.sgml
+++ b/doc/src/sgml/ref/pgpool_adm_pcp_detach_node.sgml
@@ -32,7 +32,7 @@ Pgpool-II documentation
<paramdef>text <parameter>password</parameter></paramdef>
<paramdef>out <parameter>node_detached boolean</parameter></paramdef>
</funcprototype>
-
+
<funcprototype>
<funcdef><function>pcp_detach_node</function> returns record</funcdef>
<paramdef>integer <parameter>node_id</parameter></paramdef>
@@ -102,8 +102,8 @@ Pgpool-II documentation
<para>
Here is an example output:
<programlisting>
-test=# SELECT * FROM pcp_detach_node(1, 'false', 'localhost',11001,'t-ishii','t-ishii');
- node_detached
+test=# SELECT * FROM pgpool_adm_pcp_detach_node(1, 'false', 'localhost',11001,'t-ishii','t-ishii');
+ node_detached
---------------
t
(1 row)
diff --git a/doc/src/sgml/ref/pgpool_adm_pcp_node_count.sgml b/doc/src/sgml/ref/pgpool_adm_pcp_node_count.sgml
index d64cdcc03..c69572cff 100644
--- a/doc/src/sgml/ref/pgpool_adm_pcp_node_count.sgml
+++ b/doc/src/sgml/ref/pgpool_adm_pcp_node_count.sgml
@@ -77,8 +77,8 @@ Pgpool-II documentation
<para>
Here is an example output:
<programlisting>
-test=# SELECT * FROM pcp_node_count('localhost',11001,'t-ishii','t-ishii');
- node_count
+test=# SELECT * FROM pgpool_adm_pcp_node_count('localhost',11001,'t-ishii','t-ishii');
+ node_count
------------
2
(1 row)
diff --git a/doc/src/sgml/ref/pgpool_adm_pcp_node_info.sgml b/doc/src/sgml/ref/pgpool_adm_pcp_node_info.sgml
index bcc52c866..d5d15f603 100644
--- a/doc/src/sgml/ref/pgpool_adm_pcp_node_info.sgml
+++ b/doc/src/sgml/ref/pgpool_adm_pcp_node_info.sgml
@@ -33,7 +33,7 @@ Pgpool-II documentation
<paramdef>out <parameter>status text</parameter></paramdef>
<paramdef>out <parameter>weight float4</parameter></paramdef>
</funcprototype>
-
+
<funcprototype>
<funcdef><function>pcp_node_info</function> returns record</funcdef>
<paramdef>integer <parameter>node_id</parameter></paramdef>
@@ -93,8 +93,8 @@ Pgpool-II documentation
<para>
Here is an example output:
<programlisting>
-test=# SELECT * FROM pcp_node_info(0,'',11001,'t-ishii','t-ishii');
- host | port | status | weight
+test=# SELECT * FROM pgpool_adm_pcp_node_info(0,'',11001,'t-ishii','t-ishii');
+ host | port | status | weight
------+-------+-------------------+--------
/tmp | 11002 | Connection in use | 0
(1 row)
diff --git a/doc/src/sgml/ref/pgpool_adm_pcp_pool_status.sgml b/doc/src/sgml/ref/pgpool_adm_pcp_pool_status.sgml
index e2e320210..f8d39d8c8 100644
--- a/doc/src/sgml/ref/pgpool_adm_pcp_pool_status.sgml
+++ b/doc/src/sgml/ref/pgpool_adm_pcp_pool_status.sgml
@@ -83,8 +83,8 @@ Pgpool-II documentation
<para>
Here is an example output:
<programlisting>
- test=# SELECT * FROM pcp_pool_status('localhost',11001,'t-ishii','t-ishii') WHERE item ~ 'backend.*0';
- item | value | description
+ test=# SELECT * FROM pgpool_adm_pcp_pool_status('localhost',11001,'t-ishii','t-ishii') WHERE item ~ 'backend.*0';
+ item | value | description
-------------------------+------------------------------------------------+-------------------------------
backend_hostname0 | /tmp | backend #0 hostname
backend_port0 | 11002 | backend #0 port number
diff --git a/doc/src/sgml/ref/pgpool_reset.sgml b/doc/src/sgml/ref/pgpool_reset.sgml
index 4030e54c1..20dddb638 100644
--- a/doc/src/sgml/ref/pgpool_reset.sgml
+++ b/doc/src/sgml/ref/pgpool_reset.sgml
@@ -21,8 +21,8 @@ PostgreSQL documentation
<refsynopsisdiv>
<synopsis>
-RESET <replaceable class="PARAMETER">configuration_parameter</replaceable>
-RESET ALL
+PGPOOL RESET <replaceable class="PARAMETER">configuration_parameter</replaceable>
+PGPOOL RESET ALL
</synopsis>
</refsynopsisdiv>
diff --git a/doc/src/sgml/ref/pgpool_set.sgml b/doc/src/sgml/ref/pgpool_set.sgml
index aaa9c781e..4f082dad4 100644
--- a/doc/src/sgml/ref/pgpool_set.sgml
+++ b/doc/src/sgml/ref/pgpool_set.sgml
@@ -21,7 +21,7 @@ PostgreSQL documentation
<refsynopsisdiv>
<synopsis>
-SET <replaceable class="PARAMETER">configuration_parameter</replaceable> { TO | = } { <replaceable class="PARAMETER">value</replaceable> | '<replaceable class="PARAMETER">value</replaceable>' | DEFAULT }
+PGPOOL SET <replaceable class="PARAMETER">configuration_parameter</replaceable> { TO | = } { <replaceable class="PARAMETER">value</replaceable> | '<replaceable class="PARAMETER">value</replaceable>' | DEFAULT }
</synopsis>
</refsynopsisdiv>
diff --git a/doc/src/sgml/ref/pgpool_show.sgml b/doc/src/sgml/ref/pgpool_show.sgml
index ef7c700c1..13e43f892 100644
--- a/doc/src/sgml/ref/pgpool_show.sgml
+++ b/doc/src/sgml/ref/pgpool_show.sgml
@@ -120,7 +120,7 @@ PGPOOL SHOW ALL
<title>Examples</title>
<para>
- Show the current setting of the parameter <varname>port</varname>:
+ Show the current setting of the parameter <xref linkend="guc-port">:
<programlisting>
PGPOOL SHOW port;
[parent: 77f7b9dfee2c]