From: hertzog <hertzog@313b444b-1b9f-4f58-a734-7bb04f332e8d>
Date: Sun, 14 Feb 2010 17:46:30 +0000 (+0000)
Subject: Update and simplify list of architectures. Thanks Karl Goetz. Closes: #567234
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=developers-reference.git;a=commitdiff_plain;h=917680c03685a473f8fc55f8aeb2238991b48101

Update and simplify list of architectures. Thanks Karl Goetz. Closes: #567234

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

diff --git a/common.ent b/common.ent
index 754416e..3efbc1f 100644
--- a/common.ent
+++ b/common.ent
@@ -167,28 +167,28 @@
 <!ENTITY pgp-keyserv "<literal>subkeys.pgp.net</literal>">
 
 <!ENTITY sample-dist-dirtree "<screen>dists/stable/main/
+dists/stable/main/binary-amd64/
+dists/stable/main/binary-armel/
 dists/stable/main/binary-i386/
-dists/stable/main/binary-m68k/
-dists/stable/main/binary-alpha/
      ...
 dists/stable/main/source/
      ...
+dists/stable/main/disks-amd64/
+dists/stable/main/disks-armel/
 dists/stable/main/disks-i386/
-dists/stable/main/disks-m68k/
-dists/stable/main/disks-alpha/
      ...
 
 dists/stable/contrib/
+dists/stable/contrib/binary-amd64/
+dists/stable/contrib/binary-armel/
 dists/stable/contrib/binary-i386/
-dists/stable/contrib/binary-m68k/
-dists/stable/contrib/binary-alpha/
      ...
 dists/stable/contrib/source/
 
 dists/stable/non-free/
+dists/stable/non-free/binary-amd64/
+dists/stable/non-free/binary-armel/
 dists/stable/non-free/binary-i386/
-dists/stable/non-free/binary-m68k/
-dists/stable/non-free/binary-alpha/
      ...
 dists/stable/non-free/source/
 
@@ -221,8 +221,8 @@ pool/main/liba/libalias-perl/
 pool/main/m/
 pool/main/m/mailx/
      ...
-pool/non-free/n/
-pool/non-free/n/netscape/
+pool/non-free/f/
+pool/non-free/f/firmware-nonfree/
      ...</screen>">
 
 <!ENTITY example-uu "<programlisting>uuencode-file:
diff --git a/debian/changelog b/debian/changelog
index ab018b4..e97b9e6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -42,6 +42,8 @@ developers-reference (3.4.4) UNRELEASED; urgency=low
   * Update URL explaining the "Debian Maintainer" status, it's now at
     http://wiki.debian.org/DebianMaintainer. Closes: #564414
   * Update number of source packages. Thanks Karl Goetz. Closes: #567235
+  * Update and simplify list of architectures. Thanks Karl Goetz.
+    Closes: #567234
 
  -- Lucas Nussbaum <lucas@lucas-nussbaum.net>  Tue, 22 Dec 2009 22:49:40 +0900
 
diff --git a/resources.dbk b/resources.dbk
index 954610d..57b3824 100644
--- a/resources.dbk
+++ b/resources.dbk
@@ -525,32 +525,23 @@ Nowadays, these exist only in the Section header fields of packages.
 <para>
 In the first days, the Linux kernel was only available for Intel i386 (or
 greater) platforms, and so was Debian.  But as Linux became more and more
-popular, the kernel was ported to other architectures, too.
+popular, the kernel was ported to other architectures and Debian started
+to support them. And as if supporting so much hardware was not enough,
+Debian decided to build some ports based on other Unix kernels, like
+<literal>hurd</literal> and <literal>kfreebsd</literal>.
 </para>
 <para>
-The Linux 2.0 kernel supports Intel x86, DEC Alpha, SPARC, Motorola 680x0 (like
-Atari, Amiga and Macintoshes), MIPS, and PowerPC.  The Linux 2.2 kernel
-supports even more architectures, including ARM and UltraSPARC.  Since Linux
-supports these platforms, Debian decided that it should, too.  Therefore,
-Debian has ports underway; in fact, we also have ports underway to non-Linux
-kernels.  Aside from <literal>i386</literal> (our name for Intel x86), there
-is <literal>m68k</literal>, <literal>alpha</literal>,
-<literal>powerpc</literal>, <literal>sparc</literal>,
-<literal>hurd-i386</literal>, <literal>arm</literal>,
-<literal>ia64</literal>, <literal>hppa</literal>,
-<literal>s390</literal>, <literal>mips</literal>,
-<literal>mipsel</literal> and <literal>sh</literal> as of this writing.
-</para>
-<para>
-&debian-formal; 1.3 is only available as <literal>i386</literal>.  Debian
+&debian-formal; 1.3 was only available as <literal>i386</literal>.  Debian
 2.0 shipped for <literal>i386</literal> and <literal>m68k</literal>
-architectures.  Debian 2.1 ships for the <literal>i386</literal>,
+architectures.  Debian 2.1 shipped for the <literal>i386</literal>,
 <literal>m68k</literal>, <literal>alpha</literal>, and
-<literal>sparc</literal> architectures.  Debian 2.2 added support for the
-<literal>powerpc</literal> and <literal>arm</literal> architectures.
-Debian 3.0 added support of five new architectures: <literal>ia64</literal>,
-<literal>hppa</literal>, <literal>s390</literal>, <literal>mips</literal>
-and <literal>mipsel</literal>.
+<literal>sparc</literal> architectures.  Since then Debian has grown hugely.
+Debian 5 supports a total of twelve architectures: <literal>alpha</literal>,
+<literal>amd64</literal>, <literal>arm</literal>,
+<literal>armel</literal>, <literal>hppa</literal>,
+<literal>i386</literal>, <literal>ia64</literal>, <literal>mips</literal>,
+<literal>mipsel</literal>, <literal>powerpc</literal>,
+<literal>s390</literal>, <literal>sparc</literal>.
 </para>
 <para>
 Information for developers and users about the specific ports are available at