Merge remote branch 'upstream/maint'

* upstream/maint: (59 commits)
  Client/Tools/APT: fix pylint errors, enable check
  Client/Tools/APT: fix exception name
  SYSV: add a migration tool to change simplename attributes to simplefile
  doc: Update SYSV datastream format docs
  SYSV: change instances of simplename to simplefile
  Client/Tools/APT: handle exceptions gracefully
  Server/Plugins/Packages: add debsrc attribute to url_map
  schemas/packages.xsd: add default value for debsrc
  Options.py: Fix database OPTIONS parsing
  doc: Fix typos
  doc: Add note about Decisions fix for 1.3.6
  testsuite: Fix tools __init__.py unit test
  Tools: Fix install of non-whitelisted services
  doc: Add 1.3.6 release notes
  fix keyboard interrupt during intial event handling
  Server/Core: also shutdown on exceptions during fam blocking
  Reporting: better exception handling
  Packages: add name to additional_data for Sources
  Packages: add name to sources
  YUM: Add options to enable and disable Yum plugins
  ...

Conflicts:
	debian/changelog
	doc/conf.py
	doc/releases/index.txt
	doc/server/database.txt
	doc/server/plugins/generators/cfg.txt
	doc/server/plugins/generators/sslca.txt
	man/bcfg2.conf.5
	misc/bcfg2-selinux.spec
	misc/bcfg2.spec
	osx/Makefile
	osx/macports/Portfile
	schemas/packages.xsd
	solaris-ips/MANIFEST.bcfg2-server.header
	solaris-ips/MANIFEST.bcfg2.header
	solaris-ips/Makefile
	solaris-ips/pkginfo.bcfg2
	solaris-ips/pkginfo.bcfg2-server
	solaris/Makefile
	solaris/pkginfo.bcfg2
	solaris/pkginfo.bcfg2-server
	src/lib/Bcfg2/Client/Client.py
	src/lib/Bcfg2/Client/Proxy.py
	src/lib/Bcfg2/Client/Tools/APT.py
	src/lib/Bcfg2/Client/Tools/Action.py
	src/lib/Bcfg2/Client/Tools/SYSV.py
	src/lib/Bcfg2/Client/Tools/YUM.py
	src/lib/Bcfg2/Client/Tools/__init__.py
	src/lib/Bcfg2/Options.py
	src/lib/Bcfg2/Reporting/Collector.py
	src/lib/Bcfg2/Reporting/templates/base.html
	src/lib/Bcfg2/Server/Admin/__init__.py
	src/lib/Bcfg2/Server/BuiltinCore.py
	src/lib/Bcfg2/Server/Core.py
	src/lib/Bcfg2/Server/Plugins/Packages/Apt.py
	src/lib/Bcfg2/Server/Plugins/Probes.py
	src/lib/Bcfg2/settings.py
	src/lib/Bcfg2/version.py
	testsuite/Testsrc/Testlib/TestClient/TestTools/Test_init.py
	testsuite/Testsrc/test_code_checks.py

1 files changed, 13 insertions, 17 deletions

diff --git a/man/bcfg2.conf.5 b/man/bcfg2.conf.5
index db72add64..234a6c030 100644
--- a/man/bcfg2.conf.5
+++ b/man/bcfg2.conf.5
@@ -1,4 +1,4 @@
-.TH "BCFG2.CONF" "5" "April 06, 2014" "1.3" "Bcfg2"
+.TH "BCFG2.CONF" "5" "November 04, 2014" "1.3" "Bcfg2"
 .SH NAME
 bcfg2.conf \- Configuration parameters for Bcfg2
 .
@@ -28,8 +28,6 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .\" new: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .in \\n[rst2man-indent\\n[rst2man-indent-level]]u
 ..
-.\" Man page generated from reStructuredText.
-.
 .SH DESCRIPTION
 .sp
 bcfg2.conf includes configuration parameters for the Bcfg2 server and
@@ -107,7 +105,7 @@ SCCS
 .B listen_all
 This setting tells the server to listen on all available interfaces.
 The default is to only listen on those interfaces specified by the
-bcfg2 setting in the components section of \fBbcfg2.conf\fP.
+bcfg2 setting in the components section of \fBbcfg2.conf\fP\&.
 .TP
 .B plugins
 A comma\-delimited list of enabled server plugins. Currently
@@ -179,24 +177,24 @@ best
 .UNINDENT
 .UNINDENT
 .sp
-The default is \fIbest\fP, which is currently an alias for \fIbuiltin\fP.
+The default is \fIbest\fP, which is currently an alias for \fIbuiltin\fP\&.
 More details on the backends can be found in the official
 documentation.
 .TP
 .B user
-The username or UID to run the daemon as. Default is \fI0\fP.
+The username or UID to run the daemon as. Default is \fI0\fP\&.
 .TP
 .B group
-The group name or GID to run the daemon as. Default is \fI0\fP.
+The group name or GID to run the daemon as. Default is \fI0\fP\&.
 .TP
 .B vcs_root
 Specifies the path to the root of the VCS working copy that holds
-your Bcfg2 specification, if it is different from \fIrepository\fP.
+your Bcfg2 specification, if it is different from \fIrepository\fP\&.
 E.g., if the VCS repository does not hold the bcfg2 data at the top
 level, you may need to set this option.
 .TP
 .B umask
-The umask to set for the server.  Default is \fI0077\fP.
+The umask to set for the server.  Default is \fI0077\fP\&.
 .UNINDENT
 .SH SERVER PLUGINS
 .sp
@@ -573,7 +571,7 @@ The path at which to generate APT configs. No default.
 .TP
 .B gpg_keypath
 The path on the client where RPM GPG keys will be copied before
-they are imported on the client. Default is \fB/etc/pki/rpm\-gpg\fP.
+they are imported on the client. Default is \fB/etc/pki/rpm\-gpg\fP\&.
 .TP
 .B version
 Set the version attribute used when binding Packages. Default is
@@ -632,7 +630,7 @@ the configuration file.
 .TP
 .B path
 Custom path for backups created in paranoid mode. The default is
-in \fB/var/cache/bcfg2\fP.
+in \fB/var/cache/bcfg2\fP\&.
 .TP
 .B max_copies
 Specify a maximum number of copies for the server to keep when
@@ -711,9 +709,8 @@ Host for database connections. Not used for sqlite3.
 Port for database connections. Not used for sqlite3.
 .TP
 .B options
-Various options for the database connection. The value is
-expected as multiple key=value pairs, separated with commas.
-The concrete value depends on the database engine.
+Various options for the database connection. The value expected
+is the literal value of the django OPTIONS setting.
 .TP
 .B reporting_engine
 The database engine used by the Reporting plugin. One of the
@@ -754,9 +751,8 @@ Host for reporting database connections. Not used for sqlite3.
 Port for reporting database connections. Not used for sqlite3.
 .TP
 .B reporting_options
-Various options for the reporting database connection. The value
-is expected as multiple key=value pairs, separated with commas.
-The concrete value depends on the database engine.
+Various options for the database connection. The value expected
+is the literal value of the django OPTIONS setting.
 .UNINDENT
 .UNINDENT
 .UNINDENT