following Ryan Murray's advice, removed servers' real names and used only service...

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

diff --git a/common.ent b/common.ent
index 554d53bc8177e40326b836ff5c85faaceba8d060..fbf9ffdb1e10eb11a7473e1ff0d706aee92c251f 100644 (file)
--- a/common.ent
+++ b/common.ent
@@ -35,7 +35,6 @@
 <!entity pts-host "packages.qa.debian.org">
 <!entity ftp-master-host "ftp-master.debian.org">
 <!entity non-us-host "non-us.debian.org">
-<!entity master-host "master.debian.org">
 <!entity upload-queue "<ftppath>/pub/UploadQueue/</ftppath>">
 
 <!entity url-debian-policy "http://&www-debian-org;/doc/debian-policy/">

diff --git a/developers-reference.sgml b/developers-reference.sgml
index fa403ee6baf4f4b321dbc47f4b6808aa7de4b714..fe20bafd3ebe539c16ff36d0f7b599fb52cbace6 100644 (file)
--- a/developers-reference.sgml
+++ b/developers-reference.sgml
@@ -6,7 +6,7 @@
   <!entity % commondata  SYSTEM "common.ent" > %commondata;
 
   <!-- CVS revision of this document -->
-  <!entity cvs-rev "$Revision: 1.119 $">
+  <!entity cvs-rev "$Revision: 1.120 $">
   <!-- if you are translating this document, please notate the CVS
        revision of the developers reference here -->
   <!--
@@ -288,8 +288,8 @@ You have to keep the information available there up-to-date.
       <sect id="key-maint">Maintaining your public key
        <p>
 Be very careful with your private keys.  Do not place them on any
-public servers or multiuser machines, such as
-<tt>&master-host;</tt>.  Back your keys up; keep a copy offline.
+public servers or multiuser machines, such as the Debian servers
+(see <ref id="server-machines">).  Back your keys up; keep a copy offline.
 Read the documentation that comes with your software; read the <url
 id="&url-pgp-faq;" name="PGP FAQ">.
        <p>
@@ -439,7 +439,7 @@ As such, it is a low volume list, and users are urged not to use
 &email-debian-private; unless it is really necessary.  Moreover, do
 <em>not</em> 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 <tt>&master-host;</tt> and looking
+them using your shell account on <tt>lists.debian.org</tt> and looking
 in the <file>~debian/archive/debian-private</file> directory.
        <p>
 &email-debian-email; is a special mailing list used as a grab-bag 
@@ -469,7 +469,9 @@ always full of interesting information. Since it's an open channel, you
 should not speak there of issues that are discussed in
 &email-debian-private;. There's a key protected channel
 <em>#debian-private</em> for that purpose. The key is available 
-in the archives of debian-private in <file>&master-host;:&file-debian-private-archive;</file>, just <prgn>zgrep</prgn> for <em>#debian-private</em> in
+in the archives of debian-private in
+<file>master.debian.org:&file-debian-private-archive;</file>,
+just <prgn>zgrep</prgn> for <em>#debian-private</em> in
 all the files.
        <p>
 There are other additional channels dedicated to specific subjects.
@@ -533,21 +535,20 @@ suggestions for the web site, etc.),
 generally you'll report a bug against a ``pseudo-package''.  See <ref
 id="submit-bug"> for information on how to submit bugs.
 
-      <sect1 id="servers-master">The master server
+      <sect1 id="servers-bugs">The bugs server
        <p>
-<tt>&master-host;</tt> is the canonical location for the Bug Tracking
+<tt>bugs.debian.org</tt> is the canonical location for the Bug Tracking
 System (BTS).  If you plan on doing some statistical analysis or
 processing of Debian bugs, this would be the place to do it.  Please
 describe your plans on &email-debian-devel; before implementing
 anything, however, to reduce unnecessary duplication of effort or
 wasted processing time.
        <p>
-All Debian developers have accounts on <tt>&master-host;</tt>.
+All Debian developers have accounts on <tt>bugs.debian.org</tt>.
 
       <sect1 id="servers-ftp-master">The ftp-master server
        <p>
-The ftp-master server, <tt>&ftp-master-host;</tt> (or
-<tt>auric.debian.org</tt>), holds the canonical copy of the Debian
+The <tt>ftp-master.debian.org</tt> server holds the canonical copy of the Debian
 archive (excluding the non-US packages). Generally, package uploads
 go to this server; see <ref id="upload">.
        <p>
@@ -558,10 +559,10 @@ an email to &email-ftpmaster;, but also see the procedures in
 
       <sect1 id="servers-non-us">The non-US server
        <p>
-The non-US server, <tt>non-us.debian.org</tt> (or <tt>pandora.debian.org</tt>),
+The non-US server, <tt>non-us.debian.org</tt>,
 holds the canonical copy of the non-US part of the Debian archive.
 If you need to upload a package into one of the non-US sections, upload it
-to this server; see <ref id="upload">.
+to this server; see <ref id="upload-non-us">.
        <p>
 Problems with the non-US package archive should generally be submitted as
 bugs against the <package>nonus.debian.org</package> pseudo-package (notice
@@ -572,8 +573,8 @@ not someone else has already reported the problem on the
 
       <sect1 id="servers-www">The www-master server
        <p>
-The main web server, <tt>&www-host;</tt>, is also known as
-<tt>klecker.debian.org</tt>. It holds the official web pages, the face
+The main web server is <tt>www-master.debian.org</tt>.
+It holds the official web pages, the face
 of Debian for most newbies.
        <p>
 If you find a problem with the Debian web server, you should generally
@@ -582,9 +583,9 @@ submit a bug against the pseudo-package,
 else has already reported the problem on the
 <url id="http://bugs.debian.org/www.debian.org" name="Bug Tracking System">.
 
-      <sect1 id="servers-people">The "people" web server
+      <sect1 id="servers-people">The people web server
        <p>
-<tt>people.debian.org</tt> (<tt>gluck.debian.org</tt>) is the server used
+<tt>people.debian.org</tt> is the server used
 for developers' own web pages about anything related to Debian.
        <p>
 If you have some Debian-specific information which you want to serve
@@ -606,8 +607,7 @@ Send mail to &email-debian-devel; if you have any questions.
 
       <sect1 id="servers-cvs">The CVS server
        <p>
-Our CVS server is located on <tt>cvs.debian.org</tt> (also known as
-<tt>klecker.debian.org</tt>, discussed above).
+Our CVS server is located on <tt>cvs.debian.org</tt>.
        <p>
 If you need to use a publicly accessible CVS
 server, for instance, to help coordinate work on a package between
@@ -918,7 +918,7 @@ New software which isn't likely to damage your system can go directly into
 <em>unstable</em>.
          <p>
 An alternative to <em>experimental</em> is to use your personal web space
-on <tt>people.debian.org</tt> (<tt>klecker.debian.org</tt>).
+on <tt>people.debian.org</tt>.
 
 
       <sect1 id="codenames">Release code names
@@ -1579,7 +1579,7 @@ maintenance software will process it by running <prgn>dinstall</prgn>
 on your changes file: <example>dinstall -n foo.changes</example>.
 Note that <prgn>dput</prgn> can do this for you automatically.
 
-       <sect2 id="upload-non-us">Uploading to <tt>non-US</tt> (pandora)
+       <sect2 id="upload-non-us">Uploading to <tt>non-US</tt>
          <p>
 As discussed above, export controlled software should not be uploaded
 to <tt>ftp-master</tt>.  Instead, upload the package to