From 79c24b70e608953066a5611c611fadd3c1e3182d Mon Sep 17 00:00:00 2001
From: Russ Allbery <rra@debian.org>
Date: Mon, 31 May 2010 10:11:43 -0700
Subject: [PATCH] Treat any as just another architecture wildcard

Now that we describe architecture wildcards, any is just another
wildcard.  This mostly reverts to the state of Manoj's previous
wording proposal but also updates the list of possible values at
the start of the Architecture section.
---
 policy.sgml | 36 +++++++++++++++++++-----------------
 1 file changed, 19 insertions(+), 17 deletions(-)

diff --git a/policy.sgml b/policy.sgml
index e2236be..88ce825 100644
--- a/policy.sgml
+++ b/policy.sgml
@@ -2727,27 +2727,29 @@ Package: libc6
 	    <tt>Architecture</tt> field can include the following sets of
 	    values:
 	    <list>
-		<item>A unique single word identifying a Debian machine
-                architecture as described in <ref id="arch-spec">.
-                </item>
-                <item>
-                  An architecture wildcard identifying a set of Debian
-                  machine architectures, see <ref id="arch-wildcard-spec">.
-                </item>
-		<item><tt>all</tt>, which indicates an
-		      architecture-independent package.
-		<item><tt>any</tt>, which indicates a package available
-		      for building on any architecture.
-		<item><tt>source</tt>, which indicates a source package.
+		<item>
+		  A unique single word identifying a Debian machine
+		  architecture as described in <ref id="arch-spec">.
+		</item>
+		<item>
+		  An architecture wildcard identifying a set of Debian
+		  machine architectures, see <ref id="arch-wildcard-spec">.
+		</item>
+		<item>
+		  <tt>all</tt>, which indicates an
+		  architecture-independent package.
+		</item>
+		<item>
+		  <tt>source</tt>, which indicates a source package.
+		</item>
 	    </list>
 	  </p>
 
 	  <p>
 	    In the main <file>debian/control</file> file in the source
-	    package, this field may contain the special value
-	    <tt>any</tt>, the special value <tt>all</tt>, or a list of
-	    specific and wildcard architectures separated by spaces.  If
-	    <tt>any</tt> or <tt>all</tt> appear, that value must be the
+	    package, this field may contain special value <tt>all</tt> or
+	    a list of specific and wildcard architectures separated by
+	    spaces.  If <tt>all</tt> appears, that value must be the
 	    entire contents of the field.  Most packages will use
 	    either <tt>any</tt> or <tt>all</tt>.  Specifying a specific
 	    list of architectures is for the minority of cases where a
@@ -2794,7 +2796,7 @@ Package: libc6
 	    package, <tt>all</tt> will also be included in the list.
 	  </p>
 
- 	  <p>
+	  <p>
 	    Specifying a list of architecture wildcards indicates that
             the source will build an architecture-dependent package on
             the union of the lists of architectures from the expansion
-- 
2.39.5