-machines from the project you can access. First there is
-ftp-master.debian.org, sometimes known as newraff. It is our main
-archive server and the place where you upload your packages. It is
-restricted, so you can only upload with anonymous FTP, a tool like dput
-or dupload can aid this process.
-The Projects web pages, CVS archive, the main shell server and various
-other stuff is located on gluck.debian.org. This machine is also reachable as
-{cvs,people,www}.debian.org. If you want your own Debian related site to
-appear behind <URL:http://people.debian.org/~__LOGIN__> then put it at
-this machine in the directory ~/public_html/.
-
-
-There is one developer-only mailing list, debian-private. You have been
+machines from the project you can access. There is the main archive
+server, but shell access to it is restricted for security reasons, so you
+can only upload with anonymous FTP - please use the service name
+ftp.upload.debian.org as the target for your uploads (so that we can
+point that some place else when the archive system is down for
+maintenance etc.). A tool like dput or dupload can aid this
+process.
+
+The project main shell server is located at ravel.debian.org. This
+machine is also reachable as people.debian.org. If you want your own
+Debian related site to appear behind
+<URL:http://people.debian.org/~__LOGIN__/> then put it at this
+machine in the directory ~/public_html/.
+
+The machine hosting most of our VCS repositories
+({svn,bzr,git,arch,hg}.debian.org) is alioth.debian.org. It's handled
+by a separate team (admin@alioth.debian.org) as it allows login by
+non-Debian developers. You probably already have a *-guest account
+there. Please refer to http://wiki.debian.org/AliothFAQ to learn
+anything you need to know, including how to activate your account and
+how to request the removal of your old -guest account.
+
+There is one developer-only mailing list, debian-private. You have been