Fix remaining stray references to CVS.

These are just cosmetic and don't seem worth back-patching far.
I put them into 9.0 just because it was trivial to do so.

11 files changed, 26 insertions, 27 deletions

diff --git a/config/ac_func_accept_argtypes.m4 b/config/ac_func_accept_argtypes.m4
index 917d59ab866..4ac5ce0eb94 100644
--- a/config/ac_func_accept_argtypes.m4
+++ b/config/ac_func_accept_argtypes.m4
@@ -1,7 +1,6 @@
 # $PostgreSQL: pgsql/config/ac_func_accept_argtypes.m4,v 1.6 2003/11/29 19:51:17 pgsql Exp $
 # This comes from the official Autoconf macro archive at
 # <http://research.cys.de/autoconf-archive/>
-# (I removed the $ before the Id CVS keyword below.)
 
 
 dnl @synopsis AC_FUNC_ACCEPT_ARGTYPES
@@ -21,7 +20,7 @@ dnl
 dnl NOTE: This is just a modified version of the AC_FUNC_SELECT_ARGTYPES
 dnl macro. Credit for that one goes to David MacKenzie et. al.
 dnl
-dnl @version Id: ac_func_accept_argtypes.m4,v 1.1 1999/12/03 11:29:29 simons Exp $
+dnl @version $Id: ac_func_accept_argtypes.m4,v 1.1 1999/12/03 11:29:29 simons Exp $
 dnl @author Daniel Richard G. <skunk@mit.edu>
 dnl
 
diff --git a/config/perl.m4 b/config/perl.m4
index 165034b0fd9..550ba1fed81 100644
--- a/config/perl.m4
+++ b/config/perl.m4
@@ -24,7 +24,7 @@ fi
 
 if test -z "$PERL"; then
   AC_MSG_WARN([
-*** Without Perl you will not be able to build PostgreSQL from CVS.
+*** Without Perl you will not be able to build PostgreSQL from Git.
 *** You can obtain Perl from any CPAN mirror site.
 *** (If you are using the official distribution of PostgreSQL then you do not
 *** need to worry about this, because the Perl output is pre-generated.)])
diff --git a/config/prep_buildtree b/config/prep_buildtree
index f9164cfa2fa..2527812f126 100644
--- a/config/prep_buildtree
+++ b/config/prep_buildtree
@@ -22,7 +22,7 @@ sourcetree=`cd $1 && pwd`
 
 buildtree=`cd ${2:-'.'} && pwd`
 
-for item in `find "$sourcetree" -type d \( -name CVS -prune -o -print \)`; do
+for item in `find "$sourcetree" -type d \( \( -name CVS -prune \) -o \( -name .git -prune \) -o -print \)`; do
     subdir=`expr "$item" : "$sourcetree\(.*\)"`
     if test ! -d "$buildtree/$subdir"; then
         mkdir -p "$buildtree/$subdir" || exit 1
