Merge branch 'master' into bug104373-rra

diff --combined policy.sgml
index a2bdea76d6f02755e19611a1a422124bd43de6fa,6c770fdf83181f75ead143d8e0b3f4626d543cfc..7eb5d558d0a26450f3962c3ad1f11641d74259b3
--- 1/policy.sgml
--- 2/policy.sgml
+++ b/policy.sgml
@@@ -476,11 -476,9 +476,9 @@@
              <item>
                  must not require a package outside of <em>main</em>
                  for compilation or execution (thus, the package must
-                 not declare a <tt>Pre-Depends</tt>, <tt>Depends</tt>,
-                 <tt>Recommends</tt>, <tt>Build-Depends</tt>,
-                 or <tt>Build-Depends-Indep</tt> relationship on a
-                 non-<em>main</em> package unless a package
-                 in <em>main</em> is listed as an alternative),
+                 not declare a "Depends", "Recommends", or
+                 "Build-Depends" relationship on a non-<em>main</em>
+                 package),
              </item>
              <item>
                  must not be so buggy that we refuse to support them,
@@@ -8333,13 -8331,11 +8331,13 @@@ don
                <example compact="compact">
  /usr/lib/cgi-bin/<var>cgi-bin-name</var>
                </example>
 -              and should be referred to as
 +              or a subdirectory of that directory, and should be
 +              referred to as
                <example compact="compact">
  http://localhost/cgi-bin/<var>cgi-bin-name</var>
                </example>
 -
 +              (possibly with a subdirectory name
 +              before <var>cgi-bin-name</var>).
            </item>
  
            <item>