Change distribution area to archive area

Also reword the footnote about the Social Contract language slightly.

diff --git a/policy.sgml b/policy.sgml
index 9b9ee4c22e4ebf6b9dd7421df0e830b53cb7a9e5..5ecda02a9e6122afdae70d1994e0217605a985a7 100644 (file)
--- a/policy.sgml
+++ b/policy.sgml
@@ -318,13 +318,11 @@
        system, but not every package we want to make accessible is
        <em>free</em> in our sense (see the Debian Free Software
        Guidelines, below), or may be imported/exported without
-       restrictions. Thus, the archive is split into the distribution
-       areas or components<footnote>
+       restrictions. Thus, the archive is split into areas<footnote>
          The Debian archive software uses the term "component" internally
          and in the Release file format to refer to the division of an
-         archive.  The Debian Social Contract refers to distribution
-         areas.  This document uses the same terminology as the Social
-         Contract.
+         archive.  The Debian Social Contract simply refers to "areas."
+         This document uses terminology similar to the Social Contract.
        </footnote> based on their licenses and other restrictions.
       </p>
 
@@ -342,12 +340,12 @@
       </p>
 
       <p>
-       The <em>main</em> distribution area forms the <em>Debian GNU/Linux
+       The <em>main</em> archive area forms the <em>Debian GNU/Linux
        distribution</em>.
       </p>
 
       <p>
-       Packages in the other distribution areas (<tt>contrib</tt>,
+       Packages in the other archive areas (<tt>contrib</tt>,
        <tt>non-free</tt>) are not considered to be part of the Debian
        distribution, although we support their use and provide
        infrastructure for them (such as our bug-tracking system and
@@ -454,10 +452,10 @@
       </sect>
 
       <sect id="sections">
-       <heading>Distribution areas</heading>
+       <heading>Archive areas</heading>
 
        <sect1 id="main">
-         <heading>The main distribution area</heading>
+         <heading>The main archive area</heading>
 
          <p>
            Every package in <em>main</em> must comply with the DFSG
@@ -488,7 +486,7 @@
        </sect1>
 
        <sect1 id="contrib">
-         <heading>The contrib distribution area</heading>
+         <heading>The contrib archive area</heading>
 
          <p>
            Every package in <em>contrib</em> must comply with the DFSG.
@@ -528,7 +526,7 @@
        </sect1>
 
        <sect1 id="non-free">
-         <heading>The non-free distribution area</heading>
+         <heading>The non-free archive area</heading>
 
          <p>
            Packages must be placed in <em>non-free</em> if they are
@@ -644,18 +642,18 @@
        <heading>Sections</heading>
 
        <p>
-         The packages in the distribution areas <em>main</em>,
-         <em>contrib</em> and <em>non-free</em> are grouped further
-         into <em>sections</em> to simplify handling.
+         The packages in the archive areas <em>main</em>,
+         <em>contrib</em> and <em>non-free</em> are grouped further into
+         <em>sections</em> to simplify handling.
        </p>
 
        <p>
-         The distribution area and section for each package should be
-         specified in the package's <tt>Section</tt> control record
-         (see <ref id="f-Section">).  However, the maintainer of the
-         Debian archive may override this selection to ensure the
-         consistency of the Debian distribution.  The
-         <tt>Section</tt> field should be of the form:
+         The archive area and section for each package should be
+         specified in the package's <tt>Section</tt> control record (see
+         <ref id="f-Section">).  However, the maintainer of the Debian
+         archive may override this selection to ensure the consistency of
+         the Debian distribution.  The <tt>Section</tt> field should be
+         of the form:
          <list compact="compact">
            <item>
                  <em>section</em> if the package is in the
@@ -9012,10 +9010,10 @@ install-info --quiet --remove /usr/share/info/foobar.info
        </p>
 
        <p>
-         Packages in the <em>contrib</em> or <em>non-free</em>
-         distribution areas should state in the copyright file that the
-         package is not part of the Debian GNU/Linux distribution and
-         briefly explain why.
+         Packages in the <em>contrib</em> or <em>non-free</em> archive
+         areas should state in the copyright file that the package is not
+         part of the Debian GNU/Linux distribution and briefly explain
+         why.
        </p>
 
        <p>