summaryrefslogtreecommitdiffstats
path: root/man
diff options
context:
space:
mode:
Diffstat (limited to 'man')
-rw-r--r--man/bcfg2-lint.85
-rw-r--r--man/bcfg2-lint.conf.58
2 files changed, 13 insertions, 0 deletions
diff --git a/man/bcfg2-lint.8 b/man/bcfg2-lint.8
index b1fa9244b..f2d4f9e88 100644
--- a/man/bcfg2-lint.8
+++ b/man/bcfg2-lint.8
@@ -120,6 +120,11 @@ exists for all Cfg files, and that paranoid mode be enabled for all
files.
.TP
+.BR MergeFiles
+Suggest that similar probes and config files be merged into single
+probes or TGenshi templates.
+
+.TP
.BR Pkgmgr
Check for duplicate packages specified in Pkgmgr.
diff --git a/man/bcfg2-lint.conf.5 b/man/bcfg2-lint.conf.5
index 49a32bb22..10a812874 100644
--- a/man/bcfg2-lint.conf.5
+++ b/man/bcfg2-lint.conf.5
@@ -152,6 +152,14 @@ A comma-delimited list of attributes to require on
tags. Default is "owner,group,perms".
.TP
+.BR MergeFiles
+
+\(bu
+.B threshold
+The threshold at which MergeFiles will suggest merging config files
+and probes. Default is 75% similar.
+
+.TP
.BR Validate
\(bu