'-K' is replaced by '--ssl-key'

Minor changes and updates

git-svn-id: https://svn.mcs.anl.gov/repos/bcfg/trunk/bcfg2@6013 ce84e21b-d406-0410-9b95-82705330c041

5 files changed, 243 insertions, 98 deletions

diff --git a/man/bcfg2-admin.8 b/man/bcfg2-admin.8
index e6e251358..e2fdc9e0a 100644
--- a/man/bcfg2-admin.8
+++ b/man/bcfg2-admin.8
@@ -10,12 +10,13 @@ bcfg2-admin \- Perform repository administration tasks
 .SH DESCRIPTION
 .PP
 .B bcfg2-admin
-Perform bcfg2 repository administration
+Perform Bcfg2 repository administration
 .SH OPTIONS
 .PP
 .B \-C <config-file>
 .RS
-Specify the location of the configuration file (if it is not in /etc/bcfg2.conf)
+Specify the location of the configuration file (if it is not in
+/etc/bcfg2.conf)
 .RE
 .SH MODES
 .PP 
diff --git a/man/bcfg2-info.8 b/man/bcfg2-info.8
index 8fbba12e2..d46e34def 100644
--- a/man/bcfg2-info.8
+++ b/man/bcfg2-info.8
@@ -17,7 +17,8 @@ debugging purposes.
 .PP
 .B "\-C <config file>"
 .RS
-Specify the location of the configuration file (if it is not in /etc/bcfg2.conf).
+Specify the location of the configuration file (if it is not in
+/etc/bcfg2.conf).
 .RE
 .B "\-E <encoding>"
 .RS
@@ -48,39 +49,39 @@ Set the communication password.
 .PP
 .B build <hostname> <filename>
 .RS
-Build config for hostname, writing to filename
+Build config for hostname, writing to filename.
 .RE
 .B builddir <hostname> <dirname>
 .RS
-Build config for hostname, writing separate files to dirname
+Build config for hostname, writing separate files to dirname.
 .RE
 .B buildall <directory>
 .RS
-Build configs for all clients in directory
+Build configs for all clients in directory.
 .RE
 .B buildfile <filename> <hostname>
 .RS
-Build config file for hostname (not written to disk)
+Build config file for hostname (not written to disk).
 .RE
 .B bundles
 .RS
-Print out group/bundle information
+Print out group/bundle information.
 .RE
 .B clients
 .RS
-Print out client/profile information
+Print out client/profile information.
 .RE
 .B debug
 .RS
-Shell out to native python interpreter
+Shell out to native python interpreter.
 .RE
 .B event_debug
 .RS
-Display filesystem events as they are processed
+Display filesystem events as they are processed.
 .RE
 .B generators
 .RS
-List current versions of generators
+List current versions of generators.
 .RE
 .B groups
 .RS
@@ -88,23 +89,23 @@ List groups
 .RE
 .B help
 .RS
-Print the list of available commands
+Print the list of available commands.
 .RE
 .B mappings <type*> <name*>
 .RS
-Print generator mappings for optional type and name
+Print generator mappings for optional type and name.
 .RE
 .B profile <command> <args>
 .RS
-Profile a single bcfg2-info command
+Profile a single bcfg2-info command.
 .RE
 .B quit
 .RS
-Exit bcfg2-info command line
+Exit bcfg2-info command line.
 .RE
 .B showentries <hostname> <type>
 .RS
-Show abstract configuration entries for a given host
+Show abstract configuration entries for a given host.
 .RE
 .B showclient <client1> <client2>
 .RS
@@ -112,11 +113,11 @@ Show metadata for given hosts.
 .RE
 .B update
 .RS
-Process pending file events
+Process pending file events.
 .RE
 .B version
 .RS
-Print version of this tool
+Print version of this tool.
 .RE
 .SH "SEE ALSO"
 .BR bcfg2(1),
diff --git a/man/bcfg2-server.8 b/man/bcfg2-server.8
index 28487a3ee..a6bffc1fa 100644
--- a/man/bcfg2-server.8
+++ b/man/bcfg2-server.8
@@ -33,23 +33,23 @@ Writes a log to the specified path.
 .RE
 .B \-E <encoding>
 .RS
