2.1 release

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@4108 a1c6a512-1295-4272-9138-f99709370657

18 files changed, 73 insertions, 99 deletions

diff --git a/www/Makefile b/www/Makefile
index 8dbacb758b..ae966d93ec 100644
--- a/www/Makefile
+++ b/www/Makefile
@@ -28,6 +28,7 @@ all: $(OBJS)
         @(cd lang; $(MAKE))
         @(cd tshirt-contest; $(MAKE))
         @(cd screenshots; $(MAKE))
+        @(cd digest; $(MAKE))
 
 main.html: main.t activity.html
 
diff --git a/www/daily.t b/www/daily.t
index fb8b4a6270..4f47c15d2c 100644
--- a/www/daily.t
+++ b/www/daily.t
@@ -8,13 +8,14 @@ The top line is the latest.
 
 <p>
 <!--#exec cmd="./dailymod.pl" -->
+#if 0
 <p>
 <b>mod</b> - The file you should name "archos.mod" before copying it to the root of your archos.<br>
 <b>ajz</b> - The file you should name "ajbrec.ajz" before copying it to the root of your archos.<br>
 <b>rocks</b> - All plugins for this particular release of Rockbox.<br>
 <b>full</b> - Full zip archive, with rockbox, plugins, languages, docs, fonts, ucl etc.<br>
 <b>ucl</b> - File to use when <a href="/docs/flash.html">flashing Rockbox</a>
-
+#endif
 <h2>Source tarballs</h2>
 
 <!--#exec cmd="./dailysrc.pl" -->
@@ -65,6 +66,8 @@ The batch timestamp is GMT.
 <td>
 <a href="auto/build-fmrecorder/ajbrec.ajz">FM Recorder</a>
 (<a href="auto/build-fmrecorder/rocks.zip">rocks</a>)<br>
+<a href="auto/build-recorderv2/ajbrec.ajz">V2 Recorder</a>
+(<a href="auto/build-recorderv2/rocks.zip">rocks</a>)<br>
 <a href="auto/build-recorder8mb/ajbrec.ajz">8MB Recorder</a>
 (<a href="auto/build-recorder8mb/rocks.zip">rocks</a>)<br>
 </td>
diff --git a/www/dailymod.pl b/www/dailymod.pl
index e7bbee977b..a02e6be1b8 100755
--- a/www/dailymod.pl
+++ b/www/dailymod.pl
@@ -2,7 +2,7 @@
 
 my $basedir = "/home/dast/rockbox-build/daily-build";
 
-my @list=("player", "recorder", "fmrecorder", "recorder8mb");
+my @list=("player", "recorder", "fmrecorder", "recorderv2", "recorder8mb");
 
 for(@list) {
     my $dir = $_;
@@ -17,10 +17,14 @@ for(@list) {
     }
 }
 
-print "<table class=rockbox><tr><th>date</th>";
+print "<table class=rockbox>\n";
 
