2 files changed, 65 insertions, 67 deletions
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}