Sychronise with the default versions that CVS (1.10.7) creates in

a new repository.

This commit only affects comments.

4 files changed, 32 insertions, 40 deletions

diff --git a/CVSROOT/config b/CVSROOT/config
index 51b03f663d83..7da3e8907a6b 100644
--- a/CVSROOT/config
+++ b/CVSROOT/config
@@ -1,6 +1,14 @@
+#
+# $FreeBSD$
+#
 # Set this to "no" if pserver shouldn't check system users/passwords
 #SystemAuth=no
 
 # Set `PreservePermissions' to `yes' to save file status information
 # in the repository.
 #PreservePermissions=no
+
+# Set `TopLevelAdmin' to `yes' to create a CVS directory at the top
+# level of the new working directory when using the `cvs checkout'
+# command.
+#TopLevelAdmin=no
diff --git a/CVSROOT/cvswrappers b/CVSROOT/cvswrappers
index 7bcb6cbfe953..0b5f6662e794 100644
--- a/CVSROOT/cvswrappers
+++ b/CVSROOT/cvswrappers
@@ -1,15 +1,15 @@
 #
 # $FreeBSD$
 #
-# This file describes wrappers and other binary files to CVS.
+# This file affects handling of files based on their names.
 #
-# Wrappers are the concept where directories of files are to be
-# treated as a single file.  The intended use is to wrap up a wrapper
-# into a single tar such that the tar archive can be treated as a
-# single binary file in CVS.
+# The -t/-f options allow one to treat directories of files
+# as a single file, or to transform a file in other ways on
+# its way in and out of CVS.
 #
-# To solve the problem effectively, it was also necessary to be able to
-# prevent rcsmerge from merging these files.
+# The -m option specifies whether CVS attempts to merge files.
+#
+# The -k option specifies keyword expansion (e.g. -kb for binary).
 #
 # Format of wrapper file ($CVSROOT/CVSROOT/cvswrappers or .cvswrappers)
 #
@@ -19,10 +19,11 @@
 #  -f		from cvs filter		value: path to filter
 #  -t		to cvs filter		value: path to filter
 #  -m		update methodology	value: MERGE or COPY
+#  -k		expansion mode		value: b, o, kkv, &c
 #
 #  and value is a single-quote delimited value.
-#
-#
+# For example:
+#*.gif -k 'b'
 #*.nib  -f '$CVSROOT/CVSROOT/unwrap %s' -t '$CVSROOT/CVSROOT/wrap %s %s'
 #*.rtfd -f '$CVSROOT/CVSROOT/unwrap %s' -t '$CVSROOT/CVSROOT/wrap %s %s'
 #*.draw -f '$CVSROOT/CVSROOT/unwrap %s' -t '$CVSROOT/CVSROOT/wrap %s %s'
diff --git a/CVSROOT/editinfo b/CVSROOT/editinfo
index 9e12a3ad8102..9b497050352a 100644
--- a/CVSROOT/editinfo
+++ b/CVSROOT/editinfo
@@ -19,10 +19,6 @@
 # Actions such as mailing a copy of the report to each reviewer are
 # better handled by an entry in the loginfo file.
 #
-# Although these test could be handled by an interactive script being
-# called via an entry in commitinfo,  The information reported in
-# such a script can't be easily merged into the report.
-#
 # One thing that should be noted  is the the ALL keyword is not
 # supported. There can be only one entry that matches a given
 # repository.
diff --git a/CVSROOT/loginfo b/CVSROOT/loginfo
index c05d4d92611a..5bd590fe8df1 100644
--- a/CVSROOT/loginfo
+++ b/CVSROOT/loginfo
@@ -14,31 +14,18 @@
 # If the name "ALL" appears as a regular expression it is always used
 # in addition to the first matching regex or "DEFAULT".
 #
-# The filter program may use one and only one "%s" modifier (ala printf).  If
-# such a "%s" is specified in the filter program, a brief title is included
-# (as one argument, enclosed in single quotes) showing the relative directory
-# name and listing the modified file names.
-#
-# NOTE: contrib/log usage:  (currently requires perl)
-#	-d		- turn debugging on....
-#	-m mailto	- send mail to "mailto" (multiple -m's permitted)
-#	-f logfile	- required arg:  save messages to logfile
-#	%s		- may follow other options at the end of the line
-#
-# NOTE: contrib/log_accum usage:  (currently requires perl)
-# (must have 'commit_prep -r' in commitinfo)
-#	-d		- turn debugging on....
-#	-M modulename	- use this as the module name (necessary for sub-dirs)
-#	-m mailto	- send mail to "mailto" (multiple -m's permitted) [optional]
-#	-f logfile	- save messages to logfile [optional]
-#	%s		- must follow other options at the end of the line
-#
-# without perl you could do this:
-#DEFAULT		(echo ""; who am i; date; cat) >> $CVSROOT/CVSROOT/commitlog
-#
-#DEFAULT		$CVSROOT/CVSROOT/log -f $CVSROOT/CVSROOT/commitlog  %s
-#
-# NB: For FreeBSD 2.X, the following line is the ONLY one which should
-# ever appear.  If you want to do something extra to the log output, learn
-# Perl.
+# You may specify a format string as part of the
+# filter.  The string is composed of a `%' followed
+# by a single format character, or followed by a set of format
+# characters surrounded by `{' and `}' as separators.  The format
+# characters are:
+#
+#   s = file name
+#   V = old version number (pre-checkin)
+#   v = new version number (post-checkin)
+#
+# For example:
+#DEFAULT (echo ""; id; echo %s; date; cat) >> $CVSROOT/CVSROOT/commitlog
+# or
+#DEFAULT (echo ""; id; echo %{sVv}; date; cat) >> $CVSROOT/CVSROOT/commitlog
 DEFAULT		$CVSROOT/CVSROOT/log_accum.pl %s