summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--doc/man/bcfg2.conf.txt6
-rw-r--r--man/bcfg2.conf.59
2 files changed, 14 insertions, 1 deletions
diff --git a/doc/man/bcfg2.conf.txt b/doc/man/bcfg2.conf.txt
index 3a0217aef..58e68ebc8 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::
diff --git a/man/bcfg2.conf.5 b/man/bcfg2.conf.5
index b0db91a5b..48f49685d 100644
--- a/man/bcfg2.conf.5
+++ b/man/bcfg2.conf.5
@@ -1,4 +1,4 @@
-.TH "BCFG2.CONF" "5" "March 18, 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: