From: Russ Allbery <rra@debian.org>
Date: Sun, 22 Feb 2009 22:35:20 +0000 (-0800)
Subject: Merge branch 'master' into bug504880-rra
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=ae1df1dde94bc76eb5d11f5224ae774d730a85ed;p=debian%2Fdebian-policy.git

Merge branch 'master' into bug504880-rra

Conflicts:

	policy.sgml
---

ae1df1dde94bc76eb5d11f5224ae774d730a85ed
diff --cc policy.sgml
index 48367c5,3ea8325..5c26693
--- a/policy.sgml
+++ b/policy.sgml
@@@ -653,12 -657,12 +657,12 @@@
  	  <list compact="compact">
  	    <item>
  		  <em>section</em> if the package is in the
- 		  <em>main</em> category,
+ 		  <em>main</em> archive area,
  	    </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.
+ 		  archive areas.
  	    </item>
  	  </list>
  	</p>