X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=developers-reference.sgml;h=16732d2ee61ee3d9effdf6f5232b3de9eb51482e;hb=90c9e75afaf1cf7994b255f399474aae07db5bfb;hp=867204ba801d38ab22b63f2289df3b1dbe664de6;hpb=00fe222417a611199dd5d523caeb06b0a70d1040;p=developers-reference.git

diff --git a/developers-reference.sgml b/developers-reference.sgml
index 867204b..16732d2 100644
--- a/developers-reference.sgml
+++ b/developers-reference.sgml
@@ -8,6 +8,7 @@
  TODO:
   - bugs in upstream versions should be reported upstream!
   - fill in ftp and www server discussion
+  - how to mirror
   - porter instructions - - volunteers needed for this x86-centric maintainer!
   - talk about CVS access
  -->
@@ -275,18 +276,89 @@ Online archives of mailing lists are available at <url
 id="http://www.debian.org/Lists-Archives/">.
 
 
-      <sect>The master server
+      <sect id="servers-master">The master server
 	<p>
-The master server, <tt/master.debian.org/, holds the cannonical copy
-of the Debian archive (excluding the non-U.S. packages).  Generally,
-package uploads go to this server; cf. <ref id="upload">.  All Debian
-developers have accounts on this machine.
+The master server, <tt/master.debian.org/, holds the canonical copy
+of the Debian archive (excluding the non-U.S. packages). Generally,
+package uploads go to this server; cf. <ref id="upload">. 
+	<p>
+<tt/master.debian.org/ 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@lists.debian.org/ before
+implementing anything, however, to reduce unnecessary duplication of
+effort or wasted processing time.
+	<p>
+All Debian developers have accounts on <tt/master.debian.org/.  Please
+take care to protect your password to this machine.  Try to avoid
+login or upload methods which send passwords over the Internet in the
+clear.
+	<p>
+If you find a problem with <tt/master.debian.org/ such as disk full,
+suspicious activity, or whatever, send an email to
+<email>debian-admin@debian.org</email>.
 
-      <sect>The FTP servers
+      <sect id="servers-ftp">The FTP servers
+	<p>
+
+      <sect id="servers-www">The WWW servers
+	<p>
+The main web server, <tt/www.debian.org/, is also known as
+<tt/va.debian.org/.  All developers are given accounts on this
+machine.
+	<p>
+If you have some Debian-specific information which you want to serve
+up on the web, you can do do this by putting material in the
+<tt>public_html</tt> directory under your home directory.  You can do
+this on either <tt/va.debian.org/ or <tt/master.debian.org/.  Any
+material you put in those areas are accessible via the URLs
+<tt>http://www.debian.org/~<var>user-id</var>/</tt> and
+<tt>http://master.debian.org/~<var>user-id</var>/</tt>, respectively.
+Please do <em>not</em> put any materials on Debian servers which do
+not relate to Debian.
 	<p>
+If you find a problem with the Debian web server, you should generally
+submit a bug against the pseudo-package,
+<package>www.debian.org</package>.  First check whether or not someone
+else has already reported the problem on the <url
+id="http://www.debian.org/Bugs/db/pa/lwww.debian.org.html" name="Bug
+Tracking System">.
 
-      <sect>The WWW servers
+      <sect id="servers-cvs">The CVS server
+	<p>
+<tt/cvs.debian.org/ is also known as <tt/va.debian.org/, discussed
+above.  If you need the use of a publically 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.  Generally,
+<tt/cvs.debian.org/ offers a combination of local CVS access,
+anonymous client-server read-only access, and full client-server
+access through <prgn>ssh</prgn>.
+	<p>
+To request a CVS area, send a request via email to
+<email>debian-admin@debian.org</email>.
+
+
+      <sect id="servers-mirrors">Mirrors of Debian servers
+	<p>
+The web and FTP servers have several mirrors available.  Please do not
+put heavy load on the canonical FTP or web servers.  Ideally, the
+canonical servers only mirror out to a first tier of mirrors, and all
+user access is to the mirrors.  This allows Debian to better spread
+our bandwidth requirements over several servers and networks.  Note
+that newer push mirroring techniques ensure that mirrors are as
+up-to-date as they can be.
+	<p>
+The main web page listing the available public FTP (and, usually,
+HTTP) servers can be found at <url
+id="http://www.debian.org/distrib/ftplist">. More information
+concerning mirrors can be found at <url
+id="http://www.debian.org/mirror/">.  This useful page includes
+information and tools which can be helpful if you are interested in
+setting up your own mirror, either for internal or public access.
 	<p>
+Note that mirrors are generally run by third-parties who are
+interested in helping Debian.  As such, developers generally do not
+have accounts on these machines.
 
 
     <chapt id="archive">The Debian Archive
@@ -310,9 +382,9 @@ main/binary-i386/
 main/binary-i386/admin/
 main/binary-i386/base/
      ...
-main/binary-m86k
-main/binary-m86k/admin/
-main/binary-m86k/base/
+main/binary-m68k
+main/binary-m68k/admin/
+main/binary-m68k/base/
      ...
 main/source/
 main/source/admin/
@@ -325,14 +397,14 @@ main/disks-m68k/
 contrib/
 contrib/binary-all/
 contrib/binary-i386/
-contrib/binary-m86k/
+contrib/binary-m68k/
      ...
 contrib/source/
 
 non-free/
 non-free/binary-all/
 non-free/binary-i386/
-non-free/binary-m86k/
+non-free/binary-m68k/
          ...
 non-free/source/
 </example>
@@ -343,7 +415,7 @@ three directories, namely <em>main</>, <em>contrib</>, and
 	<p>
 In each section, there is a directory with the source packages
 (source), a directory for each supported architecture (binary-i386,
-binary-m86k, etc.), and a directory for architecture independent
+binary-m68k, etc.), and a directory for architecture independent
 packages (binary-all).
 	<p>
 The <em/main/ section contains additional directories which holds the