Merge changes from cvs1-11-x-branch

doc/ChangeLog

+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.

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).

doc/stamp-vti

-@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

doc/version.texi

-@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