summaryrefslogtreecommitdiffstats
path: root/doc/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 /doc/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 'doc/man')
-rw-r--r--doc/man/bcfg2.conf.txt6
1 files changed, 6 insertions, 0 deletions
diff --git a/doc/man/bcfg2.conf.txt b/doc/man/bcfg2.conf.txt
index 12f66f64f..6faf48a1a 100644
--- a/doc/man/bcfg2.conf.txt
+++ b/doc/man/bcfg2.conf.txt
@@ -46,6 +46,12 @@ filemonitor
fam
pseudo
+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.
+
ignore_files
A comma-separated list of globs that should be ignored by the file
monitor. Default values are::