From a6030264a6e43fbaa26bd1b2c18a7d469e653836 Mon Sep 17 00:00:00 2001
From: hertzog <hertzog@313b444b-1b9f-4f58-a734-7bb04f332e8d>
Date: Mon, 25 Feb 2008 20:29:17 +0000
Subject: [PATCH] * Mention Alioth as the main resource for VCS repositories
 and deprecate   cvs.debian.org.

git-svn-id: svn://anonscm.debian.org/ddp/developers-reference/trunk@4942 313b444b-1b9f-4f58-a734-7bb04f332e8d
---
 common.ent       |  1 -
 debian/changelog |  2 ++
 resources.dbk    | 39 +++++++++++++++++----------------------
 3 files changed, 19 insertions(+), 23 deletions(-)

diff --git a/common.ent b/common.ent
index 35fd6a1..3873ad9 100644
--- a/common.ent
+++ b/common.ent
@@ -133,7 +133,6 @@
 <!ENTITY email-debian-l10n-english "<email>debian-l10n-english@&lists-host;</email>">
 <!ENTITY email-mia "<email>mia@qa.debian.org</email>">
 
-<!ENTITY email-debian-admin "<email>debian-admin@debian.org</email>">
 <!ENTITY email-rt-dsa "<email>admin@rt.debian.org</email>">
 <!ENTITY email-ftpmaster "<email>ftpmaster@debian.org</email>">
 <!ENTITY email-override "<email>override-change@debian.org</email>">
diff --git a/debian/changelog b/debian/changelog
index 38d2e34..d2a80a2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -38,6 +38,8 @@ developers-reference (3.3.9) unstable; urgency=low
   * Remove all stuff concerning non-US.
   * Update information concerning Alioth.
   * Update information concerning the Package Tracking System.
+  * Mention Alioth as the main resource for VCS repositories and deprecate
+    cvs.debian.org.
 
  -- Andreas Barth <aba@not.so.argh.org>  Sat, 16 Jun 2007 11:41:41 -0600
 
diff --git a/resources.dbk b/resources.dbk
index c259068..dc4a748 100644
--- a/resources.dbk
+++ b/resources.dbk
@@ -331,28 +331,23 @@ Send mail to &email-debian-devel; if you have any questions.
 </para>
 </section>
 
-<section id="servers-cvs">
-<title>The CVS server</title>
-<!-- TODO: document svn.debian.org, arch.debian.org also -->
-<para>
-Our CVS server is located on <literal>cvs.debian.org</literal>.
-</para>
-<para>
-If you need to use a publicly accessible CVS server, for instance, to help
-coordinate work on a package between many different developers, you can request
-a CVS area on the server.
-</para>
-<para>
-Generally, <literal>cvs.debian.org</literal> offers a combination of local CVS
-access, anonymous client-server read-only access, and full client-server access
-through <command>ssh</command>.  Also, the CVS area can be accessed read-only
-via the Web at <ulink url="&url-cvsweb;"></ulink>.
-</para>
-<para>
-To request a CVS area, send a request via email to
-&email-debian-admin;.  Include the name of the requested CVS
-area, the Debian account that should own the CVS root area, and why you need
-it.
+<section id="servers-vcs">
+<title>The VCS servers</title>
+<para>
+If you need to use a Version Control System for any of your Debian work,
+you can use one the existing repositories hosted on Alioth or you can
+request a new project and ask for the VCS repository of your choice.
+Alioth supports CVS (alioth.debian.org), Subversion
+(svn.debian.org), Arch (tla/baz, both on arch.debian.org), Bazaar
+(bzr.debian.org), Darcs (darcs.debian.org), Mercurial (hg.debian.org) and Git
+(git.debian.org).  Checkout <ulink url="&url-alioth-pkg;" /> if you plan
+to maintain packages in a VCS repository. See <xref linkend="alioth"/> for
+information on the services provided by Alioth.
+</para>
+<para>
+Historically, Debian first used <literal>cvs.debian.org</literal> to host
+CVS repositories. But that service is deprecated in favor of Alioth.
+Only a few projects are still using it.
 </para>
 </section>
 
-- 
2.30.2