cluster: STABLE3 - man pages: cluster.conf

[David Teigland]

Gitweb:        http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=114e83ae331d5e112f010e258cfe8d6eafba02ee
Commit:        114e83ae331d5e112f010e258cfe8d6eafba02ee
Parent:        c2a4aaea73b0a7d2d9823d8cfacf314ca81d0aa8
Author:        David Teigland <teigland@redhat.com>
AuthorDate:    Fri Feb 20 12:22:10 2009 -0600
Committer:     David Teigland <teigland@redhat.com>
CommitterDate: Fri Feb 20 12:24:19 2009 -0600

man pages: cluster.conf

Changes per what I proposed, really makes things much cleaner...
hoping we all agree on it.

Signed-off-by: David Teigland <teigland@redhat.com>
---
 config/man/cluster.conf.5 |   82 ++++++++++++++++-----------------------------
 1 files changed, 29 insertions(+), 53 deletions(-)

diff --git a/config/man/cluster.conf.5 b/config/man/cluster.conf.5
index 9914b9a..f5caf0f 100644
--- a/config/man/cluster.conf.5
+++ b/config/man/cluster.conf.5
@@ -76,34 +76,33 @@ communication.  Nodeid's must be greater than zero and unique.
   </cluster>
 
 .SS Logging
-
+.br
 All daemons listed above use the <logging> section to configure loggging.
 Global settings apply to all:
-.br
+
   <logging debug="on"/>
 
-Per-daemon/subsys settings override the corresponding global setting:
-.br
+Per-daemon settings override the corresponding global setting.  logging_daemon
+names that can be configured include: corosync, qdiskd, groupd, fenced,
+dlm_controld, gfs_controld, rgmanager.
+
   <logging>
-      <logging_subsys="foo" debug="on"/>
-      <logging_subsys="bar" debug="on"/>
+      <logging_daemon name="qdiskd" debug="on"/>
+      <logging_daemon name="fenced" debug="on"/>
   </logging>
 
-.B Subsystems
-
-The logging_subsys daemons/subsystems that can be configured include
+corosync daemon settings apply to all corosync subsystems by default, but
+subsystems can also be configured individually.  These include CLM, CPG, MAIN,
+SERV, CMAN, TOTEM, QUORUM, CONFDB, CKPT, EVT.
 
-daemon names:
-.br
-qdiskd, groupd, fenced, dlm_controld, gfs_controld, rgmanager
-
-corosync subsystems:
-.br
-CLM, CPG, MAIN, SERV, CMAN, TOTEM, QUORUM, CONFDB
+  <logging>
+      <logging_daemon name="corosync" subsys="QUORUM" debug="on"/>
+      <logging_daemon name="corosync" subsys="CONFDB" debug="on"/>
+  </logging>
 
 .B Settings
-
-The settings available both at the global and subsystem level are
+.br
+The settings available at global, daemon and subsystem levels are:
 
 .B to_syslog
 .br
@@ -144,63 +143,40 @@ the log file name, default /var/log/cluster/<daemon>.log
 is a shortcut for logfile_priority="debug"
 
 .B Defaults
-
+.br
 An explicit configuration for the default settings would be:
 
 <logging to_syslog="yes" to_logfile="yes" syslog_facility="daemon"
          syslog_priority="info" logfile_priority="info">
 .br
-    <logging_subsys="qdiskd"
+    <logging_daemon name="qdiskd"
              logfile="/var/log/cluster/qdisk.log"/>
 .br
-    <logging_subsys="groupd"
+    <logging_daemon name="groupd"
              logfile="/var/log/cluster/groupd.log"/>
 .br
-    <logging_subsys="fenced"
+    <logging_daemon name="fenced"
              logfile="/var/log/cluster/fenced.log"/>
 .br
-    <logging_subsys="dlm_controld"
+    <logging_daemon name="dlm_controld"
              logfile="/var/log/cluster/dlm_controld.log"/>
 .br
-    <logging_subsys="gfs_controld"
+    <logging_daemon name="gfs_controld"
              logfile="/var/log/cluster/gfs_controld.log"/>
 .br
-    <logging_subsys="rgmanager"
+    <logging_daemon name="rgmanager"
              logfile="/var/log/cluster/rgmanager.log"/>
 .br
-    <logging_subsys="CLM"
-             logfile="/var/log/cluster/cman.log"/>
-.br
-    <logging_subsys="CPG"
-             logfile="/var/log/cluster/cman.log"/>
-.br
-    <logging_subsys="MAIN"
-             logfile="/var/log/cluster/cman.log"/>
-.br
-    <logging_subsys="SERV"
-             logfile="/var/log/cluster/cman.log"/>
-.br
-    <logging_subsys="CMAN"
-             logfile="/var/log/cluster/cman.log"/>
-.br
-    <logging_subsys="TOTEM"
-             logfile="/var/log/cluster/cman.log"/>
-.br
-    <logging_subsys="QUORUM"
-             logfile="/var/log/cluster/cman.log"/>
-.br
-    <logging_subsys="CONFDB"
-             logfile="/var/log/cluster/cman.log"/>
+    <logging_daemon name="corosync"
+             logfile="/var/log/cluster/corosync.log"/>
 .br
 </logging>
 
 .B Examples
-
-To include LOG_DEBUG messages (and above) from all daemons/subsystems in their default log files, either
+.br
+To include LOG_DEBUG messages (and above) from all daemons in their default log files, either
 .in +7
 <logging debug="on"/> or
-.in -7
-.in +7
 <logging logfile_priority="debug"/>
 .in -7
 
@@ -214,7 +190,7 @@ To disable logging to all log files
 <logging to_file="no"/>
 .in -7
 
-To include LOG_DEBUG messages (and above) from all daemons/subsystems in syslog
+To include LOG_DEBUG messages (and above) from all daemons in syslog
 .in +7
 <logging syslog_priority="debug"/>
 .in -7