Merge branch 'master' into bug504880-rra

Conflicts:

	policy.sgml

diff --cc policy.sgml
index 48367c5f2dacffc65676f06c223664edf1ff1fdf,3ea83255bf906b9a3e51e8470b58f3525bf47737..5c26693d5299dccf480ec9b231b10b3cf79c252e
--- 1/policy.sgml
--- 2/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>