From: hertzog <hertzog@313b444b-1b9f-4f58-a734-7bb04f332e8d>
Date: Thu, 7 Jan 2010 14:46:20 +0000 (+0000)
Subject: Update section about Alioth to mention FusionForge instead of GForge. Drop mention... 
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=ab99f3331f87e57627fe7ac5701540aea6b6ffa5;p=developers-reference.git

Update section about Alioth to mention FusionForge instead of GForge. Drop mention of separate cvs.debian.org it's managed by Alioth too. Closes: #564068

git-svn-id: svn://anonscm.debian.org/ddp/manuals/trunk/developers-reference@7049 313b444b-1b9f-4f58-a734-7bb04f332e8d
---

diff --git a/debian/changelog b/debian/changelog
index 126bc9a..11bd91c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -35,6 +35,9 @@ developers-reference (3.4.4) UNRELEASED; urgency=low
   * Update URL of the security tracker. Thanks to Salvatore Bonaccorso.
     Closes: #556229
   * Update URL of Packages-arch-specific. Closes: #553974
+  * Update section about Alioth to mention FusionForge instead of GForge.
+    Drop mention of separate cvs.debian.org it's managed by Alioth too.
+    Closes: #564068
 
  -- Lucas Nussbaum <lucas@lucas-nussbaum.net>  Tue, 22 Dec 2009 22:49:40 +0900
 
diff --git a/resources.dbk b/resources.dbk
index 5bb9b49..dc1edf2 100644
--- a/resources.dbk
+++ b/resources.dbk
@@ -335,18 +335,13 @@ Send mail to &email-debian-devel; if you have any questions.
 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
+Alioth supports CVS (cvs.alioth.debian.org/cvs.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>
 
 <section id="dchroot">
@@ -1531,10 +1526,10 @@ responsibility.
 </section>
 
 <section id="alioth">
-<title>Debian's GForge installation: Alioth</title>
+<title>Debian's FusionForge installation: Alioth</title>
 <para>
 Alioth is a Debian service based on a slightly modified version of the
-GForge software (which evolved from SourceForge). This software offers
+FusionForge software (which evolved from SourceForge and GForge). This software offers
 developers access to easy-to-use tools such as bug trackers, patch
 manager, project/task managers, file hosting services, mailing lists, CVS
 repositories etc.  All these tools are managed via a web interface.