Change the listing of bts tags and bts severities to use entities.

This includes adding wheezy and wheezy-ignore tags.
Changes also applied to translated pages.
-----------------------------------------------------------------
Modified Files:
bulgarian/Bugs/index.wml bulgarian/Bugs/server-refcard.wml
catalan/Bugs/index.wml catalan/Bugs/server-refcard.wml
chinese/Bugs/index.wml croatian/Bugs/index.wml
czech/Bugs/index.wml danish/Bugs/Developer.wml
danish/Bugs/index.wml danish/Bugs/server-control.wml
danish/Bugs/server-refcard.wml dutch/Bugs/index.wml
dutch/Bugs/server-refcard.wml english/Bugs/Developer.wml
english/Bugs/index.wml english/Bugs/pkgreport-opts.inc
english/Bugs/server-control.wml
english/Bugs/server-refcard.wml finnish/Bugs/index.wml
finnish/Bugs/server-control.wml
finnish/Bugs/server-refcard.wml french/Bugs/Developer.wml
french/Bugs/index.wml french/Bugs/server-control.wml
french/Bugs/server-refcard.wml hungarian/Bugs/index.wml
italian/Bugs/Developer.wml italian/Bugs/index.wml
italian/Bugs/server-control.wml
italian/Bugs/server-refcard.wml japanese/Bugs/Developer.wml
japanese/Bugs/index.wml norwegian/Bugs/Developer.wml
polish/Bugs/index.wml portuguese/Bugs/Developer.wml
portuguese/Bugs/index.wml portuguese/Bugs/server-control.wml
portuguese/Bugs/server-refcard.wml russian/Bugs/Developer.wml
russian/Bugs/index.wml russian/Bugs/server-control.wml
russian/Bugs/server-refcard.wml slovak/Bugs/index.wml
spanish/Bugs/Developer.wml spanish/Bugs/index.wml
spanish/Bugs/server-control.wml
spanish/Bugs/server-refcard.wml swedish/Bugs/Developer.wml
swedish/Bugs/index.wml swedish/Bugs/server-control.wml
swedish/Bugs/server-refcard.wml ukrainian/Bugs/index.wml
ukrainian/Bugs/server-refcard.wml

CVS version numbers

bulgarian/Bugs/index.wml: 1.18 -> 1.19 
bulgarian/Bugs/server-refcard.wml: 1.12 -> 1.13 
catalan/Bugs/index.wml: 1.25 -> 1.26 
catalan/Bugs/server-refcard.wml: 1.21 -> 1.22 
chinese/Bugs/index.wml: 1.25 -> 1.26 
croatian/Bugs/index.wml: 1.41 -> 1.42 
czech/Bugs/index.wml: 1.12 -> 1.13 
danish/Bugs/Developer.wml: 1.51 -> 1.52 
danish/Bugs/index.wml: 1.44 -> 1.45 
danish/Bugs/server-control.wml: 1.57 -> 1.58 
danish/Bugs/server-refcard.wml: 1.25 -> 1.26 
dutch/Bugs/index.wml: 1.32 -> 1.33 
dutch/Bugs/server-refcard.wml: 1.12 -> 1.13 
english/Bugs/Developer.wml: 1.83 -> 1.84 
english/Bugs/index.wml: 1.77 -> 1.78 
english/Bugs/pkgreport-opts.inc: 1.51 -> 1.52 
english/Bugs/server-control.wml: 1.92 -> 1.93 
english/Bugs/server-refcard.wml: 1.37 -> 1.38 
finnish/Bugs/index.wml: 1.45 -> 1.46 
finnish/Bugs/server-control.wml: 1.10 -> 1.11 
finnish/Bugs/server-refcard.wml: 1.29 -> 1.30 
french/Bugs/Developer.wml: 1.64 -> 1.65 
french/Bugs/index.wml: 1.49 -> 1.50 
french/Bugs/server-control.wml: 1.71 -> 1.72 
french/Bugs/server-refcard.wml: 1.38 -> 1.39 
hungarian/Bugs/index.wml: 1.27 -> 1.28 
italian/Bugs/Developer.wml: 1.62 -> 1.63 
italian/Bugs/index.wml: 1.60 -> 1.61 
italian/Bugs/server-control.wml: 1.53 -> 1.54 
italian/Bugs/server-refcard.wml: 1.24 -> 1.25 
japanese/Bugs/Developer.wml: 1.52 -> 1.53 
japanese/Bugs/index.wml: 1.49 -> 1.50 
norwegian/Bugs/Developer.wml: 1.13 -> 1.14 
polish/Bugs/index.wml: 1.23 -> 1.24 
portuguese/Bugs/Developer.wml: 1.46 -> 1.47 
portuguese/Bugs/index.wml: 1.27 -> 1.28 
portuguese/Bugs/server-control.wml: 1.43 -> 1.44 
portuguese/Bugs/server-refcard.wml: 1.20 -> 1.21 
russian/Bugs/Developer.wml: 1.46 -> 1.47 
russian/Bugs/index.wml: 1.43 -> 1.44 
russian/Bugs/server-control.wml: 1.40 -> 1.41 
russian/Bugs/server-refcard.wml: 1.18 -> 1.19 
slovak/Bugs/index.wml: 1.4 -> 1.5 
spanish/Bugs/Developer.wml: 1.45 -> 1.46 
spanish/Bugs/index.wml: 1.35 -> 1.36 
spanish/Bugs/server-control.wml: 1.46 -> 1.47 
spanish/Bugs/server-refcard.wml: 1.28 -> 1.29 
swedish/Bugs/Developer.wml: 1.74 -> 1.75 
swedish/Bugs/index.wml: 1.60 -> 1.61 
swedish/Bugs/server-control.wml: 1.77 -> 1.78 
swedish/Bugs/server-refcard.wml: 1.37 -> 1.38 
ukrainian/Bugs/index.wml: 1.10 -> 1.11 
ukrainian/Bugs/server-refcard.wml: 1.9 -> 1.10

