7 files changed, 49 insertions, 53 deletions

diff --git a/www/daily.t b/www/daily.t
index 4a1f34232e..31d5279027 100644
--- a/www/daily.t
+++ b/www/daily.t
@@ -42,7 +42,6 @@ The batch timestamp is GMT.
 <a href="auto/build-player/archos.mod">Player</a><br>
 <a href="auto/build-playerdebug/archos.mod">Player debug</a><br>
 <a href="auto/build-playersim/rockboxui">Player simulator (linux)</a><br>
-<a href="auto/build-playersimwin32/uisw32.exe">Player simulator (win32)</a>
 </td>
 <td>
 <a href="auto/build-playerold/archos.mod">Player-old</a><br>
@@ -53,7 +52,6 @@ The batch timestamp is GMT.
 <a href="auto/build-recorder/ajbrec.ajz">Recorder</a><br>
 <a href="auto/build-recorderdebug/ajbrec.ajz">Recorder debug</a><br>
 <a href="auto/build-recordersim/rockboxui">Recorder simulator (linux)</a><br>
-<a href="auto/build-recordersimwin32/uisw32.exe">Recorder simulator (win32)</a>
 </td>
 </tr></table>
 
diff --git a/www/download/index.t b/www/download/index.t
index a0e9a24de0..fefa487b03 100644
--- a/www/download/index.t
+++ b/www/download/index.t
@@ -2,15 +2,9 @@
 #define DOWNLOAD_PAGE
 #include "head.t"
 
-<h2>Note</h2>
+<h2>Changes for version 1.2</h2>
 
-<p>The 1.1 version is now quite old. We didn't manage to release the 1.2
-version before the summer vacation, so we would recommend you to try one
-of the daily builds if you want to experience the true Rockbox power.
-
-<h2>Version 1.1</h2>
-
-<p>Recorder support, playlists and scrolling are the main new features of this version. Read the <a href="rockbox-1.1-notes.txt">release notes</a>.
+<p>Very much has changed since last version. Read the <a href="rockbox-1.2-notes.txt">release notes</a>.
 
 <p>
 <table><tr valign="top"><td>
@@ -18,7 +12,7 @@ of the daily builds if you want to experience the true Rockbox power.
 <p>This version is for old Archos Jukebox 6000 models with ROM firmware older than 4.50.
 
 <ul>
-<li><a href="rockbox-1.1-player-old.mod">rockbox-1.1-player-old.mod</a>
+<li><a href="rockbox-1.2-player-old.mod">rockbox-1.2-player-old.mod</a>
 </ul>
 
 </td><td>
@@ -27,45 +21,41 @@ of the daily builds if you want to experience the true Rockbox power.
 <p>This version is for Archos Jukebox 5000, 6000 with ROM firmware 4.50 or later, and all Studio models.
 
 <ul>
-<li><a href="rockbox-1.1-player.mod">rockbox-1.1-player.mod</a>
+<li><a href="rockbox-1.2-player.mod">rockbox-1.2-player.mod</a>
 </ul>
 
-<p><b>Bug</b>: Bass and treble adjustment does not work.
-
 </td><td>
 
 <h3>recorder</h3>
 <p>This version is for all Archos Jukebox Recorder models.
 
 <ul>
-<li><a href="rockbox-1.1-recorder.ajz">rockbox-1.1-recorder.ajz</a>
+<li><a href="rockbox-1.2-recorder.ajz">rockbox-1.2-recorder.ajz</a>
 </ul>
 
-<p><b>Bug</b>: MP3 playback only works on Recorder 20, not 6 or 10. PLAY key is not detected, use RIGHT.
-
 </td></tr></table>
 
-
 <h3>Source code</h3>
 <ul>
-<li><a href="rockbox-1.1.tar.gz">rockbox-1.1.tar.gz</a>
+<li><a href="rockbox-1.2.tar.gz">rockbox-1.2.tar.gz</a>
 </ul>
 
+
 <h3>Screen shots (from simulator)</h3>
 
 <p>
-<table><tr>
-<td><img src="player-sim.png" alt="Player simulator">
+<table><tr valign=top>
+<td><img src="pboot-1.2.png" alt="Player simulator">
 <br>Player boot screen</td>
 
-<td><img src="recorder-sim.png" alt="Recorder simulator">
+<td><img src="boot-1.2.png" alt="Recorder simulator">
 <br>Recorder boot screen</td>
 
-<td><img src="browser.png" alt="File browser"><br>Recorder file browser</td>
+<td><img src="dir-1.2.png" alt="Dir browser"><br>Recorder dir browser</td>
 
-<td><img src="id3.png" alt="ID3 display"><br>Recorder ID3 display</td>
-</tr><tr>
-<td><img src="tetris.png" alt="Tetris"><br>Tetris (recorder only)</td>
+<td><img src="wps-1.2.png" alt="WPS"><br>Recorder "While Playing Screen"</td>
+</tr><tr valign=top>
+<td><img src="tetris-1.2.png" alt="Tetris"><br>Tetris (recorder only)</td>
 <td><img src="sokoban.png" alt="Sokoban"><br>Sokoban (recorder only)</td>
 <td><img src="bounce.png" alt="Bounce"><br>Bouncing text (recorder only)</td>
 </tr></table>
@@ -75,11 +65,10 @@ of the daily builds if you want to experience the true Rockbox power.
 
 <p>
 <ul>
-<li><a href="player-sim-1.1">player simulator 1.1 for linux-x86</a> (48300 bytes)
-(if you don't have libgcc_s.so.1, get it <a href="libgcc_s.so.1">here</a>)
-<li><a href="recorder-sim-1.1">recorder simulator 1.1 for linux-x86</a> (98184 bytes)
-<li><a href="player-sim-1.1.exe">player simulator 1.1 for win32</a> (126976 bytes)
-<li><a href="recorder-sim-1.1.exe">recorder simulator 1.1 for win32</a> (172032 bytes)
+<li><a href="rockbox-1.2-player-sim">player simulator 1.2 for linux-x86</a>
+<li><a href="rockbox-1.2-recorder-sim">recorder simulator 1.2 for linux-x86</a>
+<li><a href="rockbox-1.2-player-sim.exe">player simulator 1.2 for win32</a>
+<li><a href="rockbox-1.2-recorder-sim.exe">recorder simulator 1.2 for win32</a>
 </ul>
 
 <p>The simulators browse a directory called 'archos' in the directory they are started from. Create it and copy some mp3 files there. The buttons are simulated on the numeric keypad:
diff --git a/www/head.t b/www/head.t
index de006f2516..d32e092a86 100644
--- a/www/head.t
+++ b/www/head.t
@@ -29,8 +29,9 @@
 <p align="right">
 <a class="menulink" href="/">main page</a><br>
 <a class="menulink" href="/download/">download</a><br>
-<a class="menulink" href="/tshirt-contest/">t-shirt contest</a><br>
+<a class="menulink" href="/manual/">manual</a><br>
 <a class="menulink" href="/docs/FAQ">FAQ</a><br>
+<a class="menulink" href="/tshirt-contest/">t-shirt contest</a><br>
 <a class="menulink" href="/notes.html">research notes</a><br>
 <a class="menulink" href="/docs/">data sheets</a><br>
 <a class="menulink" href="/schematics/">schematics</a><br>
diff --git a/www/history.t b/www/history.t
index 7fe07fa292..455f1f5e18 100644
--- a/www/history.t
+++ b/www/history.t
@@ -2,6 +2,15 @@
 #define HISTORY_PAGE
 #include "head.t"
 
+<p><i>2002-07-28</i>: Configuration saving implemented for all models. Experimental saving to disk
+is not yet enabled on the players by default.
+
+<p><i>2002-06-30</i>: USB cable detection added.
+
+<p><i>2002-06-27</i>: MP3 playback now works for Recorder 6000 and Recorder 10 too.
+
+<p><i>2002-06-19</i>: Version 1.1 is released. <a href="download/">Download it here</a>.
+
 <p><i>2002-06-19</i>: Recorder sound support checked into CVS. Good news: No background noise!
 
 <p><i>2002-06-10</i>: Playlist and scroll support added. Testing for release v1.1.
diff --git a/www/internals/index.t b/www/internals/index.t
index cc3417059e..9edd05a65a 100644
--- a/www/internals/index.t
+++ b/www/internals/index.t
@@ -1,14 +1,23 @@
-#define _PAGE_ Photos of Jukebox internals
+#define _PAGE_ Photos of Jukeboxes
 #include "head.t"
 
-<h2>Jukebox 6000</h2>
+<h2>External view</h2>
+
+<a href="../devcon/show.cgi?img4083.jpg"><img src="../devcon/img4083t.jpg" alt="photo" border=0 width=200 height=150></a>
+
+<a href="../devcon/show.cgi?img4084.jpg"><img src="../devcon/img4084t.jpg" alt="photo" border=0 width=200 height=150></a>
+
+<a href="../devcon/show.cgi?img4086.jpg"><img src="../devcon/img4086t.jpg" alt="photo" border=0 width=200 height=150></a>
+
+
+<h2>Jukebox 6000 internals</h2>
 
 <ul>
 <li> <a href="bjorn.html">Björn's original "dissecting the archos" page</a>
 <li> <a href="tjerk.html">Tjerk's very high resolution photos</a>
 </ul>
 
-<h2>Jukebox Recorder</h2>
+<h2>Jukebox Recorder internals</h2>
 <ul>
 <li> <a href="recorder.html">Phil's photos of his recorder</a>
 </ul>
diff --git a/www/irc/irclogs.pl b/www/irc/irclogs.pl
index 361c1f5682..e04e28b053 100755
--- a/www/irc/irclogs.pl
+++ b/www/irc/irclogs.pl
@@ -24,10 +24,15 @@ for ( @logs ) {
             $mname = ucfirst MonthNameEng($m);
             if ( $m != $lastm ) {
                 print "</ul></td>\n" if $lastm != 0;
+#                if ( $m % 6 == 0 ) {
+#                    print "</tr><tr valign=top>\n";
+#                }
                 print "<td align=\"right\"><b>$mname $y</b>\n";
                 print "<ul>\n";
                 $lastm = $m;
             }
+#            $lines = `wc -l $file` + 0;
+#            print "<li><a test href=\"$file\">$mname $d</a> <small>($lines lines)</small>\n";
             print "<li><a test href=\"$file\">$mname $d</a>\n";
         }
     }
diff --git a/www/main.t b/www/main.t
index 8927ca612c..711e949861 100644
--- a/www/main.t
+++ b/www/main.t
@@ -10,23 +10,14 @@ firmware for the Archos Jukebox <i>5000</i>, <i>6000</i>, <i>Studio</i> and <i>R
 
 <h2>News</h2>
 
-<p><i>2002-08-09</i>: Version 1.1 is released. <a href="download/">Download it here</a>.
+<p><i>2002-08-09</i>: Version 1.2 is released. <a href="download/">Download it here</a>.
 
-<p><i>2002-08-06</i>: Web site moved to new domain: <strong>rockbox.haxx.se</strong>. Bear with us while we chase down the last bad links.
+<p><i>2002-08-06</i>: Web site moved to new domain: <strong>rockbox.haxx.se</strong>.
 
 <p><i>2002-08-06</i>: Battery charging added for the Recorders (players have hardware charging).
 
 <p><i>2002-08-02</i>: <a href="tshirt-contest">Rockbox T-Shirt Design Contest</a>
 
-<p><i>2002-07-28</i>: Configuration saving implemented for all models. Experimental saving to disk
-is not yet enabled on the players by default.
-
-<p><i>2002-06-30</i>: USB cable detection added.
-
-<p><i>2002-06-27</i>: MP3 playback now works for Recorder 6000 and Recorder 10 too.
-
-<p><i>2002-06-19</i>: Version 1.1 is released. <a href="download/">Download it here</a>.
-
 <p><i><small>(Old news items have moved to a 
 <a href="history.html">separate page</a>.)</small></i>
 
@@ -45,14 +36,8 @@ included in which versions. Naturally, this is all subject to change without
 notice.
 
 <dl>
-<dt><b>Version 1.1</b>
-<dd>Playlist support, scrolling, recorder support
-
-<dt><b>Version 1.2</b>
-<dd>UI improvements
-
 <dt><b>Version 1.3</b>
-<dd>Resume, persistent settings, autobuild playlists, UI improvements
+<dd>Resume, persistent settings, autobuild playlists, proportional fonts
 </dl>
 
 <h2>About the hardware</h2>