Doc: fix "2.8 Creating insert lock table" section.

It only refereed to the native replication where it should have refereed
to the snapshot isolation mode.  Also enhance some xreflabels for
clustering mode.

diff --git a/doc.ja/src/sgml/connection-settings.sgml b/doc.ja/src/sgml/connection-settings.sgml
index 7c0f71a0042d11b51fd9b8045869753c23fd89f0..22031978d77f70b33c5ca66eb34782061537593a 100644 (file)
--- a/doc.ja/src/sgml/connection-settings.sgml
+++ b/doc.ja/src/sgml/connection-settings.sgml
@@ -961,7 +961,7 @@
    </varlistentry>
   </variablelist>
 
- <sect2 id="runtime-config-streaming-replication-mode">
+ <sect2 id="runtime-config-streaming-replication-mode" xreflabel="ストリーミングレプリケーションモード">
   <title>ストリーミングレプリケーションモード</title>
 
   <para>
@@ -986,7 +986,7 @@ backend_clustering_mode = 'streaming_replication'
   </para>
  </sect2>
  
- <sect2 id="guc-replication-mode" xreflabel="native_replication_mode">
+ <sect2 id="guc-replication-mode" xreflabel="ネイティブレプリケーションモード">
   <title>ネイティブレプリケーションモード</title>
 
   <para>
@@ -1560,7 +1560,7 @@ backend_clustering_mode = 'native_replication'
   </variablelist>
  </sect2>
 
- <sect2 id="guc-snapshot-isolation-mode" xreflabel="snapshot_isolation_mode">
+ <sect2 id="guc-snapshot-isolation-mode" xreflabel="スナップショットアイソレーションモード">
   <title>スナップショットアイソレーションモード</title>
 
   <para>
@@ -1674,7 +1674,7 @@ backend_clustering_mode = 'slony'
   </para>
  </sect2>
 
- <sect2 id="guc-raw-mode" xreflabel="raw_mode">
+ <sect2 id="guc-raw-mode" xreflabel="rawモード">
   <title>rawモード</title>
   <para>
    このモードでは、<productname>Pgpool-II</>はデータベースの同期に関しては関与しません。

diff --git a/doc.ja/src/sgml/installation.sgml b/doc.ja/src/sgml/installation.sgml
index baca2eb61786676c87cc4d24ec879efa664aa1bf..961ab24facfce845566eb78f1378a764cfa0c0ff 100644 (file)
--- a/doc.ja/src/sgml/installation.sgml
+++ b/doc.ja/src/sgml/installation.sgml
@@ -591,24 +591,27 @@
 
   <para>
    <!--
-   If you are not going to use the native replication mode, you can skip this section.
+   If you are not going to use
+   the <xref linkend="guc-replication-mode">
+   nor <xref linkend="guc-snapshot-isolation-mode">, you can skip this
+   section.
    -->
-   ネイティブレプリケーションモードを使う予定のない場合は、本節は飛ばすことができます。
+   <xref linkend="guc-replication-mode">または<xref linkend="guc-snapshot-isolation-mode">を使う予定のない場合は、本節は飛ばすことができます。
   </para>
 
   <para>
    <!--
-   If you plan to use native replication mode and insert_lock,
-   creating <structname>pgpool_catalog.insert_lock</structname>
-   table for mutual exclusion is strongly recommended.  Without
-   this, insert_lock works so far. However in that
-   case <productname>Pgpool-II</productname> locks against the
-   insert target table. This behavior is same
-   as <productname>Pgpool-II</productname> 2.2 and 2.3 series. The
-   table lock conflicts with <command>VACUUM</command>, so <command>INSERT</command>
+   If you plan to use the <xref linkend="guc-replication-mode">
+   or <xref linkend="guc-snapshot-isolation-mode"> and insert_lock,
+   creating <structname>pgpool_catalog.insert_lock</structname> table
+   for mutual exclusion is strongly recommended.  Without this,
+   insert_lock works so far. However in that
+   case <productname>Pgpool-II</productname> locks against the insert
+   target table. This behavior is same table lock conflicts
+   with <command>VACUUM</command>, so <command>INSERT</command>
    processing may be thereby kept waiting for a long time.
    -->