5 files changed, 32 insertions, 54 deletions

diff --git a/english/Bugs/Developer.wml b/english/Bugs/Developer.wml
index 01c486caf5e..208d2cc5aaf 100644
--- a/english/Bugs/Developer.wml
+++ b/english/Bugs/Developer.wml
@@ -1,4 +1,5 @@
 #use wml::debian::template title="Debian BTS — developer info" NOHEADER=yes NOCOPYRIGHT=true
+#include "$(ENGLISHDIR)/Bugs/pkgreport-opts.inc"
 
 <h1>Information regarding the bug processing system for package
   maintainers and bug triagers</h1>
@@ -171,7 +172,8 @@ or by using the <code>tags</code> command with the
 <a href="#requestserv">control request server</a>.
 Separate multiple tags with commas, spaces, or both.</p>
 
-<p>The current bug tags are:</p>
+<p>The current bug tags are: <bts_tags>. Here is some detailed info
+about the tags:</p>
 
 <dl>
 
diff --git a/english/Bugs/index.wml b/english/Bugs/index.wml
index 1e9ec82779e..e37e1dc1d68 100644
--- a/english/Bugs/index.wml
+++ b/english/Bugs/index.wml
@@ -58,8 +58,8 @@ alt="Bug count for all" />
 <p>More selections can be added after the first search. If a later selection
    is on the same search field, the results are ORed. If it is on a different
    field, the results are ANDed.</p>
-<p>Valid severities are <bts_severities></p>
-<p>Valid tags are <bts_tags></p>
+<p>Valid severities are <bts_severities>.</p>
+<p>Valid tags are <bts_tags>.</p>
 </td>
 </tr>
 
diff --git a/english/Bugs/pkgreport-opts.inc b/english/Bugs/pkgreport-opts.inc
index 67251df3390..ef0a2e16d04 100644
--- a/english/Bugs/pkgreport-opts.inc
+++ b/english/Bugs/pkgreport-opts.inc
@@ -151,28 +151,26 @@
   </select>
 </define-tag>
 
-# this is pasted from debbugs/etc/config
-<perl>
-@gSeverityList = ( "critical", "grave", "serious", "important", "normal",
-                   "minor", "wishlist", "fixed"
-                 );
-</perl>
+# bug severities. See debbugs/etc/config
+<define-tag bts_severities>
+<code>critical</code>, <code>grave</code>, <code>serious</code>, 
+<code>important</code>, <code>normal</code>, <code>minor</code>, 
+<code>wishlist</code>, <code>fixed</code></define-tag>
 
-<define-tag bts_severities whitespace=delete>
-  <: print (join ", ", @gSeverityList); :>
-</define-tag>
-
-# this is pasted from debbugs/etc/config
-<perl>
-@gTags = ( "patch", "wontfix", "moreinfo", "unreproducible", "fixed",
-           "potato", "woody", "sid", "help", "security", "upstream",
-           "pending", "sarge", "sarge-ignore", "experimental", "d-i",
-           "confirmed", "ipv6", "lfs", "fixed-in-experimental",
-           "fixed-upstream", "l10n", "etch", "etch-ignore",
-           "lenny", "lenny-ignore",
-         );
-</perl>
+# bug tags. See debbugs/etc/config
+<define-tag bts_tags>
+<code>patch</code>, <code>wontfix</code>, <code>moreinfo</code>, 
+<code>unreproducible</code>, <code>help</code>, <code>pending</code>, 
+<code>security</code>, <code>upstream</code>, <code>confirmed</code>, 
+<code>fixed</code>, <code>fixed-upstream</code>, 
+<code>fixed-in-experimental</code>, <code>d-i</code>, <code>ipv6</code>, 
+<code>lfs</code>, <code>l10n</code>, 
+<code>potato</code>, <code>woody</code>, 
+<code>sarge</code>, <code>sarge-ignore</code>, 
+<code>etch</code>, <code>etch-ignore</code>, 
+<code>lenny</code>, <code>lenny-ignore</code>, 
+<code>squeeze</code>, <code>squeeze-ignore</code>, 
+<code>wheezy</code>, <code>wheezy-ignore</code>, 
+<code>sid</code>, 
+<code>experimental</code></define-tag>
 
