Add introductory paragraphs for each archive area

* Add introductory paragraphs for each archive area explaining briefly
  the purpose of that archive area.  Based on a proposal by CJ
  Fearnley.  (Closes: #594542)

diff --git a/debian/changelog b/debian/changelog
index 373e7effb95c14f7b6148c9f6a94607b9e646efd..e620d6b175daeec9e9d06bc06db9499a4494c26c 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -34,6 +34,9 @@ debian-policy (3.9.2.0) UNRELEASED; urgency=low
     to remove the libc5 compatibility directories and mention the
     multiarch triplet directories.  Based on a patch by Charles Plessy.
     (Closes: #597074)
+  * Add introductory paragraphs for each archive area explaining briefly
+    the purpose of that archive area.  Based on a proposal by CJ
+    Fearnley.  (Closes: #594542)
   * Change all non-historical references to Debian GNU/Linux to simply
     Debian since Debian now includes FreeBSD-based architectures.  Patch
     from Guillem Jover.  (Closes: #594656)

diff --git a/policy.sgml b/policy.sgml
index 13f95b0d191ce0a3019c72b808b69337107c0365..8fd21bba2478b3f0f6ef32bfc33cbe9e21c8b20f 100644 (file)
--- a/policy.sgml
+++ b/policy.sgml
@@ -464,6 +464,20 @@
        <sect1 id="main">
          <heading>The main archive area</heading>
 
+         <p>
+           The <em>main</em> archive area comprises the Debian
+           distribution.  Only the packages in this area are considered
+           part of the distribution.  None of the packages in
+           the <em>main</em> archive area require software outside of
+           that area to function.  Anyone may use, share, modify and
+           redistribute the packages in this archive area
+           freely<footnote>
+             See <url id="http://www.debian.org/intro/free"
+                      name="What Does Free Mean?"> for
+             more about what we mean by free software.
+           </footnote>.
+         </p>
+
          <p>
            Every package in <em>main</em> must comply with the DFSG
            (Debian Free Software Guidelines).
@@ -495,6 +509,13 @@
        <sect1 id="contrib">
          <heading>The contrib archive area</heading>
 
+         <p>
+           The <em>contrib</em> archive area contains supplemental
+           packages intended to work with the Debian distribution, but
+           which require software outside of the distribution to either
+           build or function.
+         </p>
+
          <p>
            Every package in <em>contrib</em> must comply with the DFSG.
          </p>
@@ -513,7 +534,6 @@
            </list>
          </p>
 
-
          <p>
            Examples of packages which would be included in
            <em>contrib</em> are:
@@ -535,6 +555,15 @@
        <sect1 id="non-free">
          <heading>The non-free archive area</heading>
 
+         <p>
+           The <em>non-free</em> archive area contains supplemental
+           packages intended to work with the Debian distribution that do
+           not comply with the DFSG or have other problems that make
+           their distribution problematic.  They may not comply with all
+           of the policy requirements in this manual due to restrictions
+           on modifications or other limitations.
+         </p>
+
          <p>
            Packages must be placed in <em>non-free</em> if they are
            not compliant with the DFSG or are encumbered by patents