File bug-1074039_pacemaker-documentation-pcmk_delay_base.patch of Package pacemaker.14737

commit 8afde53e9a6f22658c811e3467d5dc219d793754
Author: Klaus Wenninger <klaus.wenninger@aon.at>
Date:   Thu Jun 29 10:41:45 2017 +0200

    Doc: add documentation for new pcmk_delay_base

diff --git a/doc/Pacemaker_Explained/en-US/Ch-Stonith.txt b/doc/Pacemaker_Explained/en-US/Ch-Stonith.txt
index 133077a74..75a033253 100644
--- a/doc/Pacemaker_Explained/en-US/Ch-Stonith.txt
+++ b/doc/Pacemaker_Explained/en-US/Ch-Stonith.txt
@@ -138,11 +138,26 @@ indexterm:[Fencing,Property,pcmk_host_check]
 |0s
 |Enable a random delay of up to the time specified before executing stonith
 actions. This is sometimes used in two-node clusters to ensure that the
-nodes don't fence each other at the same time.
+nodes don't fence each other at the same time. The overall delay introduced
+by pacemaker is derived from this random delay value adding a static delay so
+that the sum is kept below the maximum delay.
 
 indexterm:[pcmk_delay_max,Fencing]
 indexterm:[Fencing,Property,pcmk_delay_max]
 
+|pcmk_delay_base
+|time
+|0s
+|Enable a static delay before executing stonith actions. This can e.g. be used
+in two-node clusters to ensure that the nodes don't fence each other if
+separate fencing-resources and different delay-values are being used. The
+node that is fenced with the shorter delay is gonna loose in a fencing-race.
+The overall delay introduced by pacemaker is derived from a random delay value
+adding this static delay so that the sum is kept below the maximum delay.
+
+indexterm:[pcmk_delay_base,Fencing]
+indexterm:[Fencing,Property,pcmk_delay_base]
+
 |pcmk_action_limit
 |integer
 |1
diff --git a/doc/Pacemaker_Explained/pot/Ch-Stonith.pot b/doc/Pacemaker_Explained/pot/Ch-Stonith.pot
index f54021d26..9a896c3ee 100644
--- a/doc/Pacemaker_Explained/pot/Ch-Stonith.pot
+++ b/doc/Pacemaker_Explained/pot/Ch-Stonith.pot
@@ -254,7 +254,7 @@ msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "Enable a random delay of up to the time specified before executing stonith actions. This is sometimes used in two-node clusters to ensure that the nodes don’t fence each other at the same time."
+msgid "Enable a random delay of up to the time specified before executing stonith actions. This is sometimes used in two-node clusters to ensure that the nodes don’t fence each other at the same time. The overall delay is derived from this random delay value adding a static delay so that the sum is kept below the maximum delay."
 msgstr ""
 
 #. Tag: para
@@ -264,6 +264,31 @@ msgstr ""
 
 #. Tag: para
 #, no-c-format
+msgid "<literal>pcmk_delay_base</literal>"
+msgstr ""
+
+#. Tag: para
+#, no-c-format
+msgid "time"
+msgstr ""
+
+#. Tag: para
+#, no-c-format
+msgid "0s"
+msgstr ""
+
+#. Tag: para
+#, no-c-format
+msgid "Enable a base delay for stonith actions and specify base delay value. This prevents double fencing when different delays are configured on the nodes. The overall delay is derived from a random delay value adding this static delay so that the sum is kept below the maximum delay."
+msgstr ""
+
+#. Tag: para
+#, no-c-format
+msgid "<indexterm> <primary>pcmk_delay_base</primary><secondary>Fencing</secondary> </indexterm> <indexterm> <primary>Fencing</primary> </indexterm> <indexterm> <primary>Fencing</primary><secondary>Property</secondary><tertiary>pcmk_delay_base</tertiary> </indexterm> <indexterm> <primary>Property</primary><secondary>pcmk_delay_base</secondary> </indexterm> <indexterm> <primary>pcmk_delay_base</primary> </indexterm>"
+msgstr ""
+
+#. Tag: para
+#, no-c-format
 msgid "<literal>pcmk_action_limit</literal>"
 msgstr ""
 
diff --git a/fencing/main.c b/fencing/main.c
index 1622362fa..360bc25d1 100644
--- a/fencing/main.c
+++ b/fencing/main.c
@@ -1378,21 +1378,21 @@ main(int argc, char **argv)
 
         printf("  <parameter name=\"%s\" unique=\"0\">\n", STONITH_ATTR_DELAY_MAX);
         printf
-            ("    <shortdesc lang=\"en\">Enable random delay for stonith actions and specify the maximum of random delay</shortdesc>\n");
+            ("    <shortdesc lang=\"en\">Enable a random delay for stonith actions and specify the maximum of random delay.</shortdesc>\n");
         printf
             ("    <longdesc lang=\"en\">This prevents double fencing when using slow devices such as sbd.\n"
-             "Use this to enable random delay for stonith actions.\n"
-             "The overall delay is derived from a random delay value adding a static delay so that the sum is kept below the maximum delay.</longdesc>\n");
+             "Use this to enable a random delay for stonith actions.\n"
+             "The overall delay is derived from this random delay value adding a static delay so that the sum is kept below the maximum delay.</longdesc>\n");
         printf("    <content type=\"time\" default=\"0s\"/>\n");
         printf("  </parameter>\n");
 
         printf("  <parameter name=\"%s\" unique=\"0\">\n", STONITH_ATTR_DELAY_BASE);
         printf
-            ("    <shortdesc lang=\"en\">Enable base delay for stonith actions and specify base delay value</shortdesc>\n");
+            ("    <shortdesc lang=\"en\">Enable a base delay for stonith actions and specify base delay value.</shortdesc>\n");
         printf
             ("    <longdesc lang=\"en\">This prevents double fencing when different delays are configured on the nodes.\n"
-             "Use this to enable static delay for stonith actions.\n"
-             "The overall delay is derived from a random delay value adding a static delay so that the sum is kept below the maximum delay.</longdesc>\n");
+             "Use this to enable a static delay for stonith actions.\n"
+             "The overall delay is derived from a random delay value adding this static delay so that the sum is kept below the maximum delay.</longdesc>\n");
         printf("    <content type=\"time\" default=\"0s\"/>\n");
         printf("  </parameter>\n");