Fixes and corrections. Adds keymaps for ipods for the wps key table, virtual keyboard, sudoku (x5 as well). (Patches #5320, #5308, #5324. All from Mark Bright)

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

4 files changed, 185 insertions, 173 deletions

diff --git a/manual/appendix/config_file_options.tex b/manual/appendix/config_file_options.tex
index 71bd9c345c..2e11c792cc 100644
--- a/manual/appendix/config_file_options.tex
+++ b/manual/appendix/config_file_options.tex
@@ -2,109 +2,109 @@
 \begin{center}
   \begin{longtable}{@{}lll@{}}\toprule
     \textbf{Setting} & \textbf{Allowed Values} & \textbf{Unit}\\\midrule
-    volume & 0 to 100 & \%\\
-    bass & -15 to +15 & dB\\
-    treble & -15 to +15 &dB\\
-    balance & -100 to +100 & \%\\
-    channels & stereo, stereo narrow, & n/a\\
-             & stereo wide, & \\
-             & mono, mono left, & \\ 
-             & mono right, karaoke & \\
-    shuffle & on, off & N/A\\
-    repeat & off, all, one & N/A\\
-    play selected & on, off & N/A\\
-    resume & off, ask, ask once, on & N/A\\
-    scan min step & 1, 2, 3, 4, 5, 6, 8, 10, 15, & seconds\\
-                  & 20, 25, 30, 45, 60 &\\
-    scan accel & 0 to 15 & seconds\\
-    antiskip & 0 to 7 & seconds\\
-    volume fade & on, off & N/A\\
-    id3 tag priority & v2-v1, v1-v2 & N/A\\
-    sort case & on, off & N/A\\
-    show files & all, supported, music, playlists & N/A\\
-    follow playlist & on, off & N/A\\
-    playlist viewer icons & off,on & N/A\\
-    playlist viewer indices & off,on & N/A\\
-    playlist viewer track display & track name,full path & N/A\\
-    recursive directory insert & off,on & N/A\\
-    scroll speed & 1 to 25 & Hz\\
-    scroll delay & 0 to 250 & 1/10s\\
-    scroll step & 1 to 112 & pixels\\
-    bidir limit & 0 to 200 & \% of \\
-                &          & screen width\\
-    contrast & 0 to 63 & N/A\\
-    backlight timeout & off, on, 1, 2, 3, 4, 5, & seconds\\
-                      & 6, 7, 8, 9, 10, 15, 20, & \\
-                      & 25, 30, 45, 60, 90 & \\
-    backlight when plugged & on, off & N/A\\
-    disk spindown & 3 to 254 & seconds\\
-    battery capacity & 1500 - 3200 & mAh\\
-    idle poweroff & off, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, & minutes\\
-                  & 15, 30, 45, 60 & \\
-    lang & /path/filename.lng & N/A\\
-    wps & /path/filename.wps & N/A\\
-    autocreate bookmarks & off,on & N/A\\
-    autoload bookmarks & off,on & N/A\\
-    use most-recent-bookmarks & off,on & N/A\\
-    talk dir & off,number,spell,enter.hover & N/A\\
-    talk file & off,number,spell & N/A\\
-    talk menu & off,on & N/A\\
+    \config{volume} & \config{0} to \config{100} & \%\\
+    \config{bass} & \config{-15} to \config{+15} & dB\\
+    \config{treble} & \config{-15} to \config{+15} &dB\\
+    \config{balance} & \config{-100} to \config{+100} & \%\\
+    \config{channels} & \config{stereo, stereo narrow,} & n/a\\
+             & \config{stereo wide,} & \\
+             & \config{mono, mono left,} & \\ 
+             & \config{mono right, karaoke} & \\
+    \config{shuffle} & \config{on}, \config{off} & N/A\\
+    \config{repeat} & \config{off, all, one} & N/A\\
+    \config{play selected} & \config{on, off} & N/A\\
+    \config{resume} & \config{off, ask, ask once, on} & N/A\\
+    \config{scan min step} & \config{1, 2, 3, 4, 5, 6, 8, 10, 15,} & seconds\\
+                  & \config{20, 25, 30, 45, 60} &\\
+    \config{scan accel} & \config{0} to \config{15} & seconds\\
+    \config{antiskip} & \config{0} to \config{7} & seconds\\
+    \config{volume fade} & \config{on, off} & N/A\\
+    \config{id3 tag priority} & \config{v2-v1, v1-v2} & N/A\\
+    \config{sort case} & \config{on, off} & N/A\\
+    \config{show files} & \config{all, supported, music, playlists} & N/A\\
+    \config{follow playlist} & \config{on, off} & N/A\\
+    \config{playlist viewer icons} & \config{off,on} & N/A\\
+    \config{playlist viewer indices} & \config{off,on} & N/A\\
+    \config{playlist viewer track display} & \config{track name,full path} & N/A\\
+    \config{recursive directory insert} & \config{off,on} & N/A\\
+    \config{scroll speed} & \config{1} to \config{25} & Hz\\
+    \config{scroll delay} & \config{0} to \config{250} & 1/10s\\
+    \config{scroll step} & \config{1} to \config{112} & pixels\\
+    \config{bidir limit} & \config{0} to \config{200} & \% of \\
+                         &          & screen width\\
+    \config{contrast} & \config{0} to \config{63} & N/A\\
+    \config{backlight timeout} & \config{off, on, 1, 2, 3, 4, 5,} & seconds\\
+                      & \config{6, 7, 8, 9, 10, 15, 20,} & \\
+                      & \config{25, 30, 45, 60, 90} & \\
+    \config{backlight when plugged} & \config{on, off} & N/A\\
+    \config{disk spindown} & \config{3} to \config{254} & seconds\\
+    \config{battery capacity} & \config{1500} to \config{3200} & mAh\\
+    \config{idle poweroff} & \config{off, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10,} & minutes\\
+                  & \config{15, 30, 45, 60} & \\
+    \config{lang} & \config{/path/filename.lng} & N/A\\
+    \config{wps} & \config{/path/filename.wps} & N/A\\
+    \config{autocreate bookmarks} & \config{off,on} & N/A\\
+    \config{autoload bookmarks} & \config{off,on} & N/A\\
+    \config{use most-recent-bookmarks} & \config{off,on} & N/A\\
+    \config{talk dir} & \config{off,number,spell,enter,hover} & N/A\\
+    \config{talk file} & \config{off,number,spel}l & N/A\\
+    \config{talk menu} & \config{off,on} & N/A\\
 
     \opt{recorder,recorderv2fm}{
-      loudness & 0 to 17 & N/A\\
-      super bass & on,off & N/A\\
-      auto volume & off, 20ms, 2s, 4s, 8s & seconds\\
-      MDB enable & on,off & N/A\\
-      MDB strength & 0 to 127 & dB\\
-      MDB harmonics & 0 to 100 & \%\\
-      MDB center frequency & 20 to 300 & Hz\\
-      MDB shape & 50 to 300 & Hz\\
-      deep discharge & on, off & N/A\\
-      trickle charge & on, off & N/A\\
+      \config{loudness} & \config{0} to \config{17} & N/A\\
+      \config{super bass} & \config{on,off} & N/A\\
+      \config{auto volume} & \config{off, 20ms, 2s, 4s, 8s} & seconds\\
+      \config{MDB enable} & \config{on,off} & N/A\\
+      \config{MDB strength} & \config{0} to \config{127} & dB\\
+      \config{MDB harmonics} & \config{0} to \config{100} & \%\\
+      \config{MDB center frequency} & \config{20} to \config{300} & Hz\\
+      \config{MDB shape} & \config{50} to \config{300} & Hz\\
+      \config{deep discharge} & \config{on, off} & N/A\\
+      \config{trickle charge} & \config{on, off} & N/A\\
     }
 
     \opt{HAVE_LCD_BITMAP}{
-      peak meter release & 1 to 126 & ?\\
-      peak meter hold & off, 200ms, 300ms, 500ms, & N/A \\
-                     & 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 15, &\\ 
-                     & 20, 30, 1min & \\
-      peak meter clip hold & on, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10,& N/A \\
-                           & 15, 20, 25, 30, 45, 60, 90, 2min, &\\
-                           & 3min, 5min, 10min, 20min, &\\
-                           & 45min, 90min & \\
-      peak meter busy & on, off & N/A\\
-      peak meter dbfs & on, off & on = dbfs,\\
+      \config{peak meter release} & \config{1} to \config{126} & ?\\
+      \config{peak meter hold} & \config{off, 200ms, 300ms, 500ms,} & N/A \\
+                     & \config{1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 15,} &\\ 
+                     & \config{20, 30, 1min} & \\
+      \config{peak meter clip hold} & \config{on, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10,} & N/A \\
+                           & \config{15, 20, 25, 30, 45, 60, 90, 2min,} &\\
+                           & \config{3min, 5min, 10min, 20min,} &\\
+                           & \config{45min, 90min} & \\
+      \config{peak meter busy} & \config{on, off} & N/A\\
+      \config{peak meter dbfs} & \config{on, off} & on = dbfs,\\
                       &         & off = linear\\
-      peak meter min  & 0 to 89 (dB) or 0 to 100 (\%) & dB or \%\\
-      peak meter max  & 0 to 89 /(dB) or 0 to 100 (\%) & dB or \%\\
-      statusbar & on, off & N/A\\
-      scrollbar & on, off & N/A\\
-      volume display & graphic, numeric & N/A\\
-      battery display & graphic, numeric & N/A\\
-      font & /path/filename.fnt & N/A\\
-      invert & on, off & N/A\\
-      disk poweroff & on, off & N/A\\
+      \config{peak meter min}  & \config{0dB} to \config{89dB} or \config{0\%} to \config{\%100} (\%) & dB or \%\\
+      \config{peak meter max}  & \config{0dB} to \config{89dB} or \config{0\%} to \config{100\%} (\%) & dB or \%\\
+      \config{statusbar} & \config{on, off} & N/A\\
+      \config{scrollbar} & \config{on, off} & N/A\\
+      \config{volume display} & \config{graphic, numeric} & N/A\\
+      \config{battery display} & \config{graphic, numeric} & N/A\\
+      \config{font} & \config{/path/filename.fnt} & N/A\\
+      \config{invert} & \config{on, off} & N/A\\
+      \config{disk poweroff} & \config{on, off} & N/A\\
     }
     \opt{CONFIG_RTC}{
-      time format & 12hour, 24hour & N/A\\      
+      time format & \config{12hour, 24hour} & N/A\\      
     }
     \opt{HAVE_RECORDING}{
-     rec quality & 0 to 7 & 0=smallest size,\\
+     \config{rec quality} & \config{0} to \config{7} & 0=smallest size,\\
                  &        & 7=highest quality\\
-     rec frequency & 48, 44, 32, 24, 22, 16 & kHz\\
-     rec source & mic, line, spdif & N/A\\
-     rec channels & mono, stereo & N/A\\
-     rec mic gain & 0 to 15 & N/A\\
-     rec left gain & 0 to 15 & N/A\\
-     rec right gain & 0 to 15 & N/A\\
-     editable recordings & off,on & N/A\\
-     rec timesplit & off, 0:05, 0:10, 0:15, 0:30, 1:00, & h:mm\\
-                   & 2:00, 4:00, 6:00, 8:00, 16:00, 24:00 & \\
-     pre-recording time & off, 1 to 30 & s\\
-     rec directory & /recordings,current & N/A\\
+     \config{rec frequency} & \config{48, 44, 32, 24, 22, 16} & kHz\\
+     \config{rec source} & \config{mic, line, spdif} & N/A\\
+     \config{rec channels} & \config{mono, stereo} & N/A\\
+     \config{rec mic gain} & \config{0 to 15} & N/A\\
+     \config{rec left gain} & \config{0 to 15} & N/A\\
+     \config{rec right gain} & \config{0 to 15} & N/A\\
+     \config{editable recordings} & \config{off,on} & N/A\\
+     \config{rec timesplit} & \config{off, 0:05, 0:10, 0:15, 0:30, 1:00,} & h:mm\\
+                   & \config{2:00, 4:00, 6:00, 8:00, 16:00, 24:00} & \\
+     \config{pre-recording time} & \config{off}, \config{1} to \config{30} & s\\
+     \config{rec directory} & \config{/recordings,current} & N/A\\
     }
     \opt{CONFIG_TUNER}{
-      Force FM mono & off,on & N/A\\
+      \config{Force FM mono} & \config{off,on} & N/A\\
     }
     \bottomrule
   \end{longtable}
diff --git a/manual/plugins/sudoku.tex b/manual/plugins/sudoku.tex
index 5cbdebde59..42085dcc36 100644
--- a/manual/plugins/sudoku.tex
+++ b/manual/plugins/sudoku.tex
@@ -2,9 +2,9 @@
 \screenshot{plugins/images/ss-sudoku}{Sudoku}{fig:sudoku}
 To play Sudoku you need sudoku games stored as .ss files (see links below).
 Once you have your .ss file just open it in the normal file browser to start playing.
-You can create and save your own grids under the "New" menu option.
+You can create and save your own grids under the \setting{New} menu option.
 Press the menu button when you have finished and enter the full path
-to save to including the .ss extension (e.g. /sudoku/new.ss).
+to save to including the .ss extension (e.g. \fname{/sudoku/new.ss}).
 
 \textbf{The thing on the left (AKA the scratchpad)}\\
 When you play sudoku on paper most people like to mark numbers in
@@ -13,25 +13,39 @@ This can be done with the column on the left. Change the number
 under the cursor to a number which might be valid and press the scratchpad
 button, the number will then be added on the left.
 The column is stored seperatly for every cell on the board.
-These are \textbf{NOT} saved when saving the game.
+These are \emph{NOT} saved when saving the game.
 
 \begin{table}
     \begin{btnmap}{}{}
-    Direction keys & Move the cursor\\
-    \opt{recorder,recorderv2fm}{PLAY}
-    \opt{ondio}{MODE (increment once) / MODE+DOWN (toggle repeat)}
-    \opt{h1xx}{SELECT / PLAY}\opt{h300}{NAVI / PLAY}
-    \opt{ipodcolor}{SELECT} 
-    & Increment  number under the cursor\\
-    \opt{recorder,recorderv2fm}{F1}\opt{ondio}{Long press on MODE}\opt{h1xx,h300}{A-B}
-    \opt{ipodcolor}{MENU} 
+
+    \opt{RECORDER_PAD,ONDIO_PAD,h1xx,h300,x5}{Direction keys}
+    \opt{IPOD_4G_PAD}{\ButtonScrollFwd/\ButtonScrollBack} 
+    & Move the cursor\\
+    %
+    \opt{RECORDER_PAD}{\ButtonPlay}
+    \opt{ONDIO_PAD}{\ButtonMenu}
+    \opt{h1xx,h300}{\ButtonSelect/\ButtonOn}
+    \opt{IPOD_4G_PAD}{\ButtonLeft/\ButtonRight} 
+    & Change number under the cursor\\
+    %
+    \opt{RECORDER_PAD}{\ButtonFOne}
+    \opt{ONDIO_PAD}{Long press on \ButtonMenu}
+    \opt{h1xx,h300}{\ButtonMode}
+    \opt{IPOD_4G_PAD}{\ButtonMenu}
+    \opt{x5}{\ButtonPlay} 
     & Open Menu\\
-    \opt{recorder,recorderv2fm}{F2}\opt{ondio}{MODE+LEFT}
-    \opt{h1xx,h300}{RECORD}\opt{ipodcolor}{SELECT+LEFT} 
-    & Add / remove number to scratchpad\\
-    \opt{recorder,recorderv2fm,h1xx,h300}{STOP}\opt{ondio}{OFF}
-    \opt{ipodcolor,ipodnano}{SELECT} 
+    %
+    \opt{RECORDER_PAD}{\ButtonFTwo}
+    \opt{ONDIO_PAD}{\ButtonMenu+\ButtonLeft}
+    \opt{h1xx,h300,x5}{\ButtonRec}
+    \opt{IPOD_4G_PAD}{\ButtonPlay} 
+    & Add/Remove number to scratchpad\\
+    %
+    \opt{RECORDER_PAD,ONDIO_PAD,h1xx,h300}{\ButtonOff}
+    \opt{x5}{\ButtonPower}
+    \opt{IPOD_4G_PAD}{Menu $\rightarrow$ Quit}
     & Quit\\
+    %
     \end{btnmap}
 \end{table}
 
diff --git a/manual/rockbox_interface/main.tex b/manual/rockbox_interface/main.tex
index 2dea78089d..45f4e1afd5 100644
--- a/manual/rockbox_interface/main.tex
+++ b/manual/rockbox_interface/main.tex
@@ -234,51 +234,44 @@ shutdown.
 \screenshot{rockbox_interface/images/ss-virtual-keyboard}{The virtual keyboard}{}
 This is the virtual keyboard that is used when entering file names in Rockbox.
 
-\opt{IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD,RECORDER_PAD,IPOD_4G_PAD}{
+\opt{IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD,RECORDER_PAD}{
     \begin{table}
     \begin{btnmap}{}{}
       \opt{IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD,RECORDER_PAD}
-        {\ButtonUp/\ButtonDown/\ButtonLeft/\ButtonRight}
-      \opt{IPOD_4G_PAD}{Please add correct keys}
+        {\ButtonUp/\ButtonDown\\ButtonLeft/\ButtonRight}
       & Move about the virtual keyboard (moves the solid cursor) \\
       %
       \opt{IRIVER_H100_PAD,IRIVER_H300_PAD,RECORDER_PAD}
         {\ButtonOn+\ButtonLeft/\ButtonRight}
-      \opt{IPOD_4G_PAD}{Please add correct keys}
       \opt{IAUDIO_X5_PAD}{Please add correct keys} 
       & Move about within the current file name (moves the line cursor) \\
       %
       \opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonSelect}
       \opt{RECORDER_PAD}{\ButtonPlay}
-      \opt{IPOD_4G_PAD}{Please add correct keys}
       \opt{IAUDIO_X5_PAD}{Please add correct keys} 
       & Inserts the currently selected keyboard letter at the current
         filename cursor position \\
       %
       \opt{IRIVER_H100_PAD,IRIVER_H300_PAD,RECORDER_PAD}{\ButtonOff}
-      \opt{IPOD_4G_PAD}{Please add correct keys}
       \opt{IAUDIO_X5_PAD}{Please add correct keys} 
       & Exits the virtual keyboard without saving any changes \\
       %
-      \opt{IRIVER_H100_PAD,IRIVER_H300_PAD,IPOD_4G_PAD,IAUDIO_X5_PAD}{n/a}
+      \opt{IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD}{n/a}
       \opt{RECORDER_PAD}{\ButtonFOne}
       & SHIFT: Shifts between the upper case, lower case and accented keyboards \\
       %
       \opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonOn}
       \opt{RECORDER_PAD}{\ButtonFTwo}
-      \opt{IPOD_4G_PAD}{Please add correct keys}
       \opt{IAUDIO_X5_PAD}{Please add correct keys} 
-      & OK: Exits the virtual keyboard and saves any changer \\
+      & OK: Exits the virtual keyboard and saves any changes \\
       %
       \opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonRec}
       \opt{RECORDER_PAD}{\ButtonFThree}
