X-Git-Url: https://git.donarmstrong.com/?p=bugscan.git;a=blobdiff_plain;f=dohtml;h=5ed9927733b775ab59201195e2579787afa5d498;hp=8a393031e4136ea34e9cb1ca5e519d5e541bf5b2;hb=79a7d8380b9712a363a95e8998d6ba3e95ff581b;hpb=dc6c5369d04ccf6b7f1f41bebc4ecc90c00adb1a;ds=sidebyside

diff --git a/dohtml b/dohtml
index 8a39303..5ed9927 100755
--- a/dohtml
+++ b/dohtml
@@ -39,17 +39,6 @@ EOF
 	./bugreport -H -s $filter
 	
 	cat <<EOF
-<p>
-Explanation for comment tags:
-<ul>
-   <li><strong>[FIX]</strong>: describes a simple method to deal with
-       the bug.
-   <li><strong>[STRATEGY]</strong>: describes a possible approach for
-       fixing the bug.
-   <li><strong>[HELP]</strong>: help is needed to fix this bug.
-   <li><strong>[REMOVE]</strong>: package will be removed if bug is not fixed
-</ul>
-
 <p>
 Explanation for <a href="http://www.debian.org/Bugs/Developer#tags">bug
 tags</a>:
@@ -66,10 +55,10 @@ tags</a>:
 </ul>
 
 <p>
-Some bugs have an additional set of tags indicating they only apply
-to a particular release: O for oldstable (woody), S for stable (sarge),
-T for testing (etch), U for unstable (sid) or E for experimental. X
-indicates that the package is not in testing.
+The second set of tags indicate what releases a bug applies to:
+O for oldstable (woody), S for stable (sarge), T for testing (etch),
+U for unstable (sid) or E for experimental. X indicates that the
+package is not in testing.
 
 <p>
 
@@ -126,25 +115,15 @@ EOF
 
 <ul>
   <li> <a href="debian/all.html">All</a>
-    <br>
-     + <a href="debian/testing.html">Only bugs relevant to testing</a>
-    <br>
-     + <a href="debian-non-US/all.html">All non-US</a>
   <li> <a href="debian/main.html">main</a>
-    <br>
-     + <a href="debian-non-US/main.html">main non-US</a>
   <li> <a href="debian/source.html">source</a> 
-    <br>
-     + <a href="debian-non-US/source.html">source non-US</a> 
   <li> <a href="debian/contrib.html">contrib</a>
-    <br>
-     + <a href="debian-non-US/contrib.html">contrib non-US</a>
   <li> <a href="debian/non-free.html">non-free</a>
-    <br>
-     + <a href="debian-non-US/non-free.html">non-free non-US</a>
   <li><a href="other/pseudo.html">pseudo-packages</a>
        <a href="http://www.debian.org/Bugs/pseudo-packages">(?)</a>
   <li><a href="other/all.html">Everything in one page</a>
+    <br>
+     + <a href="other/testing.html">Only bugs relevant to testing</a>
 </ul>
 <p clear=both>
 <hr>
@@ -174,17 +153,8 @@ makepage "debian/contrib" "$title" $htmldir/debian/contrib.html "$time"
 makepage "debian/non-free" "$title" $htmldir/debian/non-free.html "$time"
 makepage "debian/source" "$title" $htmldir/debian/source.html "$time"
 
-makepage "" "$title" "$htmldir/debian/testing.html" "$time" "-t"
-
-makepage "non-US" "$title" "$htmldir/debian-non-US/all.html" "$time"
-makepage "non-US/main" "$title" $htmldir/debian-non-US/main.html "$time"
-makepage "non-US/contrib" "$title" $htmldir/debian-non-US/contrib.html "$time"
-makepage "non-US/non-free" "$title" $htmldir/debian-non-US/non-free.html "$time"
-makepage "non-US/source" "$title" $htmldir/debian-non-US/source.html "$time"
-
-makepage "other/pseudo" "$title" $htmldir/other/pseudo.html "$time"
-
 makepage "" "$title" $htmldir/other/all.html "$time"
+makepage "" "$title" "$htmldir/other/testing.html" "$time" "-t"
 
 makemainpage > $htmldir/index.html.new
 mv -f $htmldir/index.html.new $htmldir/index.html