-Unicode encoding of config files
+Unicode encoding of config files.
 .RE
 .B \-x <password>
 .RS
-Set server password
+Set server password.
 .RE
 .B \-S <server url>
 .RS
-Set server address
+Set server address.
 .RE
 .B \-Q <repo path>
 .RS
-Set repository path
+Set repository path.
 .RE
-.B \-K <key path>
+.B \-\-ssl\-key=<ssl key>
 .RS
-Set path to ssl key
+Set path to SSL key.
 .RE
 .SH "SEE ALSO"
 .BR bcfg2(1),
diff --git a/man/bcfg2.1 b/man/bcfg2.1
index a22252fb2..bf20649c3 100644
--- a/man/bcfg2.1
+++ b/man/bcfg2.1
@@ -1,75 +1,89 @@
 .TH "bcfg2" 1
 .SH NAME
-bcfg2 \- reconfigure machine based on settings in BCFG2
+bcfg2 \- reconfigure machine based on settings in Bcfg2
 .SH SYNOPSIS
 .B bcfg2
 .I [\-d] [\-v] [\-p] [\-c cache file] [\-e] [\-f config file] [\-I] [\-q] [\-b bundle] [\-r removal mode]
 .SH DESCRIPTION
 .TP
 .BR bcfg2
-Runs the bcfg2 configuration process on the current host. This process
+Runs the Bcfg2 configuration process on the current host. This process
 consists of first fetching and executing probes, uploading probe
 results, fetching the client configuration, checking the current
 client state, attempting to install the desired configuration, and
-finally uploading statistics about the bcfg2 execution and client
+finally uploading statistics about the Bcfg2 execution and client
 state.
+
 .SH OPTIONS
 .TP
 .BR "\-C <configfile>"
-Specify alternate bcfg2.conf location
+Specify alternate bcfg2.conf location.
+
 .TP
 .BR "\-D <driver1>,<driver2>"
-Specify a set of bcfg2 tool drivers. NOTE: only drivers listed will be
+Specify a set of Bcfg2 tool drivers. NOTE: only drivers listed will be
 loaded. (IE, if you don't include POSIX, you will be unable to
-verify/install ConfigFiles, etc)
+verify/install ConfigFiles, etc).
+
 .TP
 .BR "\-E <encoding>"
 Specify the encoding of Cfg files.
+
 .TP
 .BR "\-I"
-Run bcfg2 in interactive mode.  The user will be prompted before each 
+Run bcfg2 in interactive mode. The user will be prompted before each 
 change.
+
 .TP
-.BR "\-K <SSL key file>" 
-Specify the path to the SSL key.
-.TP 
 .BR "\-O" 
 Omit lock check.
+
 .TP 
 .BR "\-P" 
 Run bcfg2 in paranoid mode. Diffs will be logged for
 configuration files marked as paranoid by the Bcfg2 server.
+
 .TP
 .BR "\-R <retry count>"
 Specify the number of times that the client will attempt to retry
 network communication.
+
 .TP
 .BR "\-S https://server:port"
 Manually specify the server location (as opposed to using the value in
 bcfg2.conf).
+
 .TP
 .BR "\-b <bundle1>:<bundle2>"
 Run bcfg2 against one or multiple bundles in the configuration.
+
 .TP
 .BR "\-c <cachefile>"
-Cache a copy of the configuration in cachefile
+Cache a copy of the configuration in cachefile.
+
 .TP
 .BR "\-d" 
 Run bcfg2 in debug mode.
+
 .TP 
 .BR "\-e" 
 When in verbose mode, display extra entry information (temporary until
-verbosity rework)
+verbosity rework).
+
 .TP
 .BR "\-f <specification path>" 
 Configure from a file rather than querying the server.
+
 .TP 
 .BR "\-h" 
 Print Usage information.
+
 .TP 
 .BR "\-k" 
 Run in bulletproof mode. This currently only affects behavior in the
