From 9272d8f942b79a0343a09647954c58341245d17c Mon Sep 17 00:00:00 2001
From: Corinna Vinschen <corinna@vinschen.de>
Date: Tue, 10 Mar 2015 14:19:42 +0100
Subject: [PATCH] Change CVS->GIT in docs

Signed-off-by: Corinna Vinschen <corinna@vinschen.de>
---
 winsup/doc/ChangeLog           |  5 +++++
 winsup/doc/faq-programming.xml | 12 ++++++------
 winsup/doc/setup-net.xml       |  5 +++--
 3 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/winsup/doc/ChangeLog b/winsup/doc/ChangeLog
index 6806bce22..dc6748061 100644
--- a/winsup/doc/ChangeLog
+++ b/winsup/doc/ChangeLog
@@ -1,3 +1,8 @@
+2015-03-10  Corinna Vinschen  <corinna@vinschen.de>
+
+	* faq-programming.xml: Accommodate switch of Cygwin repo to GIT.
+	* setup-net.xml: Ditto.
+
 2015-03-04  Corinna Vinschen  <corinna@vinschen.de>
 
 	* posix.xml (std-bsd): Add issetugid.
diff --git a/winsup/doc/faq-programming.xml b/winsup/doc/faq-programming.xml
index 78e449167..491da5dbf 100644
--- a/winsup/doc/faq-programming.xml
+++ b/winsup/doc/faq-programming.xml
@@ -710,11 +710,11 @@ which requires the <literal>dblatex</literal>,
 documentation, see the README included in the <literal>cygwin-doc</literal> package.
 </para>
 
-<para>Next, get the Cygwin source.  Ideally, you should check out
-what you need from CVS (<ulink url="https://cygwin.com/cvs.html"/>).  This is the
-<emphasis>preferred method</emphasis> for acquiring the sources.  Otherwise, if
-you are trying to duplicate a cygwin release then you should 
-download the corresponding source package
+<para>Next, get the Cygwin source.  Ideally, you should check out what you
+need from GIT (<ulink url="https://cygwin.com/git.html"/>).  This is the
+<emphasis>preferred method</emphasis> for acquiring the sources.  Otherwise,
+if you are trying to duplicate a cygwin release then you should download the
+corresponding source package
 (<literal>cygwin-x.y.z-n-src.tar.bz2</literal>). </para> 
 
 <para>You <emphasis>must</emphasis> build cygwin in a separate directory from
@@ -751,7 +751,7 @@ same time. Remove all but one.
 symbols that you see in gdb are basically meaningless. It is also a good
 idea to use the latest code in case the bug has been fixed, so we
 recommend trying the latest snapshot from
-<ulink url="https://cygwin.com/snapshots/"/> or building the DLL from CVS.
+<ulink url="https://cygwin.com/snapshots/"/> or building the DLL from GIT.
 </para>
 <para>To build a debugging version of the Cygwin DLL, you will need to follow
 the instructions at <ulink url="https://cygwin.com/faq/faq.html#faq.programming.building-cygwin"/>. 
diff --git a/winsup/doc/setup-net.xml b/winsup/doc/setup-net.xml
index 34246db5b..2752da3ff 100644
--- a/winsup/doc/setup-net.xml
+++ b/winsup/doc/setup-net.xml
@@ -34,8 +34,9 @@ The <command>setup.exe</command> installer is designed to be easy
 for new users to understand while remaining flexible for the 
 experienced. The volunteer development team is constantly working
 on <command>setup.exe</command>; before requesting a new feature,
-check the wishlist in the <ulink url="https://sourceware.org/cgi-bin/cvsweb.cgi/setup/README?cvsroot=cygwin-apps&amp;rev=2">CVS <literal>README</literal>
-</ulink>. It may already be present in the CVS version!
+check the wishlist in the
+<ulink url="https://sourceware.org/git/gitweb.cgi?p=cygwin-setup.git;a=blob_plain;f=README;hb=HEAD">GIT <literal>README</literal>
+</ulink>. It may already be present in the GIT version!
 </para>
 
 <para>