diff --git a/config/programs.m4 b/config/programs.m4
index 594729cbb1d..9c73d7409eb 100644
--- a/config/programs.m4
+++ b/config/programs.m4
@@ -27,7 +27,7 @@ fi
 
 if test -z "$BISON"; then
   AC_MSG_WARN([
-*** Without Bison you will not be able to build PostgreSQL from CVS nor
+*** Without Bison you will not be able to build PostgreSQL from Git nor
 *** change any of the parser definition files.  You can obtain Bison from
 *** a GNU mirror site.  (If you are using the official distribution of
 *** PostgreSQL then you do not need to worry about this, because the Bison
@@ -89,7 +89,7 @@ fi
 
 if test x"$pgac_cv_path_flex" = x"no"; then
   AC_MSG_WARN([
-*** Without Flex you will not be able to build PostgreSQL from CVS nor
+*** Without Flex you will not be able to build PostgreSQL from Git nor
 *** change any of the scanner definition files.  You can obtain Flex from
 *** a GNU mirror site.  (If you are using the official distribution of
 *** PostgreSQL then you do not need to worry about this because the Flex
diff --git a/configure b/configure
index 7c54dc653b8..81b893372d9 100755
--- a/configure
+++ b/configure
@@ -6738,13 +6738,13 @@ fi
 
 if test -z "$BISON"; then
   { $as_echo "$as_me:$LINENO: WARNING:
-*** Without Bison you will not be able to build PostgreSQL from CVS nor
+*** Without Bison you will not be able to build PostgreSQL from Git nor
 *** change any of the parser definition files.  You can obtain Bison from
 *** a GNU mirror site.  (If you are using the official distribution of
 *** PostgreSQL then you do not need to worry about this, because the Bison
 *** output is pre-generated.)" >&5
 $as_echo "$as_me: WARNING:
-*** Without Bison you will not be able to build PostgreSQL from CVS nor
+*** Without Bison you will not be able to build PostgreSQL from Git nor
 *** change any of the parser definition files.  You can obtain Bison from
 *** a GNU mirror site.  (If you are using the official distribution of
 *** PostgreSQL then you do not need to worry about this, because the Bison
@@ -6802,13 +6802,13 @@ fi
 $as_echo "$pgac_cv_path_flex" >&6; }
 if test x"$pgac_cv_path_flex" = x"no"; then
   { $as_echo "$as_me:$LINENO: WARNING:
-*** Without Flex you will not be able to build PostgreSQL from CVS nor
+*** Without Flex you will not be able to build PostgreSQL from Git nor
 *** change any of the scanner definition files.  You can obtain Flex from
 *** a GNU mirror site.  (If you are using the official distribution of
 *** PostgreSQL then you do not need to worry about this because the Flex
 *** output is pre-generated.)" >&5
 $as_echo "$as_me: WARNING:
-*** Without Flex you will not be able to build PostgreSQL from CVS nor
+*** Without Flex you will not be able to build PostgreSQL from Git nor
 *** change any of the scanner definition files.  You can obtain Flex from
 *** a GNU mirror site.  (If you are using the official distribution of
 *** PostgreSQL then you do not need to worry about this because the Flex
@@ -6889,12 +6889,12 @@ fi
 
 if test -z "$PERL"; then
   { $as_echo "$as_me:$LINENO: WARNING:
-*** Without Perl you will not be able to build PostgreSQL from CVS.
+*** Without Perl you will not be able to build PostgreSQL from Git.
 *** You can obtain Perl from any CPAN mirror site.
 *** (If you are using the official distribution of PostgreSQL then you do not
 *** need to worry about this, because the Perl output is pre-generated.)" >&5
 $as_echo "$as_me: WARNING:
-*** Without Perl you will not be able to build PostgreSQL from CVS.
+*** Without Perl you will not be able to build PostgreSQL from Git.
 *** You can obtain Perl from any CPAN mirror site.
 *** (If you are using the official distribution of PostgreSQL then you do not
 *** need to worry about this, because the Perl output is pre-generated.)" >&2;}
diff --git a/doc/src/sgml/acronyms.sgml b/doc/src/sgml/acronyms.sgml
index 48a75b6fab2..4f561f6fb76 100644
--- a/doc/src/sgml/acronyms.sgml
+++ b/doc/src/sgml/acronyms.sgml
@@ -108,17 +108,6 @@
    </varlistentry>
 
    <varlistentry>
-    <term><acronym>CVS</acronym></term>
-    <listitem>
-     <para>
-      <ulink
-      url="http://en.wikipedia.org/wiki/Concurrent_Versions_System">Concurrent
-      Versions System</ulink>
-     </para>
-    </listitem>
-   </varlistentry>
-
-   <varlistentry>
     <term><acronym>DBA</acronym></term>
     <listitem>
      <para>
@@ -249,6 +238,16 @@
    </varlistentry>
 
    <varlistentry>
+    <term><acronym>Git</acronym></term>
+    <listitem>
+     <para>
+      <ulink
+      url="http://en.wikipedia.org/wiki/Git_(software)">Git</ulink>
+     </para>
+    </listitem>
+   </varlistentry>
+
+   <varlistentry>
     <term><acronym>GMT</acronym></term>
     <listitem>
      <para>
diff --git a/doc/src/sgml/external-projects.sgml b/doc/src/sgml/external-projects.sgml
index c7afbb2ef7d..84c515b30e8 100644
--- a/doc/src/sgml/external-projects.sgml
+++ b/doc/src/sgml/external-projects.sgml
@@ -17,7 +17,7 @@
    projects that are maintained outside the core <productname>PostgreSQL</>
    distribution. PgFoundry is built using the GForge software project and is
    similar to <ulink url="http://sourceforge.net">SourceForge.net</> in its
-   feature set, providing mailing lists, forums, bug tracking, CVS, and web
+   feature set, providing mailing lists, forums, bug tracking, SCM, and web
    hosting. If you have a <productname>PostgreSQL</>-related open source
    project that you would like to have hosted at PgFoundy, please feel free
    to create a new project.
diff --git a/doc/src/sgml/nls.sgml b/doc/src/sgml/nls.sgml
index da8902a584d..9bc8fe968ec 100644
--- a/doc/src/sgml/nls.sgml
+++ b/doc/src/sgml/nls.sgml
@@ -46,7 +46,7 @@
     <filename>msgmerge</filename>, respectively, in a GNU-compatible
     implementation.  Later, we will try to arrange it so that if you
     use a packaged source distribution, you won't need
-    <filename>xgettext</filename>.  (If working from CVS, you will still need
+    <filename>xgettext</filename>.  (If working from Git, you will still need
     it.)  <application>GNU Gettext 0.10.36</application> or later is currently recommended.
    </para>
 
diff --git a/src/backend/commands/copy.c b/src/backend/commands/copy.c
index 4e95a8315ce..a6e1d354360 100644
--- a/src/backend/commands/copy.c
+++ b/src/backend/commands/copy.c
@@ -2632,7 +2632,7 @@ CopyReadLineText(CopyState cstate)
 				 * something other than a period.  In non-CSV mode, anything
 				 * after a backslash is special, so we skip over that second
 				 * character too.  If we didn't do that \\. would be
-				 * considered an eof-of copy, while in non-CVS mode it is a
+				 * considered an eof-of copy, while in non-CSV mode it is a
 				 * literal backslash followed by a period.	In CSV mode,
 				 * backslashes are not special, so we want to process the
 				 * character after the backslash just like a normal character,
diff --git a/src/tools/codelines b/src/tools/codelines
index 6455e83e0a4..7840c9c6e5a 100755
--- a/src/tools/codelines
+++ b/src/tools/codelines
@@ -3,5 +3,5 @@
 # $PostgreSQL: pgsql/src/tools/codelines,v 1.3 2006/03/11 04:38:41 momjian Exp $
 
 # This script is used to compute the total number of "C" lines in the release
-# This should be run from the top of the CVS tree after a 'make distclean'
+# This should be run from the top of the Git tree after a 'make distclean'
 find . -name '*.[chyl]' | xargs cat| wc -l
diff --git a/src/tools/msvc/Install.pm b/src/tools/msvc/Install.pm
index 2026d184794..7a7d990d006 100644
--- a/src/tools/msvc/Install.pm
+++ b/src/tools/msvc/Install.pm
@@ -438,6 +438,7 @@ sub CopyIncludeFiles
     while (my $d = readdir($D))
     {
         next if ($d =~ /^\./);
+        next if ($d eq '.git');
         next if ($d eq 'CVS');
         next unless (-d 'src/include/' . $d);