-debian toolset; it calls apt\-get update and clean and dpkg \-\-configure \-\-pending.
+debian toolset; it calls apt\-get update and clean and
+dpkg \-\-configure \-\-pending.
+
 .TP
 .BR "\-l <whitelist|blacklist>"
 Run the client in the server decision list mode. This approach is needed
@@ -79,33 +93,52 @@ administrator supervision is available. Because collaborative
 configuration is one of the remaining hard issues in configuration
 management, these issues typically crop up in environments with several
 administrators and much configuration variety.
+
 .TP
 .BR "\-n"
 Run bcfg2 in dry\-run mode. No changes will be made to the
 system. 
+
 .TP
 .BR "\-o <LogFile Path>"
 Writes a log to the specified path.
+
 .TP
 .BR "\-p <profile>" 
 Assert a profile for the current client.
+
 .TP
 .BR "\-q"
 Run bcfg2 in quick mode. Package checksum verification won't be
 performed. This mode relaxes the constraints of correctness, and thus
-should only be used in safe conditions. 
+should only be used in safe conditions.
+ 
 .TP
 .BR "\-r <mode>" 
-Cause bcfg2 to remove extra configuration elements it detects. Mode is one of all, Services, or Packages. All removes all entries. Likewise, Services and Packages remove only the extra configuration elements of the respective type.
+Cause bcfg2 to remove extra configuration elements it detects. Mode is
+one of all, Services, or Packages. All removes all entries. Likewise,
+Services and Packages remove only the extra configuration elements of
+the respective type.
+
 .TP
 .BR "\-s <service mode>"
-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
+.BR "\-\-ssl\-key=<ssl key>"
+Specifiy the path to the SSL key.
+
 .TP
 .BR "\-u <user>" 
 Attempt to authenticate as 'user'.
+
 .TP
 .BR "\-x <password>" 
 Use 'password' for client communication.
+
 .TP
 .BR "\-v"
 Run bcfg2 in verbose mode.
diff --git a/man/bcfg2.conf.5 b/man/bcfg2.conf.5
index ec8c154a2..e6c3766b0 100644
--- a/man/bcfg2.conf.5
+++ b/man/bcfg2.conf.5
@@ -5,32 +5,42 @@ bcfg2.conf - configuration parameters for Bcfg2
 
 .SH DESCRIPTION
 .TP
-bcfg2.conf includes configuration parameters for the Bcfg2 server and client.
+bcfg2.conf includes configuration parameters for the Bcfg2 server and
+client.
 
 .SH FILE FORMAT
-The file is INI-style and consists of sections and options. A section begins with the name of the sections in square brackets and continues until the next section begins.
+The file is INI-style and consists of sections and options. A section
+begins with the name of the sections in square brackets and continues
+until the next section begins.
 
 Options are specified in the form 'name = value'.
 
-The file is line-based each newline-terminated line represents either a comment, a section name or an option.
+The file is line-based each newline-terminated line represents either
+a comment, a section name or an option.
 
