diff --git a/doc/ChangeLog b/doc/ChangeLog index 39939323dc597407773a1c3cb6995ef17748006e..0466a5d7a5f0fe2c6650800ce65d816f94c243aa 100644 --- a/doc/ChangeLog +++ b/doc/ChangeLog @@ -1,3 +1,9 @@ +2010-06-02 Larry Jones <lawrence.jones@siemens.com> + + *cvs.texinfo (Error messages): Add "Cannot initialize repository + under existing CVSROOT". + * cvs.1, stamp-vti, version.texi: Regenerated. + 2009-12-15 Larry Jones <lawrence.jones@siemens.com> * cvs.texinfo (commitinfo): Add example. diff --git a/doc/cvs.texinfo b/doc/cvs.texinfo index 1b348a14d2d28a4e6982ef3c54f1dd4d64937264..fa15140638016a73e4b222f85ff6367b803edc1a 100644 --- a/doc/cvs.texinfo +++ b/doc/cvs.texinfo @@ -16221,6 +16221,15 @@ temporary directory. @item cannot commit files as 'root' See @samp{'root' is not allowed to commit files}. +@item cvs [init aborted]: Cannot initialize repository under existing CVSROOT: @var{dir} +This message indicates that the directory (which is a parent +of the specified @sc{cvs} root) contains a @file{CVSROOT} +subdirectory and thus appears to be a repository. +You are not allowed to create a repository inside another repository. +This message can also occur if you try to create a repository that +is named @file{CVSROOT}; +you should use a different name. + @c For one example see basica-1a10 in the testsuite @c For another example, "cvs co ." on NT; see comment @c at windows-NT/filesubr.c (expand_wild). diff --git a/doc/stamp-vti b/doc/stamp-vti index 5aebce8bbd44dfe881afdd879ec80d7c579118a8..628a7e8dea0edf7f2060647ebd663273e1c0d86f 100644 --- a/doc/stamp-vti +++ b/doc/stamp-vti @@ -1,4 +1,4 @@ -@set UPDATED 15 December 2009 -@set UPDATED-MONTH December 2009 +@set UPDATED 2 June 2010 +@set UPDATED-MONTH June 2010 @set EDITION 1.12.13.1 @set VERSION 1.12.13.1 diff --git a/doc/version.texi b/doc/version.texi index 5aebce8bbd44dfe881afdd879ec80d7c579118a8..628a7e8dea0edf7f2060647ebd663273e1c0d86f 100644 --- a/doc/version.texi +++ b/doc/version.texi @@ -1,4 +1,4 @@ -@set UPDATED 15 December 2009 -@set UPDATED-MONTH December 2009 +@set UPDATED 2 June 2010 +@set UPDATED-MONTH June 2010 @set EDITION 1.12.13.1 @set VERSION 1.12.13.1