-      \opt{IPOD_4G_PAD}{Please add correct keys}
       \opt{IAUDIO_X5_PAD}{Please add correct keys} 
       & DEL: Deletes the character before the current filename cursor \\
       %
       \opt{SWCODEC}{
         \opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonMode}
-        \opt{IPOD_4G_PAD}{Please add correct keys}
         \opt{IAUDIO_X5_PAD}{Please add correct keys} 
         & Enters Morse input mode\\
       }
@@ -286,6 +279,32 @@ This is the virtual keyboard that is used when entering file names in Rockbox.
   \end{table}
 }
 
+\opt{IPOD_4G_PAD}{
+  \textbf{Picker area}
+  \begin{table}
+    \begin{btnmap}{}{}
+      \ButtonScrollFwd/\ButtonScrollBack & Move about the virtual keyboard \\
+      \ButtonLeft/\ButtonRight           & (moves the solid cursor).
+          If you move out of the picker area with \ButtonScrollFwd/\ButtonScrollBack,
+          you get to the line edit mode. \\
+      \ButtonSelect 
+        & Inserts the currently selected keyboard letter at the current
+          filename cursor position \\
+      Hold \ButtonSelect
+        & OK: Exits the virtual keyboard and saves any changes \\
+      \ButtonMenu
+        & Exits the virtual keyboard without saving any changes\\
+    \end{btnmap}
+  \end{table}
+  \textbf{Line edit mode}
+  \begin{table}
+    \begin{btnmap}{}{}
+      \ButtonLeft/\ButtonRight & Move left and right\\
+      \ButtonSelect & Deletes the letter to the left of the cursor\\
+      \ButtonScrollFwd/\ButtonScrollBack & Returns to the picker area\\
+    \end{btnmap}
+  \end{table}
+}
 \opt{ondio}{
   \textbf{Picker area}
   \begin{table}
@@ -311,8 +330,7 @@ This is the virtual keyboard that is used when entering file names in Rockbox.
       \ButtonUp/\ButtonDown & Returns to the picker area\\
     \end{btnmap}
   \end{table}
-}
-\opt{player}{
+}\opt{player}{
   The current filename is always listed on the first line of the display. The
   second line of the display can contain the character selection bar, as in the
   screenshot above, or  one of a number of other options.
diff --git a/manual/rockbox_interface/wps.tex b/manual/rockbox_interface/wps.tex
index fb06ea0972..7c0092fa6b 100644
--- a/manual/rockbox_interface/wps.tex
+++ b/manual/rockbox_interface/wps.tex
@@ -51,66 +51,54 @@ your WPS (While Playing Screen).
 \begin{table}
   \begin{btnmap}{}{}
       \opt{IRIVER_H100_PAD,IRIVER_H300_PAD,RECORDER_PAD,ONDIO_PAD}{\ButtonUp/\ButtonDown}
-      \opt{IAUDIO_X5_PAD}{Please add correct keys}
-      \opt{IPOD_4G_PAD}{Please add correct keys}
+      \opt{IAUDIO_X5_PAD}{\fixme{Please add correct keys}}
+      \opt{IPOD_4G_PAD}{\ButtonScrollFwd/\ButtonScrollBack}
       \opt{PLAYER_PAD}{\ButtonMenu+\ButtonRight/\ButtonLeft} 
       & Volume up/down \\
       %
-      \opt{IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD,ONDIO_PAD,RECORDER_PAD,PLAYER_PAD}{\ButtonLeft}
-      \opt{IPOD_4G_PAD}{Please add correct keys} 
+      \opt{IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD,ONDIO_PAD,RECORDER_PAD,PLAYER_PAD,IPOD_4G_PAD}{\ButtonLeft}
       & Go to beginning of track, or if pressed while in the first seconds of a track,
         go to previous track. \\
       %
-      \opt{IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD,ONDIO_PAD,RECORDER_PAD,PLAYER_PAD}{Hold \ButtonLeft}
-      \opt{IPOD_4G_PAD}{Please add correct keys} 
+      \opt{IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD,ONDIO_PAD,RECORDER_PAD,PLAYER_PAD,IPOD_4G_PAD}{Hold \ButtonLeft}
       & Rewind in track \\
       %
-      \opt{IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD,ONDIO_PAD,RECORDER_PAD,PLAYER_PAD}{\ButtonRight}
-      \opt{IPOD_4G_PAD}{Please add correct keys} 
+      \opt{IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD,ONDIO_PAD,RECORDER_PAD,PLAYER_PAD,IPOD_4G_PAD}{\ButtonRight}
       & Go to next track. \\
       %
-      \opt{IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD,ONDIO_PAD,RECORDER_PAD,PLAYER_PAD}{Hold \ButtonRight}
-      \opt{IPOD_4G_PAD}{Please add correct keys} 
+      \opt{IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD,ONDIO_PAD,RECORDER_PAD,PLAYER_PAD,IPOD_4G_PAD}{Hold \ButtonRight}
       & Fast forward in track. \\
       %
       \opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonOn}
