Merge branch 'maint'

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

4 files changed, 8 insertions, 17 deletions

diff --git a/doc/server/database.txt b/doc/server/database.txt
index 986914171..c90dcb710 100644
--- a/doc/server/database.txt
+++ b/doc/server/database.txt
@@ -69,8 +69,8 @@ of ``/etc/bcfg2.conf``.
 +--------------------+------------------------------------------------------------+---------------------------------------+
 | options            | Extra parameters to use when connecting to the database.   | None                                  |
 |                    | Available parameters vary depending on your database       |                                       |
-|                    | backend. The parameters are supplied as comma separated    |                                       |
-|                    | key=value pairs.                                           |                                       |
+|                    | backend. The parameters are supplied as the value of the   |                                       |
+|                    | django OPTIONS setting.                                    |                                       |
 +--------------------+------------------------------------------------------------+---------------------------------------+
 | reporting_engine   | The name of the Django database backend to use for the     | None                                  |
 |                    | reporting database. Takes the same values as ``engine``.   |                                       |
@@ -86,9 +86,9 @@ of ``/etc/bcfg2.conf``.
 | reporting_port     | The port to connect to for the reporting database          | None                                  |
 +--------------------+------------------------------------------------------------+---------------------------------------+
 | reporting_options  | Extra parameters to use when connecting to the reporting   | None                                  |
-|                    | database.  Available parameters vary depending on your     |                                       |
-|                    | database backend. The parameters are supplied as comma     |                                       |
-|                    | separated key=value pairs.                                 |                                       |
+|                    | database. Available parameters vary depending on your      |                                       |
+|                    | database backend. The parameters are supplied as the       |                                       |
+|                    | value of the django OPTIONS setting.                       |                                       |
 +--------------------+------------------------------------------------------------+---------------------------------------+
 
 
diff --git a/doc/server/plugins/connectors/awstags.txt b/doc/server/plugins/connectors/awstags.txt
index b884ca065..5ac2fbc28 100644
--- a/doc/server/plugins/connectors/awstags.txt
+++ b/doc/server/plugins/connectors/awstags.txt
@@ -7,8 +7,8 @@
 =========
 
 The AWSTags plugin is a connector that retrieves tags from instances
-in EC2, and can assign optionally assign
-group membership pased on patterns in the tags.  See `Using Tags
+in EC2, and can optionally assign group membership based on patterns 
+in the tags.  See `Using Tags
 <http://docs.aws.amazon.com/AWSEC2/latest/UserGuide/Using_Tags.html>`_
 for details on using tags in EC2.
 
diff --git a/doc/server/plugins/connectors/templatehelper.txt b/doc/server/plugins/connectors/templatehelper.txt
index c719f93cb..d113dcab7 100644
--- a/doc/server/plugins/connectors/templatehelper.txt
+++ b/doc/server/plugins/connectors/templatehelper.txt
@@ -56,7 +56,7 @@ Usage
 
 Specific helpers can be referred to in
 templates as ``metadata.TemplateHelper[<modulename>]``. That accesses
-a HelperModule object will has, as attributes, all symbols listed in
+a HelperModule object will have, as attributes, all symbols listed in
 ``__export__``.  For example, consider this helper module::
 
   __export__ = ["hello"]
diff --git a/doc/server/plugins/generators/cfg.txt b/doc/server/plugins/generators/cfg.txt
index 8b49e244b..c991f20c9 100644
--- a/doc/server/plugins/generators/cfg.txt
+++ b/doc/server/plugins/generators/cfg.txt
@@ -321,15 +321,6 @@ processed for any Genshi, Cheetah, or Jinja2 base file.
         Cfg/etc/fstab/fstab.H_host.example.com.genshi
         Cfg/etc/fstab/fstab.G50_server.cheetah
 
-Genshi templates take precence over cheetah templates.  For example, if
-two files exist named::
-
-    Cfg/etc/fstab/fstab.genshi
-    Cfg/etc/fstab/fstab.cheetah
-
-The Cheetah template is ignored.  Exploiting this fact is probably a
-pretty bad idea in practice.
-
 You can mix Genshi and Cheetah when using different host-specific or
 group-specific files.  For example::