--- a/ChangeLog	Sat Sep 04 18:16:04 2010 +0200
+++ b/ChangeLog	Sat Sep 04 15:07:47 2010 +0200
@@ -1,3 +1,9 @@
+2010-09-04  Bruno Haible  <bruno@clisp.org>
+
+	gnulib-tool: Don't talk about CVS any more.
+	* gnulib-tool (func_usage, func_import): Write "version control"
+	instead of CVS.
+
 2010-09-04  Jim Meyering  <meyering@redhat.com>
 
 	maint.mk: avoid obscure sc_copyright_check failure in coreutils

--- a/gnulib-tool	Sat Sep 04 18:16:04 2010 +0200
+++ b/gnulib-tool	Sat Sep 04 15:07:47 2010 +0200
@@ -155,7 +155,7 @@
                             if no modules are specified, update the current
                             package from the current gnulib
       --update              update the current package, restore files omitted
-                            from CVS
+                            from version control
       --create-testdir      create a scratch package with the given modules
       --create-megatestdir  create a mega scratch package with the given modules
                             one by one and all together
@@ -1283,7 +1283,7 @@
   fi
   if test -n "$configure_ac"; then
     # Use sed, not autoconf --trace, to look for the AC_PREREQ invocation,
-    # because when some m4 files are omitted from a CVS repository,
+    # because when some m4 files are omitted from a version control repository,
     # "autoconf --trace=AC_PREREQ" fails with an error message like this:
     #   m4: aclocal.m4:851: Cannot open m4/absolute-header.m4: No such file or directory
     #   autom4te: m4 failed with exit status: 1
@@ -3946,7 +3946,7 @@
     else
       # Install the file.
       # Don't protest if the file should be there but isn't: it happens
-      # frequently that developers don't put autogenerated files into CVS.
+      # frequently that developers don't put autogenerated files under version control.
       func_add_file
       func_append added_files "$g$nl"
     fi
@@ -4276,8 +4276,8 @@
     echo "#"
     echo "# This file represents the specification of how gnulib-tool is used."
     echo "# It acts as a cache: It is written and read by gnulib-tool."
-    echo "# In projects using CVS, this file is meant to be stored in CVS,"
-    echo "# like the configure.ac and various Makefile.am files."
+    echo "# In projects that use version control, this file is meant to be put under"
+    echo "# version control, like the configure.ac and various Makefile.am files."
     echo
     echo
     echo "# Specification in the form of a command-line invocation:"
@@ -4370,7 +4370,8 @@
     echo "# This file represents the compiled summary of the specification in"
     echo "# gnulib-cache.m4. It lists the computed macro invocations that need"
     echo "# to be invoked from configure.ac."
-    echo "# In projects using CVS, this file can be treated like other built files."
+    echo "# In projects that use version control, this file can be treated like"
+    echo "# other built files."
     echo
     echo
     echo "# This macro should be invoked from $configure_ac, in the section"
@@ -5483,8 +5484,9 @@
     else
       # Apply func_import to all gnulib directories.
       # To get this list of directories, look at Makefile.am. (Not at
-      # configure, because it may be omitted from CVS. Also, don't run
-      # "find $destdir -name gnulib-cache.m4", as it might be too expensive.)
+      # configure, because it may be omitted from version control. Also,
+      # don't run "find $destdir -name gnulib-cache.m4", as it might be
+      # too expensive.)
       m4dirs=
       m4dirs_count=0
       if test -f "$destdir"/Makefile.am; then
@@ -5823,7 +5825,8 @@
     else
       # Install the file.
       # Don't protest if the file should be there but isn't: it happens
-      # frequently that developers don't put autogenerated files into CVS.
+      # frequently that developers don't put autogenerated files under version
+      # control.
       func_add_file
     fi
     rm -f "$tmpfile"