README.contrib: document that short lines are preferred. (#278267)

[developers-reference.git] / resources.dbk

diff --git a/resources.dbk b/resources.dbk
index c2590682c5cf62ae6a8e4f44d22d89d4e507b483..3648a1ea05da3e0453cda161f00de33f56496eb1 100644 (file)
--- a/resources.dbk
+++ b/resources.dbk
@@ -92,7 +92,7 @@ volume list, and users are urged not to use
 &email-debian-private; unless it is really necessary.
 Moreover, do <emphasis>not</emphasis> forward email from that list to anyone.
 Archives of this list are not available on the web for obvious reasons, but you
-can see them using your shell account on <literal>&lists-host;</literal>
+can see them using your shell account on <literal>&master-host;</literal>
 and looking in the <filename>&file-debian-private-archive;</filename>
 directory.
 </para>
@@ -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 -->
+<section id="servers-vcs">
+<title>The VCS servers</title>
 <para>
-Our CVS server is located on <literal>cvs.debian.org</literal>.
+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>
-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.
+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>
 
@@ -1456,10 +1451,10 @@ information section:
 <screen>
 From: Raphael Hertzog &lt;hertzog@debian.org&gt;
 To: pts-static-news@qa.debian.org
-Subject: Browse debian-cd CVS repository with cvsweb
+Subject: Browse debian-cd SVN repository
 
 Package: debian-cd
-Url: &url-cvsweb;debian-cd/
+Url: http://svn.debian.org/viewsvn/debian-cd/trunk/
 </screen>
 <para>
 The second one is an announcement sent to a mailing list which is also sent to
@@ -1467,7 +1462,7 @@ the PTS so that it is published on the PTS web page of the package.  Note the
 use of the BCC field to avoid answers sent to the PTS by mistake.
 </para>
 <screen>
-: Raphael Hertzog &lt;hertzog@debian.org&gt;
+From: Raphael Hertzog &lt;hertzog@debian.org&gt;
 To: debian-gtk-gnome@&lists-host;
 Bcc: pts-news@qa.debian.org
 Subject: Galeon 2.0 backported for woody