From a7d78c2b9d3ff0040380eace6d8fb52eb3ac86c9 Mon Sep 17 00:00:00 2001
From: Russ Allbery <rra@debian.org>
Date: Fri, 13 Feb 2009 18:45:18 -0800
Subject: [PATCH] Revert "Change categories to distribution areas"

This reverts commit e3e47f1e735e4605924490e4fe5c06e28a573535.  This
change should not exist on this branch.
---
 policy.sgml | 35 ++++++++++++++---------------------
 1 file changed, 14 insertions(+), 21 deletions(-)

diff --git a/policy.sgml b/policy.sgml
index f4c16ab..423b960 100644
--- a/policy.sgml
+++ b/policy.sgml
@@ -319,13 +319,7 @@
 	<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>
-	  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.
-	</footnote> based on their licenses and other restrictions.
+	areas or categories based on their licenses and other restrictions.
       </p>
 
       <p>
@@ -342,8 +336,8 @@
       </p>
 
       <p>
-	The <em>main</em> distribution area forms the <em>Debian GNU/Linux
-	distribution</em>.
+	The <em>main</em> category  forms the
+	<em>Debian GNU/Linux distribution</em>.
       </p>
 
       <p>
@@ -454,10 +448,10 @@
       </sect>
 
       <sect id="sections">
-	<heading>Distribution areas</heading>
+	<heading>Categories</heading>
 
 	<sect1 id="main">
-	  <heading>The main distribution area</heading>
+	  <heading>The main category</heading>
 
 	  <p>
 	    Every package in <em>main</em> must comply with the DFSG
@@ -488,7 +482,7 @@
 	</sect1>
 
 	<sect1 id="contrib">
-	  <heading>The contrib distribution area</heading>
+	  <heading>The contrib category</heading>
 
 	  <p>
 	    Every package in <em>contrib</em> must comply with the DFSG.
@@ -528,7 +522,7 @@
 	</sect1>
 
 	<sect1 id="non-free">
-	  <heading>The non-free distribution area</heading>
+	  <heading>The non-free category</heading>
 
 	  <p>
 	    Packages must be placed in <em>non-free</em> if they are
@@ -644,13 +638,13 @@
 	<heading>Sections</heading>
 
 	<p>
-	  The packages in the distribution areas <em>main</em>,
+	  The packages in the categories <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
+	  The category 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
@@ -659,10 +653,10 @@
 	  <list compact="compact">
 	    <item>
 		  <em>section</em> if the package is in the
-		  <em>main</em> distribution area,
+		  <em>main</em> category,
 	    </item>
 	    <item>
-		  <em>area/section</em> if the package is in
+		  <em>segment/section</em> if the package is in
 		  the <em>contrib</em> or <em>non-free</em>
 		  distribution areas.
 	    </item>
@@ -9022,10 +9016,9 @@ 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> categories
+	  should state in the copyright file that the package is not part
+	  of the Debian GNU/Linux distribution and briefly explain why.
 	</p>
 
 	<p>
-- 
2.39.5