aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--CVSROOT/config9
-rw-r--r--CVSROOT/editinfo4
-rw-r--r--CVSROOT/loginfo19
3 files changed, 17 insertions, 15 deletions
diff --git a/CVSROOT/config b/CVSROOT/config
index 7da3e8907a6b..fb5f9688e5c9 100644
--- a/CVSROOT/config
+++ b/CVSROOT/config
@@ -4,11 +4,14 @@
# 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
+# Put CVS lock files in this directory rather than directly in the repository.
+#LockDir=/var/lock/cvs
# 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
+
+# Set `LogHistory' to `all' or `TOFEWGCMAR' to log all transactions to the
+# history file, or a subset as needed (ie `TMAR' logs all write operations)
+#LogHistory=TOFEWGCMAR
diff --git a/CVSROOT/editinfo b/CVSROOT/editinfo
index 9b497050352a..e1a2409fc2e7 100644
--- a/CVSROOT/editinfo
+++ b/CVSROOT/editinfo
@@ -19,8 +19,8 @@
# Actions such as mailing a copy of the report to each reviewer are
# better handled by an entry in the loginfo file.
#
-# One thing that should be noted is the the ALL keyword is not
-# supported. There can be only one entry that matches a given
+# 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.
#
# Note there is no "edit" example script currently available....
diff --git a/CVSROOT/loginfo b/CVSROOT/loginfo
index 5bd590fe8df1..81898e519f6c 100644
--- a/CVSROOT/loginfo
+++ b/CVSROOT/loginfo
@@ -1,18 +1,17 @@
#
# $FreeBSD$
#
-# The "loginfo" file is used to control where "cvs commit" log information
-# is sent. The first entry on a line is a regular expression which is tested
-# against the directory that the change is being made to, relative to the
-# $CVSROOT. For the first match that is found, then the remainder of the
-# line is a filter program that should expect log information on its standard
-# input.
+# The "loginfo" file controls where "cvs commit" log information
+# is sent. The first entry on a line is a regular expression which must match
+# the directory that the change is being made to, relative to the
+# $CVSROOT. If a match is found, then the remainder of the line is a filter
+# program that should expect log information on its standard input.
#
-# If the repository name does not match any of the regular expressions in the
-# first field of this file, the "DEFAULT" line is used, if it is specified.
+# If the repository name does not match any of the regular expressions in this
+# file, the "DEFAULT" line is used, if it is specified.
#
-# If the name "ALL" appears as a regular expression it is always used
-# in addition to the first matching regex or "DEFAULT".
+# If the name ALL appears as a regular expression it is always used
+# in addition to the first matching regex or DEFAULT.
#
# You may specify a format string as part of the
# filter. The string is composed of a `%' followed