Doc: fix indent.

diff --git a/doc.ja/src/sgml/failover.sgml b/doc.ja/src/sgml/failover.sgml
index 68798a1f081c34de36c91266372b3a3c6484d7f5..112455e86a6743da91588a773dcc3efbb44cacaf 100644 (file)
--- a/doc.ja/src/sgml/failover.sgml
+++ b/doc.ja/src/sgml/failover.sgml
@@ -134,13 +134,6 @@
         -->
         <entry>切り離されたノードのデータベースクラスタパス</entry>
        </row>
-       <row>
-        <entry>%M</entry>
-        <!--
-        <entry>Old main node ID</entry>
-        -->
-        <entry>古いメインノードのID</entry>
-       </row>
        <row>
         <entry>%m</entry>
         <!--
@@ -155,6 +148,13 @@
         -->
         <entry>新しいメインノードのホスト名</entry>
        </row>
+       <row>
+        <entry>%M</entry>
+        <!--
+        <entry>Old main node ID</entry>
+        -->
+        <entry>古いメインノードのID</entry>
+       </row>
        <row>
         <entry>%P</entry>
         <!--
@@ -479,19 +479,23 @@
       code to illustrate how the command is executed:
       -->
       <programlisting>
-       for each backend node
-       {
-       if (the node is not the new primary)
-       set down node status to shared memory status
-       memorize that folllow primary command is needed to execute
-       }
-       if (we need to executed follow primary command)
-       fork a child process
-       (within the child process)
-
-       for each backend node
-       if (the node status in shared memory is down)
-       execute follow primary command
+for each backend node
+{
+    if (the node is not the new primary)
+        set down node status to shared memory status
+        memorize that folllow primary command is needed to execute
+}
+if (we need to executed follow primary command)
+{
+    fork a child process
+    (within the child process)
+
+    for each backend node
+    {
+        if (the node status in shared memory is down)
+            execute follow primary command
+    }
+}
       </programlisting>
      </para>
 
@@ -550,13 +554,6 @@
         -->
         <entry>切り離されたノードのデータベースクラスタパス</entry>
        </row>
-       <row>
-        <entry>%M</entry>
-        <!--
-        <entry>Old main node ID</entry>
-        -->
-        <entry>古いメインノードのID</entry>
-       </row>
        <row>
         <entry>%m</entry>
         <!--
@@ -571,6 +568,13 @@
         -->
         <entry>新しいプライマリノードのホスト名</entry>
        </row>
+       <row>
+        <entry>%M</entry>
+        <!--
+        <entry>Old main node ID</entry>
+        -->
+        <entry>古いメインノードのID</entry>
+       </row>
        <row>
         <entry>%P</entry>
         <!--

diff --git a/doc/src/sgml/failover.sgml b/doc/src/sgml/failover.sgml
index 1225a5ef7a4b8d08025080bd1a9b0be8a2b3e9ae..03e550c2746ab3ad08aed598f9159e84180de29f 100644 (file)
--- a/doc/src/sgml/failover.sgml
+++ b/doc/src/sgml/failover.sgml
@@ -150,10 +150,6 @@
         <entry>%D</entry>
         <entry>Database cluster directory of the detached node</entry>
        </row>
-       <row>
-        <entry>%M</entry>
-        <entry>Old main node ID</entry>
-       </row>
        <row>
         <entry>%m</entry>
         <entry>New main node ID</entry>
@@ -162,6 +158,10 @@
         <entry>%H</entry>
         <entry>Hostname of the new main node</entry>
        </row>
+       <row>
+        <entry>%M</entry>
+        <entry>Old main node ID</entry>
+       </row>
        <row>
         <entry>%P</entry>
         <entry>Old primary node ID</entry>
@@ -384,19 +384,23 @@
       of <productname>Pgpool-II</productname>. Here is a pseud
       code to illustrate how the command is executed:
       <programlisting>
-       for each backend node
-       {
-       if (the node is not the new primary)
-       set down node status to shared memory status
-       memorize that follow primary command is needed to execute
-       }
-       if (we need to executed follow primary command)
-       fork a child process
-       (within the child process)
-
-       for each backend node
-       if (the node status in shared memory is down)
-       execute follow primary command
+for each backend node
+{
+    if (the node is not the new primary)
+        set down node status to shared memory status
+        memorize that follow primary command is needed to execute
+}
+if (we need to executed follow primary command)
+{
+    fork a child process
+    (within the child process)
+
+    for each backend node
+    {
+        if (the node status in shared memory is down)
+            execute follow primary command
+    }
+}
       </programlisting>
      </para>
 
@@ -432,10 +436,6 @@
         <entry>%D</entry>
         <entry>Database cluster directory of the detached node</entry>
        </row>
-       <row>
-        <entry>%M</entry>
-        <entry>Old main node ID</entry>
-       </row>
        <row>
         <entry>%m</entry>
         <entry>New primary node ID</entry>
@@ -444,6 +444,10 @@
         <entry>%H</entry>
         <entry>Hostname of the new primary node</entry>
        </row>
+       <row>
+        <entry>%M</entry>
+        <entry>Old main node ID</entry>
+       </row>
        <row>
         <entry>%P</entry>
         <entry>Old primary node ID</entry>

diff --git a/src/sample/scripts/failover.sh.sample b/src/sample/scripts/failover.sh.sample
index c2d9d0ebe1dbcd01e6b47e6b153320363e650bb8..5be9dd9d71b1e6f35fa4d66e86a301ce5bfffc91 100755 (executable)
--- a/src/sample/scripts/failover.sh.sample
+++ b/src/sample/scripts/failover.sh.sample
@@ -4,19 +4,19 @@
 set -o xtrace
 
 # Special values:
-#   %d = failed node id
-#   %h = failed node hostname
-#   %p = failed node port number
-#   %D = failed node database cluster path
-#   %m = new main node id
-#   %H = new main node hostname
-#   %M = old main node id
-#   %P = old primary node id
-#   %r = new main port number
-#   %R = new main database cluster path
-#   %N = old primary node hostname
-#   %S = old primary node port number
-#   %% = '%' character
+# 1)  %d = failed node id
+# 2)  %h = failed node hostname
+# 3)  %p = failed node port number
+# 4)  %D = failed node database cluster path
+# 5)  %m = new main node id
+# 6)  %H = new main node hostname
+# 7)  %M = old main node id
+# 8)  %P = old primary node id
+# 9)  %r = new main port number
+# 10) %R = new main database cluster path
+# 11) %N = old primary node hostname
+# 12) %S = old primary node port number
+# 13) %% = '%' character
 
 FAILED_NODE_ID="$1"
 FAILED_NODE_HOST="$2"