Merge branch 'maint'

Conflicts:
	debian/changelog
	doc/conf.py
	misc/bcfg2-selinux.spec
	misc/bcfg2.spec
	osx/Makefile
	osx/macports/Portfile
	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/Tools/APT.py
	src/lib/Bcfg2/Client/Tools/FreeBSDInit.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/CherrypyCore.py
	src/lib/Bcfg2/Server/Core.py
	src/lib/Bcfg2/Server/FileMonitor/__init__.py
	src/lib/Bcfg2/Server/Lint/Validate.py
	src/lib/Bcfg2/Server/Lint/__init__.py
	src/lib/Bcfg2/Server/MultiprocessingCore.py
	src/lib/Bcfg2/Server/Plugin/__init__.py
	src/lib/Bcfg2/Server/Plugins/GroupPatterns.py
	src/lib/Bcfg2/Server/Plugins/Metadata.py
	src/lib/Bcfg2/Server/Plugins/Packages/Source.py
	src/lib/Bcfg2/Server/Plugins/Packages/Yum.py
	src/lib/Bcfg2/Server/Plugins/SSHbase.py
	src/lib/Bcfg2/Server/Plugins/SSLCA.py
	src/lib/Bcfg2/version.py
	src/sbin/bcfg2-info
	src/sbin/bcfg2-test
	testsuite/requirements.txt

5 files changed, 25 insertions, 7 deletions

diff --git a/doc/appendix/guides/authentication.txt b/doc/appendix/guides/authentication.txt
index 93a34c9bc..eba01ee3c 100644
--- a/doc/appendix/guides/authentication.txt
+++ b/doc/appendix/guides/authentication.txt
@@ -145,7 +145,7 @@ Allowed values are:
 +-------------------+------------------------------------------+
 
 ``cert+password`` is the default.  This can be changed by setting the
-``authentication`` parameter in the ``[communcation]`` section of
+``authentication`` parameter in the ``[communication]`` section of
 ``bcfg2.conf``.  For instance, to set ``bootstrap`` mode as the global
 default, you would add the following to ``bcfg2.conf``::
 
diff --git a/doc/development/compat.txt b/doc/development/compat.txt
index 8700c46d3..132bf67c0 100644
--- a/doc/development/compat.txt
+++ b/doc/development/compat.txt
@@ -113,7 +113,7 @@ with Python 2.4 (and occasionally 2.5).  Be sure to read the notes
 below, since some of these implementations may be feature-incomplete.
 
 +----------------+--------------------------------+--------------------------------------------+
-| Name           | Python 2.4                     | Python 2.4+                                |
+| Name           | Python 2.4                     | Python 2.5+                                |
 +================+================================+============================================+
 | formatdate     | :func:`email.Utils.formatdate` | :func:`email.utils.formatdate`             |
 +----------------+--------------------------------+--------------------------------------------+
@@ -129,6 +129,8 @@ below, since some of these implementations may be feature-incomplete.
 +----------------+--------------------------------+--------------------------------------------+
 | MutableMapping | :class:`UserDict.DictMixin`    | :class:`collections.MutableMapping` (2.6+) |
 +----------------+--------------------------------+--------------------------------------------+
+| literal_eval   | :func:`eval`                   | :func:`ast.literal_eval`(2.6+)             |
++----------------+--------------------------------+--------------------------------------------+
 
 walk_packages
 ~~~~~~~~~~~~~
@@ -171,6 +173,14 @@ mind.
 :class:`collections.MutableMapping` is available in Python 2.6+, and
 will be used if available.
 
+literal_eval
+~~~~~~~~~~~~
+
+:func:`ast.literal_eval` is a safe version of :func:`eval` that will only 
+allow delaration of literal strings, ints, list, dicts, etc.  This was 
+introduced in Python 2.6, and as such Python 2.4 uses the plain-old 
+:func:`eval`.
+
 Other Symbols
 -------------
 
diff --git a/doc/releases/1.3.6.txt b/doc/releases/1.3.6.txt
index 757fbf6f5..9ab024674 100644
--- a/doc/releases/1.3.6.txt
+++ b/doc/releases/1.3.6.txt
@@ -30,5 +30,14 @@ This is primarily a bugfix release.
 
   https://docs.djangoproject.com/en/1.7/ref/settings/#std:setting-OPTIONS
 
+* SYSV: change instances of simplename to simplefile
+
+  Previous configurations can be updated using the migration tool.
+
+* Authentication: Reject passwd auth, if authentication is set to "cert"
+* Server/Core: drop privileges even if not running as daemon
+* Packages/Yum.py: Fix dependency resolution logic
+* Handle filesystem secontexts properly for contextless filesystems
+
 Special thanks to the following contributors for this release: Michael
-Fenn, Matt Kemp, Alexander Sulfrian, Jonathan Billings.
+Fenn, Matt Kemp, Alexander Sulfrian, Jonathan Billings, Ross Smith.
diff --git a/doc/server/plugins/connectors/templatehelper.txt b/doc/server/plugins/connectors/templatehelper.txt
index d113dcab7..e24ba10cb 100644
--- a/doc/server/plugins/connectors/templatehelper.txt
+++ b/doc/server/plugins/connectors/templatehelper.txt
@@ -54,9 +54,9 @@ See ``examples/TemplateHelper`` for examples of helper modules.
 Usage
 =====
 
-Specific helpers can be referred to in
-templates as ``metadata.TemplateHelper[<modulename>]``. That accesses
-a HelperModule object will have, as attributes, all symbols listed in
+Specific helpers can be referred to in templates as
+``metadata.TemplateHelper[<modulename>]``. That returns a HelperModule
+object which will have, as attributes, all symbols listed in
 ``__export__``.  For example, consider this helper module::
 
   __export__ = ["hello"]
diff --git a/doc/server/plugins/generators/nagiosgen.txt b/doc/server/plugins/generators/nagiosgen.txt
index 1ccdd66c1..746adf44c 100644
--- a/doc/server/plugins/generators/nagiosgen.txt
+++ b/doc/server/plugins/generators/nagiosgen.txt
@@ -29,7 +29,6 @@ Create default host, and group specs in:
             check_period                    24x7
             contact_groups                  admins
             event_handler_enabled           1
-            failure_prediction_enabled      1
             flap_detection_enabled          1
             initial_state                   o
             max_check_attempts              10