summaryrefslogtreecommitdiffstats
path: root/man
diff options
context:
space:
mode:
authorChris St. Pierre <chris.a.st.pierre@gmail.com>2011-05-17 15:46:57 -0400
committerSol Jerome <sol.jerome@gmail.com>2011-06-14 12:36:45 -0500
commitb7234fe39d1f25eb55320fed8491781aef1ed9fe (patch)
treeefbe27f8d74fc2c5c6af0e00f79e615413759fbd /man
parenta19c87f8dc03132e7257a539c7e486b9c9298aff (diff)
downloadbcfg2-b7234fe39d1f25eb55320fed8491781aef1ed9fe.tar.gz
bcfg2-b7234fe39d1f25eb55320fed8491781aef1ed9fe.tar.bz2
bcfg2-b7234fe39d1f25eb55320fed8491781aef1ed9fe.zip
added bcfg2-lint MergeFiles plugin to suggest config files and probes
that are very similar and could be merged added text wrapping to bcfg2-lint error handling
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