Gitweb:
http://git.fedorahosted.org/git/?p=cluster.git;a=commitdiff;h=3118b7849b8...
Commit: 3118b7849b85b4dfc3d1b6979a64ebea893dce0e
Parent: ef45cc5ab4dc50a88506e0360cf360af29235aa4
Author: Christine Caulfield <ccaulfie(a)redhat.com>
AuthorDate: Fri Dec 20 10:35:54 2013 +0000
Committer: Christine Caulfield <ccaulfie(a)redhat.com>
CommitterDate: Fri Dec 20 10:38:18 2013 +0000
cman: fix some typos and English phrasing in cman defaults file
The cman.init.defaults file had some typos and odd non-English phrasing.
I've also fixed a inconsistent punctuation in a few places too
rhbz#1035929
Signed-off-by: Christine Caulfield <ccaulfie(a)redhat.com>
---
cman/init.d/cman.init.defaults.in | 32 ++++++++++++++++----------------
1 files changed, 16 insertions(+), 16 deletions(-)
diff --git a/cman/init.d/cman.init.defaults.in b/cman/init.d/cman.init.defaults.in
index 835b44f..c42672c 100644
--- a/cman/init.d/cman.init.defaults.in
+++ b/cman/init.d/cman.init.defaults.in
@@ -1,23 +1,23 @@
-# CMAN_CLUSTER_TIMEOUT -- amount of time to wait for joinging a cluster
+# CMAN_CLUSTER_TIMEOUT -- amount of time to wait to join a cluster
# before giving up. If CMAN_CLUSTER_TIMEOUT is positive, then we will
-# wait CMAN_CLUSTER_TIMEOUT seconds before giving up and failing when
-# a cluster is not joined. If CMAN_CLUSTER_TIMEOUT is zero, then
-# wait indefinately for a cluster join. If CMAN_CLUSTER_TIMEOUT is
-# negative, do not check to see that the cluster has been joined
+# wait CMAN_CLUSTER_TIMEOUT seconds before giving up and failing if
+# we can't join a cluster. If CMAN_CLUSTER_TIMEOUT is zero, then we
+# will wait indefinitely for a cluster join. If CMAN_CLUSTER_TIMEOUT is
+# negative, do not check to see if we have joined a cluster.
#CMAN_CLUSTER_TIMEOUT=60
# CMAN_QUORUM_TIMEOUT -- amount of time to wait for a quorate cluster on
-# startup quorum is needed by many other applications, so we may as
+# startup. Quorum is needed by many other applications, so we may as
# well wait here. If CMAN_QUORUM_TIMEOUT is zero, quorum will
# be ignored.
#CMAN_QUORUM_TIMEOUT=45
# CMAN_SHUTDOWN_TIMEOUT -- amount of time to wait for cman to become a
-# cluster member before calling cman_tool leave during shutdown.
+# cluster member before calling 'cman_tool' leave during shutdown.
# The default is 60 seconds
#CMAN_SHUTDOWN_TIMEOUT=60
-# CMAN_NOTIFYD_START - control the startup behaviour for cmannotifyd
+# CMAN_NOTIFYD_START - control the startup behaviour for cmannotifyd,
# the variable can take 3 values:
# yes | will always start cmannotifyd
# no | will never start cmannotifyd
@@ -25,7 +25,7 @@
# are found in @NOTIFYDDIR@
#CMAN_NOTIFYD_START=conditional
-# CMAN_SSHD_START - control sshd startup behaviour
+# CMAN_SSHD_START -- control sshd startup behaviour,
# the variable can take 2 values:
# yes | cman will start sshd as early as possible
# no (default) | cman will not start sshd
@@ -74,7 +74,7 @@
# CLUSTERNAME -- override clustername as specified in cluster.conf
#CLUSTERNAME=""
-# NODENAME -- specify the nodename of this node. Default autodetected
+# NODENAME -- specify the nodename of this node. Default autodetected.
#NODENAME=""
# CONFIG_LOADER -- select default config parser.
@@ -83,21 +83,21 @@
# config propagation method. (default)
#CONFIG_LOADER=xmlconfig
-# CONFIG_VALIDATION -- select default config validation behaviour
+# CONFIG_VALIDATION -- select default config validation behaviour.
# This can be:
# FAIL - Use a very strict checking. The config will not be loaded if there
-# for any kind of warnings/errors.
-# WARN - Same as FAIL, but will allow the config to load (this is temporary
+# are any kind of warnings/errors
+# WARN - Same as FAIL, but will allow the config to load (this is temporarily
# the default behaviour)
-# NONE - Disable config validation. Highly discouraged.
+# NONE - Disable config validation. Highly discouraged
#CONFIG_VALIDATION=WARN
# CMAN_LEAVE_OPTS -- allows extra options to be passed to cman_tool when leave
# operation is performed.
#CMAN_LEAVE_OPTS=""
-# INITLOGLEVEL -- select how verbose the init script should be
-# possible values:
+# INITLOGLEVEL -- select how verbose the init script should be.
+# Possible values:
# quiet - only one line notification for start/stop operations
# terse (default) - show only required activity
# full - show everything