[Cvs-cvs] ccvs/doc ChangeLog cvs.texinfo

[Derek Robert Price]

CVSROOT:        /cvsroot/cvs
Module name:    ccvs
Changes by:     Derek Robert Price <dprice>     06/07/16 23:54:01

Modified files:
        doc            : ChangeLog cvs.texinfo 

Log message:
        Merge changes from 1.11.x.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/ccvs/doc/ChangeLog?cvsroot=cvs&r1=1.968&r2=1.969
http://cvs.savannah.gnu.org/viewcvs/ccvs/doc/cvs.texinfo?cvsroot=cvs&r1=1.693&r2=1.694

Patches:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/cvs/ccvs/doc/ChangeLog,v
retrieving revision 1.968
retrieving revision 1.969
diff -u -b -r1.968 -r1.969
--- ChangeLog   11 Jul 2006 20:00:03 -0000      1.968
+++ ChangeLog   16 Jul 2006 23:54:01 -0000      1.969
@@ -1,3 +1,7 @@
+2006-07-16  Derek Price  <address@hidden>
+
+       * cvs.texinfo (File permissions): Correct punctuation.
+
 2006-07-11  Larry Jones  <address@hidden>
 
        * cvs.texinfo (log options): -b is a revision selection option, not

Index: cvs.texinfo
===================================================================
RCS file: /cvsroot/cvs/ccvs/doc/cvs.texinfo,v
retrieving revision 1.693
retrieving revision 1.694
diff -u -b -r1.693 -r1.694
--- cvs.texinfo 11 Jul 2006 20:00:03 -0000      1.693
+++ cvs.texinfo 16 Jul 2006 23:54:01 -0000      1.694
@@ -1062,7 +1062,7 @@
 you must fix the permissions manually when a new
 directory should have different permissions than its
 parent directory.  If you set the @code{CVSUMASK}
-environment variable that will control the file
+environment variable, that will control the file
 permissions which @sc{cvs} uses in creating directories
 and/or files in the repository.  @code{CVSUMASK} does
 not affect the file permissions in the working