-      \opt{IPOD_4G_PAD,IAUDIO_X5_PAD,RECORDER_PAD,PLAYER_PAD}{\ButtonPlay}
-      \opt{ONDIO_PAD}{\ButtonOff} 
+      \opt{IPOD_4G_PAD,IAUDIO_X5_PAD,RECORDER_PAD,PLAYER_PAD,IPOD_4G_PAD}{\ButtonPlay}
       & Toggle play/pause \\
       %
-      \opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonSelect}
+      \opt{IRIVER_H100_PAD,IRIVER_H300_PAD,IPOD_4G_PAD}{\ButtonSelect}
       \opt{ONDIO_PAD}{\ButtonMenu}
       \opt{RECORDER_PAD,PLAYER_PAD}{\ButtonOn}
-      \opt{IAUDIO_X5_PAD}{Please add correct keys}
-      \opt{IPOD_4G_PAD}{Please add correct keys} 
       & Go to file browser \\
       %
-      \opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{Hold \ButtonSelect}
+      \opt{IRIVER_H100_PAD,IRIVER_H300_PAD,IPOD_4G_PAD}{Hold \ButtonSelect}
       \opt{ONDIO_PAD}{Hold \ButtonMenu}
       \opt{RECORDER_PAD,PLAYER_PAD}{Hold \ButtonOn}
