This commit was generated by cvs2svn to compensate for changes in r54427,

which included commits to RCS files with non-trunk default branches.

1 files changed, 8 insertions, 12 deletions

diff --git a/contrib/cvs/src/fileattr.h b/contrib/cvs/src/fileattr.h
index 7e02b3a..046b975 100644
--- a/contrib/cvs/src/fileattr.h
+++ b/contrib/cvs/src/fileattr.h
@@ -12,28 +12,24 @@
 
 #ifndef FILEATTR_H
 
-/* File containing per-file attributes.  Format is a series of entries:
+/* File containing per-file attributes.  The format of this file is in
+   cvs.texinfo but here is a quick summary.  The file contains a
+   series of entries:
 
    ENT-TYPE FILENAME <tab> ATTRNAME = ATTRVAL
      {; ATTRNAME = ATTRVAL} <linefeed>
 
-   ENT-TYPE is 'F' for a file, in which case the entry specifies the
-   attributes for that file.
+   ENT-TYPE is 'F' for a file.
 
-   ENT-TYPE is 'D', and FILENAME empty, to specify default attributes
-   to be used for newly added files.
+   ENT-TYPE is 'D', and FILENAME empty, for default attributes.
 
-   Other ENT-TYPE are reserved for future expansion.  CVS 1.9 and older
-   will delete them any time it writes file attributes.  Current versions
-   of CVS will preserve them.
+   Other ENT-TYPE are reserved for future expansion.
 
    Note that the order of the line is not significant; CVS is free to
    rearrange them at its convenience.
 
-   There is currently no way of quoting tabs or linefeeds in the
-   filename, '=' in ATTRNAME, ';' in ATTRVAL, etc.  I'm not sure
-   whether I think we need one.  Note: the current implementation also
-   doesn't handle '\0' in any of the fields.
+   FIXME: this implementation doesn't handle '\0' in any of the
+   fields.  We are encouraged to fix this (by cvs.texinfo).
 
    By convention, ATTRNAME starting with '_' is for an attribute given
    special meaning by CVS; other ATTRNAMEs are for user-defined attributes