diff options
| author | Chris St. Pierre <chris.a.st.pierre@gmail.com> | 2014-07-15 10:54:55 -0400 |
|---|---|---|
| committer | Chris St. Pierre <chris.a.st.pierre@gmail.com> | 2014-07-15 10:54:55 -0400 |
| commit | 16bb58a7110daeb479fdf41e5c67f45dc3502fc5 (patch) | |
| tree | e2d4da726b6ed0a37187d57d5d9367bc30a4d33b /man | |
| parent | 1f3f4c79fb4bb0684a000c169774c7b62816ff5a (diff) | |
| parent | c76fb188215208fcfc5af9027f16447855a6f064 (diff) | |
| download | bcfg2-16bb58a7110daeb479fdf41e5c67f45dc3502fc5.tar.gz bcfg2-16bb58a7110daeb479fdf41e5c67f45dc3502fc5.tar.bz2 bcfg2-16bb58a7110daeb479fdf41e5c67f45dc3502fc5.zip | |
Merge pull request #180 from fennm/default-fam_blocking-to-true
Default fam blocking to true
Diffstat (limited to 'man')
| -rw-r--r-- | man/bcfg2-server.8 | 7 | ||||
| -rw-r--r-- | man/bcfg2.conf.5 | 2 |
2 files changed, 6 insertions, 3 deletions
diff --git a/man/bcfg2-server.8 b/man/bcfg2-server.8 index dcec03252..60fe58a30 100644 --- a/man/bcfg2-server.8 +++ b/man/bcfg2-server.8 @@ -34,7 +34,7 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]] .sp \fBbcfg2\-server\fP [\-d] [\-v] [\-C \fIconfigfile\fP] [\-D \fIpidfile\fP] [\-E \fIencoding\fP] [\-Q \fIrepo path\fP] [\-S \fIserver url\fP] [\-o \fIlogfile\fP] [\-x -\fIpassword\fP] [\-\-ssl\-key=\fIssl key\fP] +\fIpassword\fP] [\-\-ssl\-key=\fIssl key\fP] [\-\-no\-fam\-blocking] .SH DESCRIPTION .sp \fBbcfg2\-server\fP is the daemon component of Bcfg2 which serves @@ -70,9 +70,12 @@ Print usage information. .TP .BI \-\-ssl\-key\fB= key Specify the path to the SSL key. +.TP +.BI \-\-no\-fam\-blocking +Synonym for fam_blocking = False in bcfg2.conf .UNINDENT .SH SEE ALSO .sp -\fIbcfg2(1)\fP, \fIbcfg2\-lint(8)\fP +\fIbcfg2(1)\fP, \fIbcfg2\-lint(8)\fP, \fIbcfg2.conf(5)\fP .\" Generated by docutils manpage writer. . diff --git a/man/bcfg2.conf.5 b/man/bcfg2.conf.5 index b9642b334..851f5527d 100644 --- a/man/bcfg2.conf.5 +++ b/man/bcfg2.conf.5 @@ -79,7 +79,7 @@ pseudo 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. +is handled. Defaults to True. .TP .B ignore_files A comma\-separated list of globs that should be ignored by the file |