-Any line beginning with a hash (#) is ignored, as are lines containing only whitespace.
+Any line beginning with a hash (#) is ignored, as are lines containing
+only whitespace.
 
 
 .SH SERVER OPTIONS
-These options are only necessary on the Bcfg2 server. They are specified in the [server] section of the configuration file.
+These options are only necessary on the Bcfg2 server. They are
+specified in the [server] section of the configuration file.
 
 .TP
 .B repository
-Specifies the path to the Bcfg2 repository containing all of the configuration specifications. The repository should be created using the 'bcfg2-admin init' command.
+Specifies the path to the Bcfg2 repository containing all of the
+configuration specifications. The repository should be created
+using the 'bcfg2-admin init' command.
 
 .TP
 .B filemonitor
-The file monitor used to watch for changes in the repository. Values of 'gamin', 'fam', or 'pseudo' are valid.
+The file monitor used to watch for changes in the repository.
+Values of 'gamin', 'fam', or 'pseudo' are valid.
 
 .TP
 .B plugins
-A comma-delimited list of enabled server plugins. Currently available plugins are:
+A comma-delimited list of enabled server plugins. Currently available
+plugins are:
 
 \(bu
 .B Account
@@ -45,32 +55,62 @@ The account plugin manages authentication data, including:
 \(bu
 .B Actions
 
-Action entries are commands that are executed either before bundle installation, after bundle installation or both. If exit status is observed, a failing pre-action will cause no modification of the enclosing bundle to be performed; all entries included in that bundle will not be modified. Failing actions are reported through Bcfg2's reporting system, so they can be centrally observed.
+Action entries are commands that are executed either before bundle
+installation, after bundle installation or both. If exit status is
+observed, a failing pre-action will cause no modification of the
+enclosing bundle to be performed; all entries included in that bundle
+will not be modified. Failing actions are reported through Bcfg2's
+reporting system, so they can be centrally observed.
 
 \(bu
 .B BB
-The BB plugin maps users to machines and metadata to machines.  (experimental)
+The BB plugin maps users to machines and metadata to machines. 
+(experimental)
 
 \(bu
 .B Base
-A structure plugin that provides the ability to add lists of unrelated entries into client configuration entry inventories. Base works much like Bundler in its file format. This structure plugin is good for the pile of independent configs needed for most actual systems.
+A structure plugin that provides the ability to add lists of unrelated
+entries into client configuration entry inventories. Base works much
+like Bundler in its file format. This structure plugin is good for
+the pile of independent configs needed for most actual systems.
 
 \(bu
 .B Bundler
-Bundler is used to describe groups of inter-dependent configuration entries, such as the combination of packages, configuration files, and service activations that comprise typical Unix daemons. Bundles are used to add groups of configuration entries to the inventory of client configurations, as opposed to describing particular versions of those
+Bundler is used to describe groups of inter-dependent configuration
+entries, such as the combination of packages, configuration files,
+and service activations that comprise typical Unix daemons. Bundles
+are used to add groups of configuration entries to the inventory of
+client configurations, as opposed to describing particular versions
+of those
 entries.
 
 \(bu
 .B Bzr
-The Bzr plugin allows you to track changes to your Bcfg2 repository using a GNU Bazaar version control backend. Currently, it enables you to get revision information out of your repository for reporting purposes.
+The Bzr plugin allows you to track changes to your Bcfg2 repository
+using a GNU Bazaar version control backend. Currently, it enables
+you to get revision information out of your repository for reporting
+purposes.
 
 \(bu
 .B Cfg
-The Cfg plugin provides a repository to describe configuration file contents for clients. In its simplest form, the Cfg repository is just a directory tree modeled off of the directory tree on your client machines.
+The Cfg plugin provides a repository to describe configuration file
+contents for clients. In its simplest form, the Cfg repository is
+just a directory tree modeled off of the directory tree on your client
+machines.
+
+\(bu
+.B Cvs
+The Cvs plugin allows you to track changes to your Bcfg2 repository
+using a Concurrent version control backend. Currently, it enables you
+to get revision information out of your repository for reporting
+purposes. (experimental)
 
 \(bu
 .B Darcs
-The Darcs plugin allows you to track changes to your Bcfg2 repository using a Darcs version control backend. Currently, it enables you to get revision information out of your repository for reporting purposes. (experimental)
+The Darcs plugin allows you to track changes to your Bcfg2 repository
+using a Darcs version control backend. Currently, it enables you to
+get revision information out of your repository for reporting purposes.
+(experimental)
 
 \(bu
 .B DBStats
@@ -78,31 +118,46 @@ Direct to database statistics plugin. (0.9.6 and later)
 
 \(bu
 .B Decisions
-The Decisions plugin has support for a centralized set of per-entry installation decisions. This approach is needed when particular changes are deemed "high risk"; this gives the ability to centrally specify these changes, but only install them on clients when administrator supervision is available. (0.9.6 and later)
+The Decisions plugin has support for a centralized set of per-entry
+installation decisions. This approach is needed when particular
+changes are deemed "high risk"; this gives the ability to centrally
+specify these changes, but only install them on clients when
+administrator supervision is available. (0.9.6 and later)
 
 \(bu
 .B Deps
-The Deps plugin allows you to make a series of assertions like "Package X requires Package Y (and optionally also Package Z etc.)
+The Deps plugin allows you to make a series of assertions like
+"Package X requires Package Y (and optionally also Package Z etc.)
 
 \(bu
 .B Editor
-The Editor plugin allows you to partially manage configuration for a file. Its use is not recommended and not well documented.
+The Editor plugin allows you to partially manage configuration for
+a file. Its use is not recommended and not well documented.
 
 \(bu
 .B Fossil
-The Fossil plugin allows you to track changes to your Bcfg2 repository using a Fossil SCM version control backend. Currently, it enables you to get revision information out of your repository for reporting purposes.
+The Fossil plugin allows you to track changes to your Bcfg2 repository
+using a Fossil SCM version control backend. Currently, it enables
+you to get revision information out of your repository for reporting
+purposes.
 
 \(bu
 .B Git
-The Git plugin allows you to track changes to your Bcfg2 repository using a git version control backend. Currently, it enables you to get revision information out of your repository for reporting purposes.
+The Git plugin allows you to track changes to your Bcfg2 repository
+using a Git version control backend. Currently, it enables you to
+get revision information out of your repository for reporting purposes.
 
 \(bu
 .B GroupPatterns
-The GroupPatterns plugin is a connector that can assign clients group membership based on patterns in client hostnames.
+The GroupPatterns plugin is a connector that can assign clients group
+membership based on patterns in client hostnames.
 
 \(bu
 .B Hg
-The Hg plugin allows you to track changes to your Bcfg2 repository using a Mercurial version control backend. Currently, it enables you to get revision information out of your repository for reporting purposes. (experimental)
+The Hg plugin allows you to track changes to your Bcfg2 repository
+using a Mercurial version control backend. Currently, it enables you
+to get revision information out of your repository for reporting
+purposes. (experimental)
 
 \(bu
 .B Hostbase
@@ -110,39 +165,56 @@ The Hostbase plugin is an IP management system built on top of Bcfg2.
 
 \(bu
 .B Metadata
-The Metadata plugin is the primary method of specifying Bcfg2 server metadata.
+The Metadata plugin is the primary method of specifying Bcfg2 server
+metadata.
 
 \(bu
 .B NagiosGen
-NagiosGen is a Bcfg2 plugin that dynamically generates Nagios configuration files based on Bcfg2 data.
+NagiosGen is a Bcfg2 plugin that dynamically generates Nagios
+configuration files based on Bcfg2 data.
 
 \(bu
 .B Ohai
-The Ohai plugin is used to detect information about the client operating system. The data is reported back to the server using JSON. (experimental)
+The Ohai plugin is used to detect information about the client
+operating system. The data is reported back to the server using
+JSON. (experimental)
 
 \(bu
 .B POSIXCompat
-The POSIXCompat plugin provides a compatibility layer which turns new-style (1.0) POSIX entries into old-style entries which are compatible with previous releases.
+The POSIXCompat plugin provides a compatibility layer which turns
+new-style (1.0) POSIX entries into old-style entries which are
+compatible with previous releases.
 
 \(bu
 .B Packages
-The Packages plugin is an alternative to Pkgmgr for specifying package entries for clients. Where Pkgmgr explicitly specifies package entry information, Packages delegates control of package version information to the underlying package manager, installing the latest version available from through those channels.
+The Packages plugin is an alternative to Pkgmgr for specifying
+package entries for clients. Where Pkgmgr explicitly specifies
+package entry information, Packages delegates control of package
+version information to the underlying package manager, installing
+the latest version available from through those channels.
 
 \(bu
 .B Pkgmgr
-The Pkgmgr plugin resolves the Abstract Configuration Entity "Package" to a package specification that the client can use to detect, verify and install the specified package.
+The Pkgmgr plugin resolves the Abstract Configuration Entity
+"Package" to a package specification that the client can use to
+detect, verify and install the specified package.
 
 \(bu
 .B Probes
-The Probes plugin gives you the ability to gather information from a client machine before you generate its configuration. This information can be used with the various templating systems to generate configuration based on the results.
+The Probes plugin gives you the ability to gather information from a
+client machine before you generate its configuration. This information
+can be used with the various templating systems to generate
+configuration based on the results.
 
 \(bu
 .B Properties
-The Properties plugin is a connector plugin that adds information from properties files into client metadata instances. (1.0 and later)
+The Properties plugin is a connector plugin that adds information
+from properties files into client metadata instances. (1.0 and later)
 
 \(bu
 .B Rules
-The Rules plugin resolves Abstract Configuration Entities to literal configuration entries suitable for the client drivers to consume.
+The Rules plugin resolves Abstract Configuration Entities to literal
+configuration entries suitable for the client drivers to consume.
 
 \(bu
 .B SGenshi (Deprecated)
@@ -150,31 +222,42 @@ See Bundler.
 
 \(bu
 .B Snapshots
-The Snapshots plugin stores various aspects of a client's state when the client checks in to the server.
+The Snapshots plugin stores various aspects of a client's state when
+the client checks in to the server.
 
 \(bu
 .B SSHbase
-The SSHbase generator plugin manages ssh host keys (both v1 and v2) for hosts. It also manages the ssh_known_hosts file. It can integrate host keys from other management domains and similarly export its keys.
+The SSHbase generator plugin manages ssh host keys (both v1 and v2)
+for hosts. It also manages the ssh_known_hosts file. It can integrate
+host keys from other management domains and similarly export its keys.
 
 \(bu
 .B Svn
-The Svn plugin allows you to track changes to your Bcfg2 repository using a Subversion backend. Currently, it enables you to get revision information out of your repository for reporting purposes.
+The Svn plugin allows you to track changes to your Bcfg2 repository
+using a Subversion backend. Currently, it enables you to get revision
+information out of your repository for reporting purposes.
 
 \(bu
 .B TCheetah
-The TCheetah plugin allows you to use the cheetah templating system to create files. It also allows you to include the results of probes executed on the client in the created files.
+The TCheetah plugin allows you to use the cheetah templating system
+to create files. It also allows you to include the results of probes
+executed on the client in the created files.
 
 \(bu
 .B TGenshi
-The TGenshi plugin allows you to use the Genshi templating system to create files. It also allows you to include the results of probes executed on the client in the created files.
+The TGenshi plugin allows you to use the Genshi templating system to
+create files. It also allows you to include the results of probes
+executed on the client in the created files.
 
 \(bu
 .B Trigger
-Trigger is a plugin that calls external scripts when clients are configured.
+Trigger is a plugin that calls external scripts when clients are
+configured.
 
 
 .SH MDATA OPTIONS
-These options affect the default metadata settings for Paths with type='file'.
+These options affect the default metadata settings for Paths with
+type='file'.
 
 .TP
 .B owner
@@ -194,11 +277,13 @@ Global paranoid settings for Paths (defaults to false)
 
 
 .SH CLIENT OPTIONS
-These options only affect client functionality, specified in the [client] section.
+These options only affect client functionality, specified in the
+[client] section.
 
 .TP
 .B drivers
-Specify tool driver set to use. This option can be used to explicitly specify the client tool drivers you want to use when the client is run.
+Specify tool driver set to use. This option can be used to explicitly
+specify the client tool drivers you want to use when the client is run.
 
 .TP
 .B paranoid
@@ -206,15 +291,19 @@ Run the client in paranoid mode.
 
 
 .SH STATISTICS OPTIONS
-Server-only, specified in the [statistics] section. These options control the statistics collection functionality of the server.
+Server-only, specified in the [statistics] section. These options
+control the statistics collection functionality of the server.
 
 .TP
 .B database_engine
-The database engine used by the statistics module. One of either 'postgresql', 'mysql', 'sqlite3', or 'ado_mssql'.
+The database engine used by the statistics module. One of either
+'postgresql', 'mysql', 'sqlite3', or 'ado_mssql'.
 
 .TP
 .B database_name
-The name of the database to use for statistics data. If 'database_engine' is set to 'sqlite3' this is a file path to sqlite file and defaults to $REPOSITORY_DIR/etc/brpt.sqlite
+The name of the database to use for statistics data. If
+'database_engine' is set to 'sqlite3' this is a file path to
+sqlite file and defaults to $REPOSITORY_DIR/etc/brpt.sqlite
 
 .TP
 .B database_user
@@ -234,23 +323,33 @@ Port for database connections. Not used for sqlite3.
 
 
 .SH COMMUNICATION OPTIONS
-Specified in the [communication] section. These options define settings used for client-server communication.
+Specified in the [communication] section. These options define
+settings used for client-server communication.
 
 .TP
 .B ca
-The path to a file containing the CA certificate. This file is required on the server, and optional on clients. However, if the cacert is not present on clients, the server cannot be verified. 
+The path to a file containing the CA certificate. This file is
+required on the server, and optional on clients. However, if the
+cacert is not present on clients, the server cannot be verified. 
 
 .TP
 .B certificate
-The path to a file containing a PEM formatted certificate which signs the key with the ca certificate. This setting is required on the server in all cases, and required on clients if using client certificates. 
+The path to a file containing a PEM formatted certificate which
+signs the key with the ca certificate. This setting is required on
+the server in all cases, and required on clients if using client
+certificates. 
 
 .TP
 .B key
-Specifies the path to a file containing the SSL Key. This is required on the server in all cases, and required on clients if using client certificates. 
+Specifies the path to a file containing the SSL Key. This is required
+on the server in all cases, and required on clients if using client
+certificates. 
 
 .TP
 .B password
-Required on both the server and clients. On the server, sets the password clients need to use to communicate. On a client, sets the password to use to connect to the server.
+Required on both the server and clients. On the server, sets the
+password clients need to use to communicate. On a client, sets the
+password to use to connect to the server.
 
 .TP
 .B protocol
@@ -265,43 +364,54 @@ A client-only option. Number of times to retry network communication.
 A client-only option. The UUID of the client.
 
 .SH PARANOID OPTIONS
-These options allow for finer-grained control of the paranoid mode on the Bcfg2 client. They are specified in the [paranoid] section of the configuration file.
+These options allow for finer-grained control of the paranoid mode
+on the Bcfg2 client. They are specified in the [paranoid] section
+of the configuration file.
 
 .TP
 .B path
-Custom path for backups created in paranoid mode. The default is in /var/cache/bcfg2.
+Custom path for backups created in paranoid mode. The default is in 
+/var/cache/bcfg2.
 
 .TP
 .B max_copies
-Specify a maximum number of copies for the server to keep when running in paranoid mode. Only the most recent versions of these copies will be kept.
+Specify a maximum number of copies for the server to keep when running
+in paranoid mode. Only the most recent versions of these copies will
+be kept.
 
 .SH COMPONENT OPTIONS
 Specified in the [components] section.
 
 .TP
 .B bcfg2
-URL of the server. On the server this specifies which interface and port the server listens on. On the client, this specifies where the client will attempt to contact the server. eg: bcfg2 = https://10.3.1.6:6789
+URL of the server. On the server this specifies which interface and
+port the server listens on. On the client, this specifies where the
+client will attempt to contact the server.
+eg: bcfg2 = https://10.3.1.6:6789
 
 .TP
 .B encoding
-Text encoding of configuration files. Defaults to the system default encoding.
+Text encoding of configuration files. Defaults to the system default
+encoding.
 
 
 .SH LOGGING OPTIONS
-Specified in the [logging] section. These options control the server logging functionality.
+Specified in the [logging] section. These options control the server
+logging functionality.
 
 .B path
 Server log file path.
 
-
 .SH SNAPSHOTS OPTIONS
-Specified in the [snapshots] section. These options control the server snapshots functionality.
+Specified in the [snapshots] section. These options control the server
+snapshots functionality.
 
 .B driver
 sqlite
 
 .B database
-The name of the database to use for statistics data. eg: $REPOSITORY_DIR/etc/bcfg2.sqlite
+The name of the database to use for statistics data.
+eg: $REPOSITORY_DIR/etc/bcfg2.sqlite
 
 .SH SEE ALSO
 .BR bcfg2(1),