-   ネイティブレプリケーションモードでinsert_lockを利用したい場合は、排他制御用のテーブル<structname>pgpool_catalog.insert_lock</structname>を作成することを強く推奨します。
+   <xref linkend="guc-replication-mode">または<xref linkend="guc-snapshot-isolation-mode">でinsert_lockを利用したい場合は、排他制御用のテーブル<structname>pgpool_catalog.insert_lock</structname>を作成することを強く推奨します。
    これがなくてもある程度はinsert_lock は動作します。
    しかしその場合は、<productname>Pgpool-II</productname>は挿入対象のテーブルに対してロックを行います。
    これは<productname>Pgpool-II</productname> 2.2と2.3 シリーズの動作と同じです。

diff --git a/doc/src/sgml/connection-settings.sgml b/doc/src/sgml/connection-settings.sgml
index 4de5f1d7dde3941e8922eef19f9916e86fe61743..ceb4a7fe78beb0fa9ed851a1e30fc3e0e65fd196 100644 (file)
--- a/doc/src/sgml/connection-settings.sgml
+++ b/doc/src/sgml/connection-settings.sgml
@@ -644,7 +644,7 @@
   </variablelist>
  </para>
 
- <sect2 id="runtime-config-streaming-replication-mode">
+ <sect2 id="runtime-config-streaming-replication-mode" xreflabel="streaming replication mode">
   <title>Streaming replication mode</title>
 
   <para>
@@ -676,7 +676,7 @@ backend_clustering_mode = 'streaming_replication'
   </para>
  </sect2>
  
- <sect2 id="guc-replication-mode" xreflabel="native_replication_mode">
+ <sect2 id="guc-replication-mode" xreflabel="native replication mode">
   <title>Native replication mode</title>
 
   <para>
@@ -1106,7 +1106,7 @@ backend_clustering_mode = 'native_replication'
   </variablelist>
  </sect2>
 
- <sect2 id="guc-snapshot-isolation-mode" xreflabel="snapshot_isolation_mode">
+ <sect2 id="guc-snapshot-isolation-mode" xreflabel="snapshot isolation mode">
   <title>Snapshot isolation mode</title>
 
   <para>
@@ -1237,7 +1237,7 @@ backend_clustering_mode = 'slony'
   </para>
  </sect2>
 
- <sect2 id="guc-raw-mode" xreflabel="raw_mode">
+ <sect2 id="guc-raw-mode" xreflabel="raw mode">
   <title>Raw mode</title>
   <para>
    In this mode, <productname>Pgpool-II</> does not care about the database synchronization.

diff --git a/doc/src/sgml/installation.sgml b/doc/src/sgml/installation.sgml
index 9f00b54b5dd7b6b6b5856db9bfdf1a7bd3bc42a5..8833d07e648b2982ad3bfe139eb289f548486997 100644 (file)
--- a/doc/src/sgml/installation.sgml
+++ b/doc/src/sgml/installation.sgml
@@ -462,17 +462,21 @@
   <title>Creating insert_lock table</title>
 
   <para>
-   If you are not going to use the native replication mode, you can skip this section.
+   If you are not going to use
+   the <xref linkend="guc-replication-mode">
+   nor <xref linkend="guc-snapshot-isolation-mode">, you can skip this
+   section.
   </para>
 
   <para>
-   If you plan to use native replication mode and insert_lock,
-   creating <structname>pgpool_catalog.insert_lock</structname>
-   table for mutual exclusion is strongly recommended.  Without
-   this, insert_lock works so far. However in that
-   case <productname>Pgpool-II</productname> locks against the
-   insert target table. This behavior is same
-   table lock conflicts with <command>VACUUM</command>, so <command>INSERT</command>
+   If you plan to use the <xref linkend="guc-replication-mode">
+   or <xref linkend="guc-snapshot-isolation-mode"> and insert_lock,
+   creating <structname>pgpool_catalog.insert_lock</structname> table
+   for mutual exclusion is strongly recommended.  Without this,
+   insert_lock works so far. However in that
+   case <productname>Pgpool-II</productname> locks against the insert
+   target table. This behavior is same table lock conflicts
+   with <command>VACUUM</command>, so <command>INSERT</command>
    processing may be thereby kept waiting for a long time.
 
    <programlisting>