-for(@list) {
-    print "<th>$_</th>";
+if (0) {
+    print "<tr><th>date</th>";
+
+    for(@list) {
+        print "<th>$_</th>";
+    }
 }
 
 for(reverse sort keys %date) {
@@ -35,47 +39,9 @@ for(reverse sort keys %date) {
         my $n=0;
         my $m = $_;
         print "<td> ";
-        # old mod
-        if( -f "daily/$_/rockbox${d}.mod") {
-            print "<a href=\"daily/$_/rockbox${d}.mod\">mod</a>";
-            $n++;
-        }
-        # new mod
-        if( -f "daily/$_/rockbox-$m-${d}.mod") {
-            print "<a href=\"daily/$m/rockbox-$m-${d}.mod\">mod</a>";
-            $n++;
-        }
-        # old ajz
-        if( -f "daily/$_/rockbox${d}.ajz") {
-            printf "%s<a href=\"daily/$_/rockbox${d}.ajz\">ajz</a>",
-            $n?", ":"";
-            $n++;
-        }
-        # new ajz
-        if( -f "daily/$m/rockbox-$m-${d}.ajz") {
-            printf "%s<a href=\"daily/$m/rockbox-$m-${d}.ajz\">ajz</a>",
-            $n?", ":"";
-            $n++;
-        }
-        if( -f "daily/$_/rocks${d}.zip") {
-            printf "%s<a href=\"daily/$_/rocks${d}.zip\">rocks</a>",
-            $n?", ":"";
-            $n++;
-        }
-        # old-style full zip
-        if( -f "daily/$_/rockbox-${d}.zip") {
-            printf "%s<a href=\"daily/$_/rockbox-${d}.zip\">full</a>",
-            $n?", ":"";
-            $n++;
-        }
         # new-style full zip:
         if( -f "daily/$m/rockbox-${m}-${d}.zip") {
-            printf "%s<a href=\"daily/$_/rockbox-${m}-${d}.zip\">full</a>",
-            $n?", ":"";
-            $n++;
-        }
-        if( -f "daily/$_/rockbox${d}.ucl") {
-            printf "%s<a href=\"daily/$_/rockbox${d}.ucl\">ucl</a>",
+            printf "%s<a href=\"daily/$_/rockbox-${m}-${d}.zip\">${m}</a>",
             $n?", ":"";
             $n++;
         }
diff --git a/www/dailysrc.pl b/www/dailysrc.pl
index 7ad91a0d2a..d4e53ea922 100755
--- a/www/dailysrc.pl
+++ b/www/dailysrc.pl
@@ -9,7 +9,7 @@ closedir DIR;
 
 print "<ul>\n";
 
-for ( @tarballs ) {
+for ( sort {$b <=> $a} @tarballs ) {
     $size = (stat("$basedir/$_"))[7];
     $log = "";
     if (/-(\d+)/) {
diff --git a/www/docs/index.t b/www/docs/index.t
index 20dec6c17d..577bacff2e 100644
--- a/www/docs/index.t
+++ b/www/docs/index.t
@@ -3,10 +3,11 @@
 
 <h2>For users</h2>
 <ul>
+<li> <a href="/manual/manual.pdf">User manual</a> (pdf, 330KB)
 <li> <a href="faq.html">Frequently Asked Questions</a>
 <li> <a href="battery-faq.html">Frequently Asked Questions about Batteries and Charging</a>
+<p>
 <li> <a href="nodo.html">Features We Will Not Implement</a>
-<li> <a href="/manual/manual.pdf">User manual</a>
 <li> <a href="features.html">Feature Comparison Chart</a>
 <li> <a href="custom_wps_format.html">How to make a custom WPS</a>
 <li> <a href="custom_cfg_format.html">How to make a custom config file</a>
diff --git a/www/download/index.t b/www/download/index.t
index 01da64bc70..6163c6123f 100644
--- a/www/download/index.t
+++ b/www/download/index.t
@@ -2,52 +2,57 @@
 #define DOWNLOAD_PAGE
 #include "head.t"
 
-<h2>Latest version: 2.0</h2>
+<p><b>Note:</b> The latest "packaged" release, 2.0, is getting a bit old. For the latest features, we recommend you check out the <a href=/daily.shtml>daily builds</a>. (Yes yes, we really should make a new proper release...)
 
-<p>Please read the <a href="rockbox-2.0-notes.txt">release notes</a>. (<a href="old.html">Older releases</a>)
+<h2>Latest version: 2.1 (2003-12-04)</h2>
+
+<p>Please read the <a href="rockbox-2.1-notes.txt">release notes</a>. (<a href="old.html">Older releases</a>)
 
 <p>
 <table class=rockbox><tr>
 <th>player</th>
 <th>recorder</th>
 <th>fm recorder</th>
-</tr><tr>
+<th>recorder v2</th>
+</tr><tr  valign=top>
 <td>
-This version is for Archos Jukebox 5000, 6000 and all Studio models.
-<ul>
-<li><a href="rockbox-2.0-player.zip">rockbox-2.0-player.zip</a>
-<br>(137 KB)
-</ul>
+Archos Jukebox 5000, 6000 and Studio models
+
+<p><a href="rockbox-2.1-player.zip">rockbox-2.1-player.zip</a>
+<br>(184 KB)
 
 </td><td>
-This version is for all non-FM Archos Jukebox Recorder models.
+Archos Jukebox Recorder 6, 10, 15 and 20
 
-<ul>
-<li><a href="rockbox-2.0-recorder.zip">rockbox-2.0-recorder.zip</a>
-<br>(231 KB)
-</ul>
+<p><a href="rockbox-2.1-recorder.zip">rockbox-2.1-recorder.zip</a>
+<br>(412 KB)
 
 </td>
 <td>
-This version is for Archos Jukebox FM Recorder.
+Archos Jukebox FM Recorder
 
-<ul>
-<li><a href="rockbox-2.0-fmrecorder.zip">rockbox-2.0-fmrecorder.zip</a>
-<br>(229 KB)
-</ul>
+<p><a href="rockbox-2.1-fmrecorder.zip">rockbox-2.1-fmrecorder.zip</a>
+<br>(416 KB)
+
+</td>
+<td>
+Archos Jukebox Recorder V2
+
+<p><a href="rockbox-2.1-recorderv2.zip">rockbox-2.1-recorderv2.zip</a>
+<br>(416 KB)
 
 </td>
 </tr></table>
 
 <h3>Source code</h3>
 <ul>
-<li><a href="rockbox-2.0.tar.gz">rockbox-2.0.tar.gz</a>
+<li><a href="rockbox-2.1.tar.gz">rockbox-2.1.tar.gz</a>
 </ul>
 
 <h3>Auxiliary files</h3>
 <ul>
 <li><a href="/lang/">Languages</a>
-<li><a href="/fonts/">Fonts</a> (Recorder and FM Recorder only)
+<li><a href="/fonts/">Fonts</a> (Recorders only)
 </ul>
 
 <h2>Installation</h2>
diff --git a/www/download/old.t b/www/download/old.t
index 033b2795cd..c8c0f02a96 100644
--- a/www/download/old.t
+++ b/www/download/old.t
@@ -2,6 +2,7 @@
 #define OLDRELEASES_PAGE
 #include "head.t"
 
+<p><a href="rockbox-2.0-notes.txt">2.0 release notes</a>.
 <p><a href="rockbox-1.4-notes.txt">1.4 release notes</a>.
 <p><a href="rockbox-1.3-notes.txt">1.3 release notes</a>.
 <p><a href="rockbox-1.2-notes.txt">1.2 release notes</a>.
diff --git a/www/head.t b/www/head.t
index fd63f12e90..48ed848641 100644
--- a/www/head.t
+++ b/www/head.t
@@ -40,6 +40,7 @@
 <a class="menulink" href="/requests.shtml">feature&nbsp;requests</a><br>
 <a class="menulink" href="/bugs.shtml">bug reports</a><br>
 <a class="menulink" href="http://sourceforge.net/tracker/?group_id=44306&atid=439120">patches</a><br>
+<a class="menulink" href="http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/rockbox/">CVS</a><br>
 <a class="menulink" href="http://bjorn.haxx.se/isd200/">linux driver</a>
 
 <div align="right">
@@ -48,13 +49,12 @@
 <input value="Search" type=submit>
 <input type=hidden name=as_sitesearch value="rockbox.haxx.se">
 </form>
-<a href="http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/rockbox/"><img src="/viewcvs.png" width="128" height="48" border="0" alt="View CVS"></a>
-
-<br><a href="http://sourceforge.net/projects/rockbox/"><img src="http://sourceforge.net/sflogo.php?group_id=44306&amp;type=1" width="88" height="31" border="0" alt="SourceForge.net Logo"></a>
 
 <p class=menutext>Bandwidth and server<br>sponsored by:<br>
 <a href="http://www.contactor.se"><img border=0 src="/cont.png" width=101 height=36></a>
 
+<p><a href="http://sourceforge.net/projects/rockbox/"><img src="http://sourceforge.net/sflogo.php?group_id=44306&amp;type=1" width="88" height="31" border="0" alt="SourceForge.net Logo"></a>
+
 <form action="https://www.paypal.com/cgi-bin/webscr" method="post">
 <input type="hidden" name="cmd" value="_xclick">
 <input type="hidden" name="business" value="bjorn@haxx.se">
diff --git a/www/history.t b/www/history.t
index ca4a905355..439151d2d6 100644
--- a/www/history.t
+++ b/www/history.t
@@ -2,6 +2,15 @@
 #define HISTORY_PAGE
 #include "head.t"
 
+<p><i>2003-05-09</i>: The 400-file dir browser limit is <a href="http://rockbox.haxx.se/mail/archive/rockbox-archive-2003-05/0334.shtml">gone</a>.
+
+<p><i>2003-05-03</i>: Finally, FM Radio support for FM Recorder models!
+
+<p><i>2003-04-23</i>: <a href="/digest/">The Rockbox Digest</a> - track
+Rockbox development.
+
+<p><i>2003-04-15</i>: Version 2.0 is <a href="/download/">released</a>
+
 <p><i>2003-02-14</i>: Matthew P. O'Reilly gave Linus an FM Recorder  for his birthday!
 Linus had it for 2 hours before he took it apart and started drawing schematics...
 
diff --git a/www/internals/index.t b/www/internals/index.t
index c65904d8d5..9bcc8c0523 100644
--- a/www/internals/index.t
+++ b/www/internals/index.t
@@ -32,4 +32,8 @@
  Roland's "undressed" archos:<br>
 <a href="micromusic_archos_jb20rec.jpg"><img src="small-micromusic_archos_jb20rec.jpg" border="0"></a>
 
+<p>
+ Sa'ad Saeed's tribute to Rockbox:<br>
+<a href="archos_radiosity20.jpg"><img src="archos_radiosity20.thumb.jpg" border="0"></a>
+
 #include "foot.t"
diff --git a/www/internals/recorder.t b/www/internals/recorder.t
index 9de1ecfe85..bcbf8019aa 100644
--- a/www/internals/recorder.t
+++ b/www/internals/recorder.t
@@ -24,5 +24,8 @@ Outside view of the MP3REAR board
 <p><a href="rec_rear_bottom.jpg"><img src="rec_rear_bottom_t.jpg"></a><br>
 Inside view of the MP3REAR board
 
+<p><a href="rec_lcd.jpg"><img src="rec_lcd_t.jpg"></a><br>
+The LCD
+
 
 #include "foot.t"
diff --git a/www/irc/index.t b/www/irc/index.t
index dc5b3f3c77..5111431bf3 100644
--- a/www/irc/index.t
+++ b/www/irc/index.t
@@ -1,8 +1,8 @@
 #define _PAGE_ IRC
 #include "head.t"
 
-<p>We often hang out on #rockbox over at irc.freenode.net
-(freenode was once known as openprojects.net, see
+<p>We often hang out on <a href="irc://irc.freenode.net/rockbox">#rockbox</a>
+over at irc.freenode.net (freenode was once known as openprojects.net, see
 <a href="http://freenode.net/">their web site</a> for more information).
 Since there is a great deal of technical discussion, we log these sessions
 for later reference.
diff --git a/www/main.t b/www/main.t
index b032213326..6b19a4e1f1 100644
--- a/www/main.t
+++ b/www/main.t
@@ -4,7 +4,7 @@
 #include "head.t"
 
 <p class="ingress"> Rockbox is an Open Source replacement firmware for the
-Archos Jukebox 5000, 6000, Studio, Recorder and FM Recorder MP3 players.
+Archos Jukebox 5000, 6000, Studio, Recorder, FM Recorder and Recorder V2 MP3 players.
 
 <p> Rockbox is a complete rewrite and uses no fragments of the original
 firmware. It boasts <a href="/docs/features.html">numerous features</a> while
@@ -14,37 +14,15 @@ remaining <a href="http://rockbox.haxx.se/manual/manual.pdf">easy to use</a>.
 upgrade your ordinary Archos firmware.
 
 <h2>News</h2>
-<p><i>2003-07-09</i>: Rockbox started from <a href="/docs/flash.html">flash ROM</a> works!
+<p><i>2003-12-04</i>: Version 2.1 is <a href="/download/">released</a>
 
-<p><i>2003-06-30</i>: The plugin loader is now <a href="http://rockbox.haxx.se/mail/archive/rockbox-archive-2003-06/0707.shtml">alive</a>!
+<p><i>2003-07-09</i>: Rockbox started from <a href="/docs/flash.html">flash ROM</a> works
 
-<p><i>2003-05-09</i>: The 400-file dir browser limit is <a href="http://rockbox.haxx.se/mail/archive/rockbox-archive-2003-05/0334.shtml">gone</a>.
-
-<p><i>2003-05-03</i>: Finally, FM Radio support for FM Recorder models!
-
-<p><i>2003-04-23</i>: <a href="/digest/">The Rockbox Digest</a> - track
-Rockbox development.
-
-<p><i>2003-04-15</i>: Version 2.0 is <a href="/download/">released</a>
+<p><i>2003-06-30</i>: The plugin loader is now <a href="http://rockbox.haxx.se/mail/archive/rockbox-archive-2003-06/0707.shtml">alive</a>
 
 <p><i><small>(Old news items have moved to a 
 <a href="history.html">separate page</a>.)</small></i>
 
-<h2>Roadmap</h2>
-<p>This is a rough indication of which features we plan/expect/hope to be
-included in which versions. Naturally, this is all subject to change without
-notice.
-
-<dl>
-<dt><b>Version 2.1</b>
-<dd> Lots of features and fixes that were held off for 2.0
-<br> Plugin loader, opening the door for a bucketful of new applications
-
-<dt><b>Version 2.2</b>
-<dd> User interface overhaul
-
-</dl>
-
 <h2>Recent CVS activity</h2>
 <p>
 <!--#include file="lastcvs.link" -->
diff --git a/www/mods/a2.jpg b/www/mods/a2.jpg
index 147f93aa90..914f349ef0 100644
--- a/www/mods/a2.jpg
+++ b/www/mods/a2.jpg
diff --git a/www/mods/disassemble2.t b/www/mods/disassemble2.t
index 7cdbc636fa..9522db81ee 100644
--- a/www/mods/disassemble2.t
+++ b/www/mods/disassemble2.t
@@ -6,6 +6,8 @@
 <p><img src="a2.jpg">
 <br>
 Locate the three solder points where the top board is soldered to the frame.
+
+<p>On some units the there are also two additional solder points (green circles) where the top board is soldered to the "MP3REAR" board.
 <hr>
 
 <p><img src="a3.jpg">
diff --git a/www/mods/index.t b/www/mods/index.t
index 75ed0e5c91..bcb3dab8c9 100644
--- a/www/mods/index.t
+++ b/www/mods/index.t
@@ -27,6 +27,7 @@
 <li>Uwe Freese modified his recorder to be able to
 <a href="http://www.uwe-freese.de/rockbox/rtc_alarm_en.html">
 power-on from the RTC alarm</a>.
+<li><a href="http://www.geocities.com/raichea/">Steve Russell's PIC-based remote control</a>
 </ul>
 
 <p><img src="esd.jpg">
diff --git a/www/style.css b/www/style.css
index f46da7a404..a2ac15c0c5 100644
--- a/www/style.css
+++ b/www/style.css
@@ -20,7 +20,7 @@ H2 {
  font-size:        14pt;
 }
 
-H3, div.h5 {
+H3, div.h5, .newsdate {
  text-decoration:  none;
  font-family:      Verdana,Arial,Helvetica,sans-serif;
  font-style:       normal;
diff --git a/www/txt2html.pl b/www/txt2html.pl
index 6e39e8dcaf..5a532cdead 100755
--- a/www/txt2html.pl
+++ b/www/txt2html.pl
@@ -9,7 +9,7 @@ sub fixline {
     $_ =~ s/\</&lt;/g;
     $_ =~ s/\>/&gt;/g;
 
-    $_ =~ s/(http:\/\/([a-zA-Z0-9_.\#\/-]*)[^\) .\n])/\<a href=\"$1\"\>$1\<\/a\>/g;
+    $_ =~ s/(http:\/\/([a-zA-Z0-9_.\#\/-\?\&]*)[^\) .\n])/\<a href=\"$1\"\>$1\<\/a\>/g;
 
     $_ =~ s/(\\|\/)$/$1&nbsp;/g; # clobber backslash on end of line
 }