summaryrefslogtreecommitdiffstats
path: root/man
diff options
context:
space:
mode:
authorSol Jerome <sol.jerome@gmail.com>2013-07-19 09:43:38 -0500
committerSol Jerome <sol.jerome@gmail.com>2013-07-19 09:43:38 -0500
commit65c380c024f3642cb76cbc9ee5741e3cdfea3b87 (patch)
tree46424638e9e72cb8a5a870a765cce2fe668530bc /man
parent6cc24e1f7fdddda46e8665c6bb2fbca4b6f6a57f (diff)
parent99c64abc91eb7c8e65b5d53cdfdebd31b25b5d21 (diff)
downloadbcfg2-65c380c024f3642cb76cbc9ee5741e3cdfea3b87.tar.gz
bcfg2-65c380c024f3642cb76cbc9ee5741e3cdfea3b87.tar.bz2
bcfg2-65c380c024f3642cb76cbc9ee5741e3cdfea3b87.zip
Merge branch 'doc-fam-blocking' of https://github.com/AlexanderS/bcfg2 into maint
Signed-off-by: Sol Jerome <sol.jerome@gmail.com> Conflicts: man/bcfg2.conf.5
Diffstat (limited to 'man')
-rw-r--r--man/bcfg2.conf.59
1 files changed, 8 insertions, 1 deletions
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: