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

3 files changed, 89 insertions, 4 deletions

diff --git a/man/bcfg2-report-collector.8 b/man/bcfg2-report-collector.8
new file mode 100644
index 000000000..195b15ec8
--- /dev/null
+++ b/man/bcfg2-report-collector.8
@@ -0,0 +1,79 @@
+.TH "BCFG2-REPORT-COLLECTOR" "8" "July 27, 2013" "1.3" "Bcfg2"
+.SH NAME
+bcfg2-report-collector \- Reports collection daemon
+.
+.nr rst2man-indent-level 0
+.
+.de1 rstReportMargin
+\\$1 \\n[an-margin]
+level \\n[rst2man-indent-level]
+level margin: \\n[rst2man-indent\\n[rst2man-indent-level]]
+-
+\\n[rst2man-indent0]
+\\n[rst2man-indent1]
+\\n[rst2man-indent2]
+..
+.de1 INDENT
+.\" .rstReportMargin pre:
+. RS \\$1
+. nr rst2man-indent\\n[rst2man-indent-level] \\n[an-margin]
+. nr rst2man-indent-level +1
+.\" .rstReportMargin post:
+..
+.de UNINDENT
+. RE
+.\" indent \\n[an-margin]
+.\" old: \\n[rst2man-indent\\n[rst2man-indent-level]]
+.nr rst2man-indent-level -1
+.\" new: \\n[rst2man-indent\\n[rst2man-indent-level]]
+.in \\n[rst2man-indent\\n[rst2man-indent-level]]u
+..
+.\" Man page generated from reStructuredText.
+.
+.SH SYNOPSIS
+.sp
+\fBbcfg2\-report\-collector\fP [\fIoptions\fP]
+.SH DESCRIPTION
+.sp
+\fBbcfg2\-report\-collector\fP runs a daemon to collect logs from the
+LocalFilesystem \fIBcfg2 Reports\fP transport object
+and add them to the Reporting storage backend.
+.SH OPTIONS
+.INDENT 0.0
+.TP
+.BI \-C \ configfile
+Specify alternate bcfg2.conf location.
+.TP
+.BI \-D \ pidfile
+Daemonize, placing the program pid in \fIpidfile\fP.
+.TP
+.BI \-E \ encoding
+Specify the encoding of config files.
+.TP
+.BI \-Q \ path
+Specify the path to the server repository.
+.TP
+.BI \-W \ configfile
+Specify the path to the web interface
+configuration file.
+.TP
+.B \-d
+Enable debugging output.
+.TP
+.B \-h
+Print usage information.
+.TP
+.BI \-o \ path
+Set path of file log
+.TP
+.B \-v
+Run in verbose mode.
+.TP
+.B \-\-version
+Print the version and exit
+.UNINDENT
+.SH SEE ALSO
+.sp
+\fIbcfg2\-server(8)\fP, \fIbcfg2\-reports(8)\fP
+.\" Generated by docutils manpage writer.
+.
diff --git a/man/bcfg2-server.8 b/man/bcfg2-server.8
index 27f6a7b01..dcec03252 100644
--- a/man/bcfg2-server.8
+++ b/man/bcfg2-server.8
@@ -1,4 +1,4 @@
-.TH "BCFG2-SERVER" "8" "March 18, 2013" "1.3" "Bcfg2"
+.TH "BCFG2-SERVER" "8" "July 27, 2013" "1.3" "Bcfg2"
 .SH NAME
 bcfg2-server \- Server for client configuration specifications
 .
@@ -46,8 +46,7 @@ configurations to clients based on the data in its repository.
 Specify alternate bcfg2.conf location.
 .TP
 .BI \-D \ pidfile
-Daemonize, placing the program pid in the specified
-pidfile.
+Daemonize, placing the program pid in \fIpidfile\fP.
 .TP
 .BI \-E \ encoding
 Specify the encoding of config files.
diff --git a/man/bcfg2.conf.5 b/man/bcfg2.conf.5
index 85e2f4b98..5e64caae9 100644
--- a/man/bcfg2.conf.5
+++ b/man/bcfg2.conf.5
@@ -1,4 +1,4 @@
-.TH "BCFG2.CONF" "5" "June 19, 2013" "1.3" "Bcfg2"
+.TH "BCFG2.CONF" "5" "July 19, 2013" "1.3" "Bcfg2"
 .SH NAME
 bcfg2.conf \- Configuration parameters for Bcfg2
 .
@@ -76,6 +76,13 @@ pseudo
 .UNINDENT
 .UNINDENT
 .TP
+.B fam_blocking
+.
+Whether the server should block at startup until the file monitor
+backend has processed all events. This can cause a slower startup,
+but ensure that all files are recognized before the first client
+is handled.
+.TP
 .B ignore_files
 A comma\-separated list of globs that should be ignored by the file
 monitor. Default values are: