diff options
author | Sol Jerome <sol.jerome@gmail.com> | 2013-07-27 17:19:47 -0500 |
---|---|---|
committer | Sol Jerome <sol.jerome@gmail.com> | 2013-07-27 17:19:47 -0500 |
commit | aa230853296cd3b69f0296d646daf37b4b2cd764 (patch) | |
tree | 8ad1a2e8ee5f05ef775c2536984440a0cc74ec78 /doc/conf.py | |
parent | 08f5ad7e1b470b79ce81130b2f299426b132db80 (diff) | |
parent | 3435963a7c715bd3e6e912c6224fc8b893b1abe4 (diff) | |
download | bcfg2-aa230853296cd3b69f0296d646daf37b4b2cd764.tar.gz bcfg2-aa230853296cd3b69f0296d646daf37b4b2cd764.tar.bz2 bcfg2-aa230853296cd3b69f0296d646daf37b4b2cd764.zip |
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
Diffstat (limited to 'doc/conf.py')
-rw-r--r-- | doc/conf.py | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/doc/conf.py b/doc/conf.py index 9862603d7..d1bb029d2 100644 --- a/doc/conf.py +++ b/doc/conf.py @@ -254,6 +254,8 @@ man_pages = [ [], 8), ('man/bcfg2-lint.conf', 'bcfg2-lint.conf', 'Configuration parameters for bcfg2-lint', [], 5), + ('man/bcfg2-report-collector', 'bcfg2-report-collector', + 'Reports collection daemon', [], 8), ('man/bcfg2-reports', 'bcfg2-reports', 'Query reporting system for client status', [], 8), ('man/bcfg2-server', 'bcfg2-server', |