merge r19537 from the 3.1 branch (use correct version numbers)

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

23 files changed, 28 insertions, 24 deletions

diff --git a/manual/getting_started/installation.tex b/manual/getting_started/installation.tex
index 9d922c3779..1c6e333c48 100644
--- a/manual/getting_started/installation.tex
+++ b/manual/getting_started/installation.tex
@@ -221,8 +221,12 @@ you want to install and get the appropriate version for your \dap{}.
 
 \item[Release.]
   \opt{release30}{The release version is the latest stable release, free
-      of known critical bugs. The current stable release of Rockbox is
-      available at \url{http://www.rockbox.org/download/}.
+      of known critical bugs. The current stable release of Rockbox, version
+      3.0, is available at \url{http://www.rockbox.org/download/}.
+  }
+  \opt{release31}{The release version is the latest stable release, free
+      of known critical bugs. The current stable release of Rockbox, version
+      3.1, is available at \url{http://www.rockbox.org/download/}.
   }
   \opt{unreleased}{
       There has not yet been a stable release for the \playername{}. Until
diff --git a/manual/platform/c200.tex b/manual/platform/c200.tex
index 7cfe1dc20a..4d3fabe75c 100644
--- a/manual/platform/c200.tex
+++ b/manual/platform/c200.tex
@@ -6,7 +6,7 @@
 \edef\UseOption{\UseOption,HAVE_CAR_ADAPTER_MODE}
 \edef\UseOption{\UseOption,HAVE_BUTTON_LIGHTS}
 \edef\UseOption{\UseOption,sansa}
-\edef\UseOption{\UseOption,release30}
+\edef\UseOption{\UseOption,release31}
 
 \newcommand{\playerman}{Sansa}
 \newcommand{\playertype}{c200}
diff --git a/manual/platform/e200.tex b/manual/platform/e200.tex
index ac230c4b51..15997650f0 100644
--- a/manual/platform/e200.tex
+++ b/manual/platform/e200.tex
@@ -6,7 +6,7 @@
 \edef\UseOption{\UseOption,HAVE_CAR_ADAPTER_MODE}
 \edef\UseOption{\UseOption,HAVE_BUTTON_LIGHTS}
 \edef\UseOption{\UseOption,sansa}
-\edef\UseOption{\UseOption,release30}
+\edef\UseOption{\UseOption,release31}
 
 \newcommand{\playerman}{Sansa}
 \newcommand{\playertype}{e200}
diff --git a/manual/platform/gigabeatf.tex b/manual/platform/gigabeatf.tex
index d75b33d80a..e8d4bd3559 100644
--- a/manual/platform/gigabeatf.tex
+++ b/manual/platform/gigabeatf.tex
@@ -7,7 +7,7 @@
 \edef\UseOption{\UseOption,HAVE_CAR_ADAPTER_MODE}
 \edef\UseOption{\UseOption,HAVE_BUTTON_LIGHTS}
 \edef\UseOption{\UseOption,gigabeat}
-\edef\UseOption{\UseOption,release30}
+\edef\UseOption{\UseOption,release31}
 
 \newcommand{\playerman}{Toshiba}
 \newcommand{\playertype}{Gigabeat F Series}
diff --git a/manual/platform/h10.tex b/manual/platform/h10.tex
index bd7faf6a97..96e37df2c1 100644
--- a/manual/platform/h10.tex
+++ b/manual/platform/h10.tex
@@ -6,7 +6,7 @@
 \edef\UseOption{\UseOption,HAVE_DISK_STORAGE}
 \edef\UseOption{\UseOption,HAVE_CAR_ADAPTER_MODE}
 \edef\UseOption{\UseOption,iriver}
-\edef\UseOption{\UseOption,release30}
+\edef\UseOption{\UseOption,release31}
 
 \newcommand{\playerman}{Iriver}
 \newcommand{\playertype}{H10}
diff --git a/manual/platform/h100.tex b/manual/platform/h100.tex
index 61166e64ab..c4de62fbcc 100644
--- a/manual/platform/h100.tex
+++ b/manual/platform/h100.tex
@@ -7,7 +7,7 @@
 \edef\UseOption{\UseOption,HAVE_DISK_STORAGE}
 \edef\UseOption{\UseOption,HAVE_CAR_ADAPTER_MODE}
 \edef\UseOption{\UseOption,iriver}
-\edef\UseOption{\UseOption,release30}
+\edef\UseOption{\UseOption,release31}
 
 \newcommand{\playerman}{Iriver}
 \newcommand{\playertype}{H100}
diff --git a/manual/platform/h10_5gb.tex b/manual/platform/h10_5gb.tex
index aa823c5616..12bf8d7daf 100644
--- a/manual/platform/h10_5gb.tex
+++ b/manual/platform/h10_5gb.tex
@@ -6,7 +6,7 @@
 \edef\UseOption{\UseOption,HAVE_DISK_STORAGE}
 \edef\UseOption{\UseOption,HAVE_CAR_ADAPTER_MODE}
 \edef\UseOption{\UseOption,iriver}
-\edef\UseOption{\UseOption,release30}
+\edef\UseOption{\UseOption,release31}
 
 \newcommand{\playerman}{Iriver}
 \newcommand{\playertype}{H10}
diff --git a/manual/platform/h300.tex b/manual/platform/h300.tex
index 812a4391ff..07cc0948ad 100644
--- a/manual/platform/h300.tex
+++ b/manual/platform/h300.tex
@@ -7,7 +7,7 @@
 \edef\UseOption{\UseOption,HAVE_CAR_ADAPTER_MODE}
 \edef\UseOption{\UseOption,HAVE_DISK_STORAGE}
 \edef\UseOption{\UseOption,iriver}
-\edef\UseOption{\UseOption,release30}
+\edef\UseOption{\UseOption,release31}
 
 \newcommand{\playerman}{Iriver}
 \newcommand{\playertype}{H3xx}
diff --git a/manual/platform/ipod1g2g.tex b/manual/platform/ipod1g2g.tex
index 6a52c5fc05..fd7124b445 100644
--- a/manual/platform/ipod1g2g.tex
+++ b/manual/platform/ipod1g2g.tex
@@ -5,7 +5,7 @@
 \edef\UseOption{\UseOption,HAVE_BACKLIGHT}
 \edef\UseOption{\UseOption,HAVE_DISK_STORAGE}
 \edef\UseOption{\UseOption,ipod}
-\edef\UseOption{\UseOption,release30}
+\edef\UseOption{\UseOption,release31}
 
 \newcommand{\playerman}{Ipod}
 \newcommand{\playertype}{1G / 2G}
diff --git a/manual/platform/ipod3g.tex b/manual/platform/ipod3g.tex
index f79139e661..d17ba133a3 100644
--- a/manual/platform/ipod3g.tex
+++ b/manual/platform/ipod3g.tex
@@ -5,7 +5,7 @@
 \edef\UseOption{\UseOption,HAVE_BACKLIGHT}
 \edef\UseOption{\UseOption,HAVE_DISK_STORAGE}
 \edef\UseOption{\UseOption,ipod}
-\edef\UseOption{\UseOption,release30}
+\edef\UseOption{\UseOption,release31}
 
 \newcommand{\playerman}{Ipod}
 \newcommand{\playertype}{3G}
diff --git a/manual/platform/ipod4g.tex b/manual/platform/ipod4g.tex
index 47b8a8de66..6d8822fad7 100644
--- a/manual/platform/ipod4g.tex
+++ b/manual/platform/ipod4g.tex
@@ -5,7 +5,7 @@
 \edef\UseOption{\UseOption,HAVE_BACKLIGHT}
 \edef\UseOption{\UseOption,HAVE_DISK_STORAGE}
 \edef\UseOption{\UseOption,ipod}
-\edef\UseOption{\UseOption,release30}
+\edef\UseOption{\UseOption,release31}
 
 \newcommand{\playerman}{Ipod}
 \newcommand{\playertype}{4G}
diff --git a/manual/platform/ipodcolor.tex b/manual/platform/ipodcolor.tex
index aee1ac9e70..88a9c1aa0f 100644
--- a/manual/platform/ipodcolor.tex
+++ b/manual/platform/ipodcolor.tex
@@ -5,7 +5,7 @@
 \edef\UseOption{\UseOption,HAVE_BACKLIGHT}
 \edef\UseOption{\UseOption,HAVE_DISK_STORAGE}
 \edef\UseOption{\UseOption,ipod}
-\edef\UseOption{\UseOption,release30}
+\edef\UseOption{\UseOption,release31}
 
 \newcommand{\playerman}{Ipod}
 \newcommand{\playertype}{Color}
diff --git a/manual/platform/ipodmini.tex b/manual/platform/ipodmini.tex
index 9a480d2237..7ab82370b6 100644
--- a/manual/platform/ipodmini.tex
+++ b/manual/platform/ipodmini.tex
@@ -5,7 +5,7 @@
 \edef\UseOption{\UseOption,HAVE_BACKLIGHT}
 \edef\UseOption{\UseOption,HAVE_DISK_STORAGE}
 \edef\UseOption{\UseOption,ipod}
-\edef\UseOption{\UseOption,release30}
+\edef\UseOption{\UseOption,release31}
 
 \newcommand{\playerman}{Ipod}
 \newcommand{\playertype}{Mini}
diff --git a/manual/platform/ipodnano.tex b/manual/platform/ipodnano.tex
index d4ee44e81a..92b2466e3f 100644
--- a/manual/platform/ipodnano.tex
+++ b/manual/platform/ipodnano.tex
@@ -4,7 +4,7 @@
 \edef\UseOption{\UseOption,IPOD_4G_PAD}
 \edef\UseOption{\UseOption,HAVE_BACKLIGHT}
 \edef\UseOption{\UseOption,ipod}
-\edef\UseOption{\UseOption,release30}
+\edef\UseOption{\UseOption,release31}
 
 \newcommand{\playerman}{Ipod}
 \newcommand{\playertype}{Nano}
diff --git a/manual/platform/ipodvideo.tex b/manual/platform/ipodvideo.tex
index 4e26374261..8902053b19 100644
--- a/manual/platform/ipodvideo.tex
+++ b/manual/platform/ipodvideo.tex
@@ -6,7 +6,7 @@
 \edef\UseOption{\UseOption,HAVE_DISK_STORAGE}
 \edef\UseOption{\UseOption,HAVE_CAR_ADAPTER_MODE}
 \edef\UseOption{\UseOption,ipod}
-\edef\UseOption{\UseOption,release30}
+\edef\UseOption{\UseOption,release31}
 
 \newcommand{\playerman}{Ipod}
 \newcommand{\playertype}{Video}
diff --git a/manual/platform/m5.tex b/manual/platform/m5.tex
index 83ca27c958..c3ae79aba0 100644
--- a/manual/platform/m5.tex
+++ b/manual/platform/m5.tex
@@ -7,7 +7,7 @@
 \edef\UseOption{\UseOption,HAVE_DISK_STORAGE}
 \edef\UseOption{\UseOption,HAVE_CAR_ADAPTER_MODE}
 \edef\UseOption{\UseOption,iaudio}
-\edef\UseOption{\UseOption,release30}
+\edef\UseOption{\UseOption,release31}
 
 \newcommand{\playerman}{Iaudio}
 \newcommand{\playertype}{M5}
diff --git a/manual/platform/mrobe100.tex b/manual/platform/mrobe100.tex
index 17e00f46b1..0b0a7e3899 100644
--- a/manual/platform/mrobe100.tex
+++ b/manual/platform/mrobe100.tex
@@ -6,7 +6,7 @@
 \edef\UseOption{\UseOption,HAVE_DISK_STORAGE}
 \edef\UseOption{\UseOption,HAVE_BUTTON_LIGHTS}
 \edef\UseOption{\UseOption,olympus}
-\edef\UseOption{\UseOption,release30}
+\edef\UseOption{\UseOption,release31}
 
 \newcommand{\playerman}{Olympus}
 \newcommand{\playertype}{m:robe 100}
diff --git a/manual/platform/ondiofm.tex b/manual/platform/ondiofm.tex
index 57dfda7419..6532e2e5c0 100644
--- a/manual/platform/ondiofm.tex
+++ b/manual/platform/ondiofm.tex
@@ -6,7 +6,7 @@
 \edef\UseOption{\UseOption,MASCODEC}
 \edef\UseOption{\UseOption,ONDIO_PAD}
 \edef\UseOption{\UseOption,archos}
-\edef\UseOption{\UseOption,release30}
+\edef\UseOption{\UseOption,release31}
 
 \newcommand{\playerman}{Archos}
 \newcommand{\playertype}{Ondio}
diff --git a/manual/platform/ondiosp.tex b/manual/platform/ondiosp.tex
index 9621f644c5..afe52077b9 100644
--- a/manual/platform/ondiosp.tex
+++ b/manual/platform/ondiosp.tex
@@ -6,7 +6,7 @@
 \edef\UseOption{\UseOption,ONDIO_PAD}
 \edef\UseOption{\UseOption,archos}
 \edef\UseOption{\UseOption,rombox}
-\edef\UseOption{\UseOption,release30}
+\edef\UseOption{\UseOption,release31}
 
 \newcommand{\playerman}{Archos}
 \newcommand{\playertype}{Ondio}
diff --git a/manual/platform/player.tex b/manual/platform/player.tex
index c2adac231f..d8e89adbf8 100644
--- a/manual/platform/player.tex
+++ b/manual/platform/player.tex
@@ -7,7 +7,7 @@
 \edef\UseOption{\UseOption,HAVE_CAR_ADAPTER_MODE}
 \edef\UseOption{\UseOption,archos}
 \edef\UseOption{\UseOption,rombox}
-\edef\UseOption{\UseOption,release30}
+\edef\UseOption{\UseOption,release31}
 
 \newcommand{\playerman}{Archos}
 \newcommand{\playertype}{Studio/Player}
diff --git a/manual/platform/recorder.tex b/manual/platform/recorder.tex
index cde7ffa0a7..4f0296ea76 100644
--- a/manual/platform/recorder.tex
+++ b/manual/platform/recorder.tex
@@ -6,7 +6,7 @@
 \edef\UseOption{\UseOption,HAVE_DISK_STORAGE}
 \edef\UseOption{\UseOption,HAVE_CAR_ADAPTER_MODE}
 \edef\UseOption{\UseOption,archos}
-\edef\UseOption{\UseOption,release30}
+\edef\UseOption{\UseOption,release31}
 
 \newcommand{\playerman}{Archos}
 \newcommand{\playertype}{Recorder}
diff --git a/manual/platform/recorderv2fm.tex b/manual/platform/recorderv2fm.tex
index 429440858d..48cbf2e48e 100644
--- a/manual/platform/recorderv2fm.tex
+++ b/manual/platform/recorderv2fm.tex
@@ -6,7 +6,7 @@
 \edef\UseOption{\UseOption,HAVE_DISK_STORAGE}
 \edef\UseOption{\UseOption,HAVE_CAR_ADAPTER_MODE}
 \edef\UseOption{\UseOption,archos}
-\edef\UseOption{\UseOption,release30}
+\edef\UseOption{\UseOption,release31}
 
 \newcommand{\playerman}{Archos}
 \newcommand{\playertype}{Recorder V2/FM}
diff --git a/manual/platform/x5.tex b/manual/platform/x5.tex
index 3723e1bfcc..220583aa89 100644
--- a/manual/platform/x5.tex
+++ b/manual/platform/x5.tex
@@ -7,7 +7,7 @@
 \edef\UseOption{\UseOption,HAVE_DISK_STORAGE}
 \edef\UseOption{\UseOption,HAVE_CAR_ADAPTER_MODE}
 \edef\UseOption{\UseOption,iaudio}
-\edef\UseOption{\UseOption,release30}
+\edef\UseOption{\UseOption,release31}
 
 \newcommand{\playerman}{Iaudio}
 \newcommand{\playertype}{X5}