-      \opt{IAUDIO_X5_PAD}{Please add correct keys}
-      \opt{IPOD_4G_PAD}{Please add correct keys} 
+      \opt{IAUDIO_X5_PAD}{\fixme{Please add correct keys}}
       & Enter WPS context menu \\
       %
-      \opt{RECORDER_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD}{Hold \ButtonOn}
-      \opt{IAUDIO_X5_PAD}{Please add correct keys}
-      \opt{IPOD_4G_PAD}{Please add correct keys}
-      \opt{PLAYER_PAD}{n/a}
-      \opt{ONDIO_PAD}{In WPS context menu}
-      & Show pitch setting screen \\
+      \opt{RECORDER_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD}{
+      Hold \ButtonOn
+      & Show pitch setting screen \\}
       %
       \opt{RECORDER_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonOff}
       \opt{ONDIO_PAD}{Hold \ButtonOff}
       \opt{IAUDIO_X5_PAD}{Please add correct keys}
-      \opt{IPOD_4G_PAD}{Please add correct keys}
+      \opt{IPOD_4G_PAD}{Hold \ButtonPlay}
       \opt{PLAYER_PAD}{\ButtonStop}
       & Stop playback \\
       %
       \opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonSelect}
       \opt{RECORDER_PAD}{\ButtonFOne}
-      \opt{PLAYER_PAD,ONDIO_PAD}{\ButtonMenu}
-      \opt{IAUDIO_X5_PAD}{Please add correct keys}
-      \opt{IPOD_4G_PAD}{Please add correct keys} 
+      \opt{PLAYER_PAD,ONDIO_PAD,IPOD_4G_PAD}{\ButtonMenu}
+      \opt{IAUDIO_X5_PAD}{\fixme{Please add correct keys}}
       & Go to Main menu \\
       %
       %These actions need definitions for the other targets
@@ -162,47 +150,39 @@ your WPS (While Playing Screen).
 \subsubsection{\label{sec:contextmenu}Context Menu}
 Like the context menu for the file browser this context menu allows you
 to quickly access some often used functions.
-\opt{SWCODEC}{These include the ID3 Viewer and the pitch screen.}
+\opt{h1xx,h300,RECORDER_PAD,ONDIO_PAD,IPOD_4G_PAD,x5}{
+These include the ID3 Viewer and the pitch screen.}
 
-\opt{SWCODEC}{
   \subsubsection{\label{sec:pitchscreen}Pitch Screen}
   The Pitch Screen allows you to quickly change the pitch of your \dap. The
-  pitch value can be adjusted between 50\% and 200\%. To access the pitch screen
-  just ``change'' the pitch from the WPS with
-  \opt{h1xx,h300,RECORDER_PAD,ONDIO_PAD,PLAYER_PAD}{\ButtonUp/\ButtonDown}
-  \opt{IPOD_4G_PAD,x5}{\fixme{tbd}}
-  while holding the
-  \opt{RECORDER_PAD,ONDIO_PAD,PLAYER_PAD}{\ButtonPlay}
-  \opt{h1xx,h300}{\ButtonOn}
-  \opt{IPOD_4G_PAD,x5}{\fixme{tbd}}
-  button down.
+  pitch value can be adjusted between 50\% and 200\%.
   \begin{table}
   \begin{btnmap}{}{}
-      \opt{h1xx,h300,RECORDER_PAD,ONDIO_PAD,PLAYER_PAD}{\ButtonUp/\ButtonDown}
-      \opt{IPOD_4G_PAD,x5}{\fixme{tbd}}
+      \opt{h1xx,h300,RECORDER_PAD,ONDIO_PAD,x5}{\ButtonUp/\ButtonDown}
+      \opt{IPOD_4G_PAD}{Short \ButtonScrollFwd/\ButtonScrollBack}
       & Increase / Decrease Pitch by 0.1\% \\
       %
-      hold
-      \opt{h1xx,h300,RECORDER_PAD,ONDIO_PAD,PLAYER_PAD}{\ButtonUp/\ButtonDown}
-      \opt{IPOD_4G_PAD,x5}{\fixme{tbd}}
-      & Increase / Decrease Pitch by 2.0\% \\
+      \opt{h1xx,h300,RECORDER_PAD,ONDIO_PAD,x5}{hold \ButtonUp/\ButtonDown}
+      \opt{IPOD_4G_PAD}{Long \ButtonScrollFwd/\ButtonScrollBack}
+      & Increase / Decrease Pitch by 1\% \\
       %
-      \opt{h1xx,h300,RECORDER_PAD,ONDIO_PAD,PLAYER_PAD}{\ButtonLeft/\ButtonRight}
-      \opt{IPOD_4G_PAD,x5}{\fixme{tbd}}
-      & temporarily Increase / Decrease Pitch by 2.0\% \\
+      \ButtonLeft/\ButtonRight
+      & Temporarily Increase / Decrease Pitch by 2.0\% \\
       %
-      \opt{RECORDER_PAD,ONDIO_PAD,PLAYER_PAD}{\fixme{\ButtonOn+\ButtonStop}}
-      \opt{h1xx,h300}{\ButtonOn+\ButtonOff}
-      \opt{IPOD_4G_PAD,x5}{\fixme{tbd}}
+      \opt{ONDIO_PAD,IPOD_4G_PAD}{\ButtonMenu}
+      \opt{h1xx,h300,RECORDER_PAD}{\ButtonOn}
+      \opt{x5}{\ButtonPower}
       & Reset Pitch to 100\% \\
       %
-      \opt{RECORDER_PAD,ONDIO_PAD,PLAYER_PAD}{\ButtonStop}
-      \opt{h1xx,h300}{\ButtonOff}
-      \opt{IPOD_4G_PAD,x5}{\fixme{tbd}}
+      \opt{h1xx,h300,RECORDER_PAD,ONDIO_PAD}{\ButtonOff}
+      \opt{IPOD_4G_PAD}{\ButtonSelect}
+      \opt{x5}{\ButtonPlay}
       & Leave Pitch screen \\
       %
   \end{btnmap}
   \end{table}
+  \opt{RECORDER_PAD,ONDIO_PAD}{
+  \warn{Changing the pitch can cause audible 'Artifacts' or 'Dropouts'.}
 }
 
 \subsubsection{\label{ref:ID3viewer}ID3 Viewer}