Merge branch 'maint'

Signed-off-by: Sol Jerome <sol.jerome@gmail.com>

Conflicts:
	doc/appendix/guides/ubuntu.txt
	src/lib/Bcfg2/Options.py
	src/lib/Bcfg2/Server/Plugins/Packages/Yum.py
	src/lib/Bcfg2/settings.py

1 files changed, 40 insertions, 0 deletions

diff --git a/doc/man/bcfg2-report-collector.txt b/doc/man/bcfg2-report-collector.txt
new file mode 100644
index 000000000..07c618537
--- /dev/null
+++ b/doc/man/bcfg2-report-collector.txt
@@ -0,0 +1,40 @@
+.. -*- mode: rst -*-
+.. vim: ft=rst
+
+
+bcfg2-report-collector
+======================
+
+.. program:: bcfg2-report-collector
+
+Synopsis
+--------
+
+**bcfg2-report-collector** [*options*]
+
+Description
+-----------
+
+:program:`bcfg2-report-collector` runs a daemon to collect logs from the
+LocalFilesystem :ref:`Bcfg2 Reports <reports-dynamic>` transport object
+and add them to the Reporting storage backend.
+
+Options
+-------
+
+-C configfile            Specify alternate bcfg2.conf location.
+-D pidfile               Daemonize, placing the program pid in *pidfile*.
+-E encoding              Specify the encoding of config files.
+-Q path                  Specify the path to the server repository.
+-W configfile            Specify the path to the web interface
+                         configuration file.
+-d                       Enable debugging output.
+-h                       Print usage information.
+-o path                  Set path of file log
+-v                       Run in verbose mode.
+--version                Print the version and exit
+
+See Also
+--------
+
+:manpage:`bcfg2-server(8)`, :manpage:`bcfg2-reports(8)`