Remove all references to non-US.

Add myself back to Uploaders.

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

diff --git a/debian/changelog b/debian/changelog
index f1059ed0824a8b5f3a7c15a246c3c575bfa78f17..0f7fcd51fd7fb86c2fd49acc6ebe3311c331c852 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -31,6 +31,8 @@ developers-reference (3.3.9) unstable; urgency=low
   * Add a link to enrico's excellent Debian Community Guidelines.
   * Recommend the use of DSA's request tracker instead of mailing them.
   * Remove reference to #debian-sf which doesn't exist anymore.
   * Add a link to enrico's excellent Debian Community Guidelines.
   * Recommend the use of DSA's request tracker instead of mailing them.
   * Remove reference to #debian-sf which doesn't exist anymore.

+  * Remove all stuff concerning non-US.
+  * Put myself back in Uploaders.

 
  -- Raphael Hertzog <hertzog@debian.org>  Sat, 04 Aug 2007 17:51:06 +0200
 
 
  -- Raphael Hertzog <hertzog@debian.org>  Sat, 04 Aug 2007 17:51:06 +0200
 

diff --git a/debian/control b/debian/control
index 7add9c056e8f63e97ab9030bbfc72973585bfec2..dfdfbdfd82b64d92dd27257c8d31263a286c5450 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: developers-reference
 Section: doc
 Priority: optional
 Maintainer: Debian Documentation Project <debian-doc@lists.debian.org>
 Section: doc
 Priority: optional
 Maintainer: Debian Documentation Project <debian-doc@lists.debian.org>

-Uploaders: Andreas Barth <aba@not.so.argh.org>
+Uploaders: Andreas Barth <aba@not.so.argh.org>, Raphael Hertzog <hertzog@debian.org>

 Standards-Version: 3.7.2
 Build-Depends-Indep: debiandoc-sgml (>= 1.1.76), tetex-bin, tetex-extra
 Build-Depends: debhelper (>= 4.1.32)
 Standards-Version: 3.7.2
 Build-Depends-Indep: debiandoc-sgml (>= 1.1.76), tetex-bin, tetex-extra
 Build-Depends: debhelper (>= 4.1.32)

diff --git a/developers-reference.sgml b/developers-reference.sgml
index 9d051748cb6e387471bbd13a636f852e6486ab5d..5c6cffc31cb2f086db4632a90e1be89c01bc4633 100644 (file)
--- a/developers-reference.sgml
+++ b/developers-reference.sgml
@@ -7,7 +7,7 @@
   <!ENTITY % dynamicdata  SYSTEM "dynamic.ent" > %dynamicdata;
 
   <!-- CVS revision of this document -->
   <!ENTITY % dynamicdata  SYSTEM "dynamic.ent" > %dynamicdata;
 
   <!-- CVS revision of this document -->

-  <!ENTITY cvs-rev "$Revision: 1.331 $">
+  <!ENTITY cvs-rev "$Revision: 1.332 $">

 
   <!-- if you are translating this document, please notate the CVS
        revision of the original developer's reference in cvs-en-rev -->
 
   <!-- if you are translating this document, please notate the CVS
        revision of the original developer's reference in cvs-en-rev -->


@@ -696,7 +696,7 @@ wasted processing time.
       <sect1 id="servers-ftp-master">The ftp-master server
        <p>
 The <tt>ftp-master.debian.org</tt> server holds the canonical copy of the Debian
       <sect1 id="servers-ftp-master">The ftp-master server
        <p>
 The <tt>ftp-master.debian.org</tt> server holds the canonical copy of the Debian

-archive (excluding the non-US packages). Generally, package uploads
+archive. Generally, package uploads

 go to this server; see <ref id="upload">.
        <p>
 It is restricted; a mirror is available on <tt>merkel</tt>.
 go to this server; see <ref id="upload">.
        <p>
 It is restricted; a mirror is available on <tt>merkel</tt>.


@@ -706,13 +706,6 @@ bugs against the <package>ftp.debian.org</package> pseudo-package or
 an email to &email-ftpmaster;, but also see the procedures in
 <ref id="archive-manip">.
 
 an email to &email-ftpmaster;, but also see the procedures in
 <ref id="archive-manip">.
 

-      <sect1 id="servers-non-us">The non-US server
-       <p>
-The non-US server <tt>non-us.debian.org</tt>
-was discontinued with the release of sarge. The pseudo-package
-<package>nonus.debian.org</package>
-still exists for now.
-

       <sect1 id="servers-www">The www-master server
        <p>
 The main web server is <tt>www-master.debian.org</tt>.
       <sect1 id="servers-www">The www-master server
        <p>
 The main web server is <tt>www-master.debian.org</tt>.


@@ -1898,11 +1891,6 @@ process of uploading packages into Debian.
 For removing packages, please see the README file in that ftp directory,
 and the Debian package <ref id="dcut">.
 
 For removing packages, please see the README file in that ftp directory,
 and the Debian package <ref id="dcut">.
 

-       <sect1 id="upload-non-us">Uploading to <tt>non-US</tt>
-         <p>
-<em>Note:</em> non-us was discontinued with the release of sarge.
-
-

        <sect1 id="delayed-incoming">Delayed uploads
          <p>
 Delayed uploads are done for the moment via the delayed queue at
        <sect1 id="delayed-incoming">Delayed uploads
          <p>
 Delayed uploads are done for the moment via the delayed queue at