summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSol Jerome <sol.jerome@gmail.com>2012-08-13 16:33:16 -0500
committerSol Jerome <sol.jerome@gmail.com>2012-08-13 16:33:16 -0500
commitaef902e8e94c85c48ba1f4df42cbdaabfd409d79 (patch)
treed9192ee8a2bb697135574e793bec8dbcd2ee2a8c
parente5cb0cc36c58c256921c1d658ace121f624ef6c3 (diff)
downloadbcfg2-aef902e8e94c85c48ba1f4df42cbdaabfd409d79.tar.gz
bcfg2-aef902e8e94c85c48ba1f4df42cbdaabfd409d79.tar.bz2
bcfg2-aef902e8e94c85c48ba1f4df42cbdaabfd409d79.zip
man: Add -B and -Z options from 01d68bf
Signed-off-by: Sol Jerome <sol.jerome@gmail.com>
-rw-r--r--man/bcfg2.116
-rw-r--r--tools/manpagegen/bcfg2.1.ronn12
2 files changed, 21 insertions, 7 deletions
diff --git a/man/bcfg2.1 b/man/bcfg2.1
index d0f0e0062..2aa219756 100644
--- a/man/bcfg2.1
+++ b/man/bcfg2.1
@@ -1,5 +1,5 @@
.
-.TH "BCFG2" "1" "June 2012" "" ""
+.TH "BCFG2" "1" "August 2012" "" ""
.
.SH "NAME"
\fBbcfg2\fR \- Bcfg2 client tool
@@ -33,8 +33,12 @@ Upload statistics about the Bcfg2 execution and client state
.SH "OPTIONS"
.
.TP
+\fB\-B\fR
+Configure everything except the given bundle(s)\.
+.
+.TP
\fB\-C\fR \fIconfigfile\fR
-Specify alternate bcfg2\.conf location
+Specify alternate bcfg2\.conf location\.
.
.TP
\fB\-D\fR [\fIdriver1\fR,\fIdriver2\fR]
@@ -53,7 +57,7 @@ Run bcfg2 in interactive mode\. The user will be prompted before each change\.
.
.TP
\fB\-O\fR
-Omit lock check
+Omit lock check\.
.
.TP
\fB\-P\fR
@@ -68,6 +72,10 @@ Specify the number of times that the client will attempt to retry network commun
Manually specify the server location (as opposed to using the value in bcfg2\.conf)\.
.
.TP
+\fB\-Z\fR
+Do not configure independent entries\.
+.
+.TP
\fB\-b\fR [\fIbundle1:bundle2\fR]
Run bcfg2 against one or multiple bundles in the configuration\.
.
@@ -129,7 +137,7 @@ Cause bcfg2 to remove extra configuration elements it detects\. Mode is one of a
.
.TP
\fB\-s\fR \fIservice mode\fR
-Set bcfg2 interaction level for services\. Default behavior is to modify all services affected by reconfiguration\. build mode attempts to stop all services started\. disabled suppresses all attempts to modify services
+Set bcfg2 interaction level for services\. Default behavior is to modify all services affected by reconfiguration\. build mode attempts to stop all services started\. disabled suppresses all attempts to modify services\.
.
.TP
\fB\-\-ssl\-cert=\fR\fIssl cert\fR
diff --git a/tools/manpagegen/bcfg2.1.ronn b/tools/manpagegen/bcfg2.1.ronn
index c801c833d..8b3ea1e60 100644
--- a/tools/manpagegen/bcfg2.1.ronn
+++ b/tools/manpagegen/bcfg2.1.ronn
@@ -19,8 +19,11 @@ process consists of the following steps.
## OPTIONS
+ * `-B`:
+ Configure everything except the given bundle(s).
+
* `-C` <configfile>:
- Specify alternate bcfg2.conf location
+ Specify alternate bcfg2.conf location.
* `-D` [<driver1>,<driver2>]:
Specify a set of Bcfg2 tool drivers.
@@ -36,7 +39,7 @@ process consists of the following steps.
each change.
* `-O`:
- Omit lock check
+ Omit lock check.
* `-P`:
Run bcfg2 in paranoid mode. Diffs will be logged for configuration
@@ -50,6 +53,9 @@ process consists of the following steps.
Manually specify the server location (as opposed to using the value
in bcfg2.conf).
+ * `-Z`:
+ Do not configure independent entries.
+
* `-b` [_bundle1:bundle2_]:
Run bcfg2 against one or multiple bundles in the configuration.
@@ -120,7 +126,7 @@ process consists of the following steps.
Set bcfg2 interaction level for services. Default behavior is to
modify all services affected by reconfiguration. build mode attempts
to stop all services started. disabled suppresses all attempts to
- modify services
+ modify services.
* `--ssl-cert=`<ssl cert>:
Specifiy the path to the SSL certificate.