3 files changed, 54 insertions, 27 deletions
diff --git a/tools/manpagegen/bcfg2-admin.8.ronn b/tools/manpagegen/bcfg2-admin.8.ronn
index c827265ca..f90865d9c 100644
--- a/tools/manpagegen/bcfg2-admin.8.ronn
+++ b/tools/manpagegen/bcfg2-admin.8.ronn
@@ -12,12 +12,37 @@ bcfg2-admin(8) -- Perform repository administration tasks
 ## OPTIONS
 
   * `-C` <configfile>:
-    Specify alternate bcfg2.conf location
+    Specify alternate bcfg2.conf location.
 
-## MODES
+  * `-E` <encoding>:
+    Specify the encoding of Cfg files.
 
-  * `init`:
-    Initialize a new repository (interactive).
+  * `-Q` <repository path>:
+    Specify the path to the server repository.
+
+  * `-S` <https://server:port>:
+    Manually specify the server location (as opposed to using the value
+    in bcfg2.conf).
+
+  * `-d`:
+    Enable debugging output.
+
+  * `-h`:
+    Print Usage information.
+
+  * `-o` <logfile path>:
+    Writes a log to the specified path.
+
+  * `-v`:
+    Enable verbose output.
+
+  * `-x` <password>:
+    Use ’password’ for client communication.
+
+  * `--ssl-key=`<ssl key>:
+    Specifiy the path to the SSL key.
+
+## MODES
 
   * `backup`:
     Create an archive of the entire Bcfg2 repository.
@@ -30,23 +55,29 @@ bcfg2-admin(8) -- Perform repository administration tasks
     Add, edit, or remove clients entries in metadata (See [`CLIENT
     OPTIONS`](###CLIENT OPTIONS) below).
 
-  * `query` [g=group] [p=profile] [-f output-file] [-n] [-c]:
-    Search for clients based on group or profile (See [`QUERY
-    OPTIONS`](###QUERY OPTIONS) below).
-
   * `compare` <old> <new>:
     Compare two client configurations. Can be used to verify consistent
     behavior between releases. Determine differences between files or
     directories (See [`COMPARE OPTIONS`](###COMPARE OPTIONS) below).
 
+  * `init`:
+    Initialize a new repository (interactive).
+
   * `minestruct` <client> [-f xml-file] [-g groups]:
     Build structure entries based on client statistics extra entries
     (See [`MINESTRUCT OPTIONS`](###MINESTRUCT OPTIONS) below).
 
+  * `perf`:
+    Query server for performance data.
+
   * `pull` <client> <entry-type> <entry-name>:
     Install configuration information into repo based on client bad
     entries (See [`PULL OPTIONS`](###PULL OPTIONS) below).
 
+  * `query` [g=group] [p=profile] [-f output-file] [-n] [-c]:
+    Search for clients based on group or profile (See [`QUERY
+    OPTIONS`](###QUERY OPTIONS) below).
+
   * `reports` [init|load_stats|purge|scrub|update]:
     Interact with the dynamic reporting system (See [`REPORTS
     OPTIONS`](###REPORTS OPTIONS) below).
@@ -55,6 +86,9 @@ bcfg2-admin(8) -- Perform repository administration tasks
     Interact with the Snapshots database (See [`SNAPSHOTS
     OPTIONS`](###SNAPSHOTS OPTIONS) below).
 
+  * `syncdb`:
+    Sync the Django ORM with the configured database.
+
   * `tidy`:
     Remove unused files from repository.
 
@@ -62,6 +96,9 @@ bcfg2-admin(8) -- Perform repository administration tasks
     Create a graphviz diagram of client, group and bundle information
     (See [`VIZ OPTIONS`](###VIZ OPTIONS) below).
 
+  * `xcmd`:
+    Provides a XML-RPC Command Interface to the bcfg2-server.
+
 ### BUNDLE OPTIONS
 
   * `mode`:
diff --git a/tools/manpagegen/bcfg2-ping-sweep.8.ronn b/tools/manpagegen/bcfg2-ping-sweep.8.ronn
deleted file mode 100644
index 815e0af5b..000000000
--- a/tools/manpagegen/bcfg2-ping-sweep.8.ronn
+++ /dev/null
@@ -1,16 +0,0 @@
-bcfg2-ping-sweep(8) -- Update pingable and pingtime attributes in clients.xml
-=============================================================================
-
-## SYNOPSIS
-
-`bcfg2-ping-sweep`
-
-## DESCRIPTION
-
-`bcfg2-ping-sweep` traverses the list of clients in Metadata/clients.xml
-and updates their pingable/pingtime attributes. The pingtime value is
-set to the last time the client was pinged (not the RTT value).
-
-## SEE ALSO
-
-bcfg2(1), bcfg2-server(8)
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.