The "only in testing" page should be under "Everything in one page",

[bugscan.git] / dohtml

diff --git a/dohtml b/dohtml
index dd3a8da3e5e7f49392848f6d930b964f35c0f4ef..72d73134a05992b674f05d7ea87133b651ec549a 100755 (executable)
--- a/dohtml
+++ b/dohtml
@@ -1,6 +1,6 @@
 #! /bin/sh
 
-htmldir=/home/sesse/bugscan
+htmldir=/home/sesse/bugscan/www
 
 realmakepage() {
        local   filter="$1"     # Distributions to list
@@ -112,7 +112,8 @@ EOF
 <p>The red line graphs all bugs with release-critical severities; the green
 line graphs the number of bugs that are actually a concern for the next
 release (excluding ignored bugs, bugs on packages not in testing, and bugs
-whose tags indicate that they don't apply to testing).</p>
+whose tags and/or versioning information indicate that they don't apply to
+testing).</p>
 
 <h2>Recent changes</h2>
 EOF
@@ -125,8 +126,6 @@ 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>
@@ -144,6 +143,8 @@ EOF
   <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="debian/testing.html">Only bugs relevant to testing</a>
 </ul>
 <p clear=both>
 <hr>
@@ -173,7 +174,7 @@ 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 "debian" "$title" "$htmldir/debian/testing.html" "$time" "-t"
+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"