-<define-tag bts_tags whitespace=delete>
-  <: print join(", ", @gTags); :>
-</define-tag>
diff --git a/english/Bugs/server-control.wml b/english/Bugs/server-control.wml
index 44df094c507..338cad9dc7b 100644
--- a/english/Bugs/server-control.wml
+++ b/english/Bugs/server-control.wml
@@ -1,4 +1,5 @@
 #use wml::debian::template title="Debian BTS &mdash; control server" NOHEADER=yes NOCOPYRIGHT=true
+#include "$(ENGLISHDIR)/Bugs/pkgreport-opts.inc"
 
 <h1>Introduction to the bug control and manipulation mailserver</h1>
 
@@ -345,9 +346,7 @@ mailservers is available via the WWW, in
     </p>
 
     <p>
-    Severities are <code>critical</code>, <code>grave</code>,
-    <code>serious</code>, <code>important</code>, <code>normal</code>,
-    <code>minor</code>, and <code>wishlist</code>.
+    Severities are <bts_severities>.
     </p>
 
     <p>
@@ -547,19 +546,7 @@ mailservers is available via the WWW, in
     </pre>
 
     <p>
-    Available tags currently include <code>patch</code>, <code>wontfix</code>,
-    <code>moreinfo</code>, <code>unreproducible</code>, <code>help</code>,
-    <code>pending</code>, <code>fixed</code>,
-    <code>fixed-in-experimental</code>, <code>fixed-upstream</code>,
-    <code>security</code>, 
-    <code>upstream</code>, <code>confirmed</code>, <code>d-i</code>,
-    <code>ipv6</code>, <code>lfs</code>, <code>l10n</code>,
-    <code>potato</code>, <code>woody</code>, <code>sarge</code>,
-    <code>sarge-ignore</code>, <code>etch</code>, <code>etch-ignore</code>,
-    <code>lenny</code>, <code>lenny-ignore</code>,
-    <code>squeeze</code>, <code>squeeze-ignore</code>,
-    <code>wheezy</code>, <code>wheezy-ignore</code>,
-    <code>sid</code>, and <code>experimental</code>.
+    Available tags currently include <bts_tags>.</p>
     </p>
 
     <p>
diff --git a/english/Bugs/server-refcard.wml b/english/Bugs/server-refcard.wml
index 30d50108f1d..df5579c06d6 100644
--- a/english/Bugs/server-refcard.wml
+++ b/english/Bugs/server-refcard.wml
@@ -1,4 +1,5 @@
 #use wml::debian::template title="Debian BTS &mdash; mail server reference card" NOHEADER=yes NOCOPYRIGHT=true
+#include "$(ENGLISHDIR)/Bugs/pkgreport-opts.inc"
 
 <h1>Mail servers' reference card</h1>
 
@@ -67,19 +68,9 @@ instead)</strong></li>
 the originator as the original submitter; <code>!</code> sets it to
 you, the person doing the reopen.</p>
 
-<p><a href="Developer#severities">Severities</a> are <code>critical</code>,
-<code>grave</code>, <code>serious</code>, <code>important</code>,
-<code>normal</code>, <code>minor</code>, and <code>wishlist</code>.</p>
+<p><a href="Developer#severities">Severities</a> are <bts_severities>.</p>
 
-<p><a href="Developer#tags">Tags</A> currently include <code>patch</code>,
-<code>wontfix</code>, <code>moreinfo</code>, <code>unreproducible</code>,
-<code>help</code>, <code>pending</code>, <code>fixed</code>,
-<code>security</code>, <code>upstream</code>, <code>confirmed</code>,
-<code>fixed-upstream</code>, <code>fixed-in-experimental</code>, <code>d-i</code>, <code>ipv6</code>,
-<code>lfs</code>, <code>l10n</code>, <code>potato</code>,
-<code>woody</code>, <code>sarge</code>, <code>sarge-ignore</code>,
-<code>etch</code>, <code>etch-ignore</code>, <code>sid</code>, and
-<code>experimental</code>.</p>
+<p><a href="Developer#tags">Tags</A> currently include <bts_tags>.</p>
 
 <h2>Synopsis of bug submission and followup addresses</h2>