Merge branch 'maint'

Conflicts:
	src/lib/Bcfg2/Client/Client.py
	src/lib/Bcfg2/Client/Frame.py
	src/lib/Bcfg2/Client/Tools/YUM.py
	src/lib/Bcfg2/Options.py
	src/lib/Bcfg2/Server/Admin/Perf.py
	src/lib/Bcfg2/Server/Admin/Xcmd.py
	src/lib/Bcfg2/Server/Admin/__init__.py
	src/lib/Bcfg2/Server/Core.py
	src/lib/Bcfg2/Server/FileMonitor/Fam.py
	src/lib/Bcfg2/Server/Lint/RequiredAttrs.py
	src/lib/Bcfg2/Server/Plugin/helpers.py
	src/lib/Bcfg2/Server/Plugins/Base.py
	src/lib/Bcfg2/Server/Plugins/Bundler.py
	src/lib/Bcfg2/Server/Plugins/Cfg/CfgPrivateKeyCreator.py
	src/lib/Bcfg2/Server/Plugins/Cvs.py
	src/lib/Bcfg2/Server/Plugins/Darcs.py
	src/lib/Bcfg2/Server/Plugins/Decisions.py
	src/lib/Bcfg2/Server/Plugins/FileProbes.py
	src/lib/Bcfg2/Server/Plugins/Fossil.py
	src/lib/Bcfg2/Server/Plugins/Git.py
	src/lib/Bcfg2/Server/Plugins/Metadata.py
	src/lib/Bcfg2/Server/Plugins/NagiosGen.py
	src/lib/Bcfg2/Server/Plugins/Packages/PackagesSources.py
	src/lib/Bcfg2/Server/Plugins/Packages/Source.py
	src/lib/Bcfg2/Server/Plugins/Packages/Yum.py
	src/lib/Bcfg2/Server/Plugins/Properties.py
	src/lib/Bcfg2/Server/Plugins/__init__.py
	src/lib/Bcfg2/Server/__init__.py
	src/sbin/bcfg2-build-reports
	src/sbin/bcfg2-crypt
	testsuite/Testsrc/Testlib/TestServer/TestPlugin/Testhelpers.py
	testsuite/Testsrc/Testlib/TestServer/TestPlugins/TestMetadata.py
	testsuite/Testsrc/Testlib/TestServer/TestPlugins/TestProperties.py

1 files changed, 31 insertions, 33 deletions

diff --git a/doc/reports/dynamic.txt b/doc/reports/dynamic.txt
index b3028e9e1..9de3f868f 100644
--- a/doc/reports/dynamic.txt
+++ b/doc/reports/dynamic.txt
@@ -53,40 +53,41 @@ Prerequisites
 Install
 -------
 
-Be sure to include the specified fields included in the example
-``bcfg2.conf`` file. These can be specified in either ``/etc/bcfg2.conf``,
-if it is readable by the webserver user, or ``/etc/bcfg2-web.conf``. Any
-database supported by `Django <http://www.djangoproject.com>`_ can be used.
-As of version 1.3, `South <http://south.aeracode.org>`_ is used to control
-schema changes.  If your database is not supported by South, any updates
-will need to be applied manually.  Sqlite is configured by default.
-Please see the :ref:`reporting-databases` section to configure alternative
-databases.
 
-.. warning::
+1. Be sure to include the specified fields included in the example
+   ``bcfg2.conf`` file. These can be specified in either
+   ``/etc/bcfg2.conf``, if it is readable by the webserver user,
+   or ``/etc/bcfg2-web.conf``. Any database supported by `Django
+   <http://www.djangoproject.com>`_ can be used.  As of version 1.3,
+   `South <http://south.aeracode.org>`_ is used to control schema changes.
+   If your database is not supported by South, any updates will need to
+   be applied manually.  Sqlite is configured by default.  Please see the
+   :ref:`reporting-databases` section to configure alternative databases.
 
-    If you are using an sqlite database, the directory containing the
-    database file will need to be writable by the web server. The reason
-    for this is that sqlite will create another file for its journal
-    when it tries to update the database file.
+   .. warning::
 
-.. note::
+       If you are using an sqlite database, the directory containing the
+       database file will need to be writable by the web server. The reason
+       for this is that sqlite will create another file for its journal
+       when it tries to update the database file.
+
+   .. note::
 
-    Distributed environments can share a single remote database for
-    reporting.
+       Distributed environments can share a single remote database for
+       reporting.
 
-After configuring your database be sure to run `bcfg2-admin reports init`
-to create the schema.
+2. After configuring your database be sure to run ``bcfg2-admin reports
+   init`` to create the schema.
 
-To enable statistics collection in the bcfg2-server, add
-:ref:`server-plugins-statistics-reporting` to the **plugins**
-line in your ``bcfg2.conf`` and restart the bcfg2-server.  A report collecting
-daemon should be run to import the collected statistics into the backend.
-Please see the section :ref:`Report Collector <report_collector>` for more
-information.
+3. To enable statistics collection in the bcfg2-server, add
+   :ref:`server-plugins-statistics-reporting` to the **plugins**
+   line in your ``bcfg2.conf`` and restart the bcfg2-server.  A report
+   collecting daemon should be run to import the collected statistics
+   into the backend.  Please see the section :ref:`Report Collector
+   <report_collector>` for more information.
 
-Detailed installation instructions can be found :ref:`here
-<appendix-guides-web-reports-install>`.
+   Detailed installation instructions can be found :ref:`here
+   <appendix-guides-web-reports-install>`.
 
 .. _dynamic-http-install:
 
@@ -175,7 +176,7 @@ Upgrading
     .. note::
 
         After the database is upgraded all of the old tables are left
-        intact. To remove them any table starting with reports_ can
+        intact. To remove them any table starting with **reports\_** can
         be dropped.
 
 4. `(Optional)` Run the :ref:`Report Collector <report_collector>`
@@ -199,11 +200,6 @@ An example using the defaults is listed below::
     host =
     port =
 
-    [statistics]
-    config = /etc/bcfg2-web.conf
-    time_zone =
-    web_debug = False
-
     [reporting]
     transport = DirectStore
     web_prefix =
@@ -241,6 +237,8 @@ section:
 statistics
 ^^^^^^^^^^
 
+.. deprecated: 1.3.0
+
 * config: The config file to be read for additional reporting
   data.  This is used to restrict what can be read by the web
   server.