Policy: Link relationship fields (7.1) to architecture specification strings (11.1)

Patch from Charles Plessy in #628174.

diff --git a/debian/changelog b/debian/changelog
index 8edf8af02a10626a80d0a250429d0c65412b5db9..290e329ef5d96dfce336452b36f81ea186959263 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -16,6 +16,8 @@ debian-policy (3.9.3.0) UNRELEASED; urgency=low
     Michael Dorrington. Closes: #626408
 
   [ Bill Allombert ]
+  * Policy: Link relationship fields (7.1) to architecture specification strings (11.1)
+    Patch from Charles Plessy in #628174.
   * Policy: Retire legacy Motif policy (11.8.8)
     Proposed by: Justin B Rye
     Wording: Russ Allbery <rra@debian.org>
@@ -27,7 +29,7 @@ debian-policy (3.9.3.0) UNRELEASED; urgency=low
     Reported by Thomas Preud'homme, patch by Charles Plessy.
     Closes: #623050
 
- -- Bill Allombert <ballombe@debian.org>  Sat, 28 May 2011 20:17:08 +0200
+ -- Bill Allombert <ballombe@debian.org>  Sat, 28 May 2011 22:39:06 +0200
 
 debian-policy (3.9.2.0) unstable; urgency=low
 

diff --git a/policy.sgml b/policy.sgml
index 7377752406f340721ab0370771ba478087060399..6efdef4b2aab68903d199687313e6179686f5bba 100644 (file)
--- a/policy.sgml
+++ b/policy.sgml
@@ -4627,6 +4627,7 @@ Depends: libc6 (>= 2.2.1), exim | mail-transport-agent
          architectures.  This is indicated in brackets after each
          individual package name and the optional version specification.
          The brackets enclose a list of Debian architecture names
+         in the format described in <ref id="arch-spec">,
          separated by whitespace.  Exclamation marks may be prepended to
          each of the names.  (It is not permitted for some names to be
          prepended with exclamation marks while others aren't.)
@@ -4694,7 +4695,8 @@ Build-Depends: foo [!i386] | bar [!amd64]
 
         <p>
          Relationships may also be restricted to a certain set of
-         architectures using architecture wildcards.  The syntax for
+         architectures using architecture wildcards in the format
+         described in <ref id="arch-wildcard-spec">.  The syntax for
          declaring such restrictions is the same as declaring
          restrictions using a certain set of architectures without
          architecture wildcards.  For example: