14 files changed, 176 insertions, 42 deletions
diff --git a/manual/platform/h10.tex b/manual/platform/h10.tex
index 2a1fdbe4a7..35daae0b8d 100644
--- a/manual/platform/h10.tex
+++ b/manual/platform/h10.tex
@@ -61,3 +61,12 @@
 
 %Button actions, YesNo context
 \newcommand{\ActionYesNoAccept}{\ButtonRight}
+
+%Button actions, Virtual Keyboard Context
+\newcommand{\ActionKbdLeft}{\ButtonLeft}
+\newcommand{\ActionKbdRight}{\ButtonRight}
+\newcommand{\ActionKbdSelect}{\ButtonRew}
+\newcommand{\ActionKbdDone}{\ButtonPlay}
+\newcommand{\ActionKbdAbort}{\ButtonFF}
+\newcommand{\ActionKbdUp}{\ButtonScrollUp}
+\newcommand{\ActionKbdDown}{\ButtonScrollDown}
diff --git a/manual/platform/h10_5gb.tex b/manual/platform/h10_5gb.tex
index c9a06a1e1f..36fd2cec42 100644
--- a/manual/platform/h10_5gb.tex
+++ b/manual/platform/h10_5gb.tex
@@ -61,3 +61,12 @@
 
 %Button actions, YesNo context
 \newcommand{\ActionYesNoAccept}{\ButtonRight}
+
+%Button actions, Virtual Keyboard Context
+\newcommand{\ActionKbdLeft}{\ButtonLeft}
+\newcommand{\ActionKbdRight}{\ButtonRight}
+\newcommand{\ActionKbdSelect}{\ButtonRew}
+\newcommand{\ActionKbdDone}{\ButtonPlay}
+\newcommand{\ActionKbdAbort}{\ButtonFF}
+\newcommand{\ActionKbdUp}{\ButtonScrollUp}
+\newcommand{\ActionKbdDown}{\ButtonScrollDown}
diff --git a/manual/platform/h1xx.tex b/manual/platform/h1xx.tex
index a3de98ca19..ca3897e32d 100644
--- a/manual/platform/h1xx.tex
+++ b/manual/platform/h1xx.tex
@@ -63,3 +63,18 @@
 
 %Button actions, YesNo context
 \newcommand{\ActionYesNoAccept}{\ButtonSelect}
+
+%Button actions, Virtual Keyboard Context
+\newcommand{\ActionKbdLeft}{\ButtonLeft}
+\newcommand{\ActionKbdRight}{\ButtonRight}
+\newcommand{\ActionKbdSelect}{\ButtonSelect}
+\newcommand{\ActionKbdCursorLeft}{\ButtonOn{} + \ButtonLeft}
+\newcommand{\ActionKbdCursorRight}{\ButtonOn{} + \ButtonRight}
+\newcommand{\ActionKbdPageFlip}{\ButtonMode}
+\newcommand{\ActionKbdDone}{\ButtonOn}
+\newcommand{\ActionKbdAbort}{\ButtonOff}
+\newcommand{\ActionKbdBackSpace}{\ButtonRec}
+\newcommand{\ActionKbdMorseInput}{Hold \ButtonDown}
+\newcommand{\ActionKbdMorseSelect}{\ButtonSelect}
+\newcommand{\ActionKbdUp}{\ButtonUp}
+\newcommand{\ActionKbdDown}{\ButtonDown}
diff --git a/manual/platform/h300.tex b/manual/platform/h300.tex
index 1a0820551a..0edddac4a4 100644
--- a/manual/platform/h300.tex
+++ b/manual/platform/h300.tex
@@ -65,3 +65,18 @@
 
 %Button actions, YesNo context
 \newcommand{\ActionYesNoAccept}{\ButtonSelect}
+
+%Button actions, Virtual Keyboard Context
+\newcommand{\ActionKbdLeft}{\ButtonLeft}
+\newcommand{\ActionKbdRight}{\ButtonRight}
+\newcommand{\ActionKbdSelect}{\ButtonSelect}
+\newcommand{\ActionKbdCursorLeft}{\ButtonOn{} + \ButtonLeft}
+\newcommand{\ActionKbdCursorRight}{\ButtonOn{} + \ButtonRight}
+\newcommand{\ActionKbdPageFlip}{\ButtonMode}
+\newcommand{\ActionKbdDone}{\ButtonOn}
+\newcommand{\ActionKbdAbort}{\ButtonOff}
+\newcommand{\ActionKbdBackSpace}{\ButtonRec}
+\newcommand{\ActionKbdMorseInput}{Hold \ButtonDown}
+\newcommand{\ActionKbdMorseSelect}{\ButtonSelect}
+\newcommand{\ActionKbdUp}{\ButtonUp}
+\newcommand{\ActionKbdDown}{\ButtonDown}
diff --git a/manual/platform/ipod3g.tex b/manual/platform/ipod3g.tex
index 09ef4d1cb0..da1262fea8 100644
--- a/manual/platform/ipod3g.tex
+++ b/manual/platform/ipod3g.tex
@@ -56,3 +56,12 @@
 
 %Button actions, YesNo context
 \newcommand{\ActionYesNoAccept}{\ButtonPlay}
+
+%Button actions, Virtual Keyboard Context
+\newcommand{\ActionKbdLeft}{\ButtonLeft}
+\newcommand{\ActionKbdRight}{\ButtonRight}
+\newcommand{\ActionKbdSelect}{\ButtonSelect}
+\newcommand{\ActionKbdDone}{Hold \ButtonSelect}
+\newcommand{\ActionKbdAbort}{\ButtonMenu}
+\newcommand{\ActionKbdUp}{\ButtonScrollBack}
+\newcommand{\ActionKbdDown}{\ButtonScrollFwd}
diff --git a/manual/platform/ipod4g.tex b/manual/platform/ipod4g.tex
index 6712eaf3ed..87c88f68cf 100644
--- a/manual/platform/ipod4g.tex
+++ b/manual/platform/ipod4g.tex
@@ -56,3 +56,13 @@
 
 %Button actions, YesNo context
 \newcommand{\ActionYesNoAccept}{\ButtonPlay}
+
+%Button actions, Virtual Keyboard Context
+\newcommand{\ActionKbdLeft}{\ButtonLeft}
+\newcommand{\ActionKbdRight}{\ButtonRight}
+\newcommand{\ActionKbdSelect}{\ButtonSelect}
+\newcommand{\ActionKbdDone}{Hold \ButtonSelect}
+\newcommand{\ActionKbdAbort}{\ButtonMenu}
+\newcommand{\ActionKbdUp}{\ButtonScrollBack}
+\newcommand{\ActionKbdDown}{\ButtonScrollFwd}
+
diff --git a/manual/platform/ipodcolor.tex b/manual/platform/ipodcolor.tex
index dee6a38149..168c3d3c62 100644
--- a/manual/platform/ipodcolor.tex
+++ b/manual/platform/ipodcolor.tex
@@ -57,3 +57,12 @@
 
 %Button actions, YesNo context
 \newcommand{\ActionYesNoAccept}{\ButtonPlay}
+
+%Button actions, Virtual Keyboard Context
+\newcommand{\ActionKbdLeft}{\ButtonLeft}
+\newcommand{\ActionKbdRight}{\ButtonRight}
+\newcommand{\ActionKbdSelect}{\ButtonSelect}
+\newcommand{\ActionKbdDone}{Hold \ButtonSelect}
+\newcommand{\ActionKbdAbort}{\ButtonMenu}
+\newcommand{\ActionKbdUp}{\ButtonScrollBack}
+\newcommand{\ActionKbdDown}{\ButtonScrollFwd}
diff --git a/manual/platform/ipodmini.tex b/manual/platform/ipodmini.tex
index 038df0ed91..56e82c1f5e 100644
--- a/manual/platform/ipodmini.tex
+++ b/manual/platform/ipodmini.tex
@@ -56,3 +56,12 @@
 
 %Button actions, YesNo context
 \newcommand{\ActionYesNoAccept}{\ButtonPlay}
+
+%Button actions, Virtual Keyboard Context
+\newcommand{\ActionKbdLeft}{\ButtonLeft}
+\newcommand{\ActionKbdRight}{\ButtonRight}
+\newcommand{\ActionKbdSelect}{\ButtonSelect}
+\newcommand{\ActionKbdDone}{Hold \ButtonSelect}
+\newcommand{\ActionKbdAbort}{\ButtonMenu}
+\newcommand{\ActionKbdUp}{\ButtonScrollBack}
+\newcommand{\ActionKbdDown}{\ButtonScrollFwd}
diff --git a/manual/platform/ipodnano.tex b/manual/platform/ipodnano.tex
index c7e2273f88..87d040727b 100644
--- a/manual/platform/ipodnano.tex
+++ b/manual/platform/ipodnano.tex
@@ -57,3 +57,12 @@
 
 %Button actions, YesNo context
 \newcommand{\ActionYesNoAccept}{\ButtonPlay}
+
+%Button actions, Virtual Keyboard Context
+\newcommand{\ActionKbdLeft}{\ButtonLeft}
+\newcommand{\ActionKbdRight}{\ButtonRight}
+\newcommand{\ActionKbdSelect}{\ButtonSelect}
+\newcommand{\ActionKbdDone}{Hold \ButtonSelect}
+\newcommand{\ActionKbdAbort}{\ButtonMenu}
+\newcommand{\ActionKbdUp}{\ButtonScrollBack}
+\newcommand{\ActionKbdDown}{\ButtonScrollFwd}
diff --git a/manual/platform/ipodvideo.tex b/manual/platform/ipodvideo.tex
index 3224ff29ac..f885f727c7 100644
--- a/manual/platform/ipodvideo.tex
+++ b/manual/platform/ipodvideo.tex
@@ -57,3 +57,12 @@
 
 %Button actions, YesNo context
 \newcommand{\ActionYesNoAccept}{\ButtonPlay}
+
+%Button actions, Virtual Keyboard Context
+\newcommand{\ActionKbdLeft}{\ButtonLeft}
+\newcommand{\ActionKbdRight}{\ButtonRight}
+\newcommand{\ActionKbdSelect}{\ButtonSelect}
+\newcommand{\ActionKbdDone}{Hold \ButtonSelect}
+\newcommand{\ActionKbdAbort}{\ButtonMenu}
+\newcommand{\ActionKbdUp}{\ButtonScrollBack}
+\newcommand{\ActionKbdDown}{\ButtonScrollFwd}
diff --git a/manual/platform/recorder.tex b/manual/platform/recorder.tex
index f9587718d0..27058b69c4 100644
--- a/manual/platform/recorder.tex
+++ b/manual/platform/recorder.tex
@@ -60,3 +60,16 @@
 
 %Button actions, YesNo context
 \newcommand{\ActionYesNoAccept}{\ButtonPlay}
+
+%Button actions, Virtual Keyboard Context
+\newcommand{\ActionKbdLeft}{\ButtonLeft}
+\newcommand{\ActionKbdRight}{\ButtonRight}
+\newcommand{\ActionKbdSelect}{\ButtonPlay}
+\newcommand{\ActionKbdCursorLeft}{\ButtonOn{} + \ButtonLeft}
+\newcommand{\ActionKbdCursorRight}{\ButtonOn{} + \ButtonRight}
+\newcommand{\ActionKbdPageFlip}{\ButtonFOne}
+\newcommand{\ActionKbdDone}{\ButtonFTwo}
+\newcommand{\ActionKbdAbort}{\ButtonOff}
+\newcommand{\ActionKbdBackSpace}{\ButtonFThree}
+\newcommand{\ActionKbdUp}{\ButtonUp}
+\newcommand{\ActionKbdDown}{\ButtonDown}
diff --git a/manual/platform/recorderv2fm.tex b/manual/platform/recorderv2fm.tex
index 4dc71abbcd..911a062fcc 100644
--- a/manual/platform/recorderv2fm.tex
+++ b/manual/platform/recorderv2fm.tex
@@ -60,3 +60,16 @@
 
 %Button actions, YesNo context
 \newcommand{\ActionYesNoAccept}{\ButtonPlay}
+
+%Button actions, Virtual Keyboard Context
+\newcommand{\ActionKbdLeft}{\ButtonLeft}
+\newcommand{\ActionKbdRight}{\ButtonRight}
+\newcommand{\ActionKbdSelect}{\ButtonPlay}
+\newcommand{\ActionKbdCursorLeft}{\ButtonOn{} + \ButtonLeft}
+\newcommand{\ActionKbdCursorRight}{\ButtonOn{} + \ButtonRight}
+\newcommand{\ActionKbdPageFlip}{\ButtonFOne}
+\newcommand{\ActionKbdDone}{\ButtonFTwo}
+\newcommand{\ActionKbdAbort}{\ButtonOff}
+\newcommand{\ActionKbdBackSpace}{\ButtonFThree}
+\newcommand{\ActionKbdUp}{\ButtonUp}
+\newcommand{\ActionKbdDown}{\ButtonDown}
+\ No newline at end of file
diff --git a/manual/platform/x5.tex b/manual/platform/x5.tex
index 71929a6626..ce443da739 100644
--- a/manual/platform/x5.tex
+++ b/manual/platform/x5.tex
@@ -60,3 +60,12 @@
 
 %Button actions, YesNo context
 \newcommand{\ActionYesNoAccept}{\ButtonSelect}
+
+%Button actions, Virtual Keyboard Context
+\newcommand{\ActionKbdLeft}{\ButtonLeft}
+\newcommand{\ActionKbdRight}{\ButtonRight}
+\newcommand{\ActionKbdUp}{\ButtonUp}
+\newcommand{\ActionKbdDown}{\ButtonDown}
+\newcommand{\ActionKbdSelect}{\ButtonSelect}
+\newcommand{\ActionKbdDone}{\ButtonPlay}
+\newcommand{\ActionKbdAbort}{\ButtonRec}
diff --git a/manual/rockbox_interface/playback.tex b/manual/rockbox_interface/playback.tex
index 57c023a0ca..3174160605 100644
--- a/manual/rockbox_interface/playback.tex
+++ b/manual/rockbox_interface/playback.tex
@@ -192,46 +192,43 @@ before 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}{
-    \begin{table}
+
+\opt{IRIVER_H100_PAD,IRIVER_H300_PAD,RECORDER_PAD,IRIVER_H10_PAD,IAUDIO_X5_PAD}{
+  \begin{table}
     \begin{btnmap}{}{}
-      \opt{IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD,RECORDER_PAD}
-        {\ButtonUp/\ButtonDown/\ButtonLeft/\ButtonRight}
+      \ActionKbdLeft/\ActionKbdRight/\ActionKbdUp/\ActionKbdDown
       & Move about the virtual keyboard (moves the solid cursor) \\
       %
-      \opt{IRIVER_H100_PAD,IRIVER_H300_PAD,RECORDER_PAD}
-        {\ButtonOn+\ButtonLeft/\ButtonRight}
-      \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,RECORDER_PAD}{
+        \ActionKbdCursorLeft{} or \ActionKbdCursorRight
+        & Move about within the current file name (moves the line cursor) \\
+      }
       %
-      \opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonSelect}
-      \opt{RECORDER_PAD}{\ButtonPlay}
-      \opt{IAUDIO_X5_PAD}{Please add correct keys} 
+      \ActionKbdSelect
       & Inserts the currently selected keyboard letter at the current
-        filename cursor position \\
+      filename cursor position \\
       %
-      \opt{IRIVER_H100_PAD,IRIVER_H300_PAD,RECORDER_PAD}{\ButtonOff}
-      \opt{IAUDIO_X5_PAD}{Please add correct keys} 
+      \ActionKbdAbort
       & Exits the virtual keyboard without saving any changes \\
       %
-      \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{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{IAUDIO_X5_PAD}{Please add correct keys} 
+      \ActionKbdDone
       & OK: Exits the virtual keyboard and saves any changes \\
       %
-      \opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonRec}
-      \opt{RECORDER_PAD}{\ButtonFThree}
-      \opt{IAUDIO_X5_PAD}{Please add correct keys} 
-      & DEL: Deletes the character before the current filename cursor \\
+      \opt{IRIVER_H100_PAD,IRIVER_H300_PAD,RECORDER_PAD}{
+        \ActionKbdBackSpace
+        & DEL: Deletes the character before the current filename cursor \\
+      }
       %
-      \opt{SWCODEC}{
-        \opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonOn+\ButtonMode}
-        \opt{IAUDIO_X5_PAD}{Please add correct keys} 
-        & Enters Morse input mode\\
+      \opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{
+        \ActionKbdMorseInput
+        & Enters Morse input mode \\
+        \ActionKbdMorseSelect
+        & Tap to select a character in Morse input mode \\
       }
     \end{btnmap}
   \end{table}
@@ -241,25 +238,24 @@ This is the virtual keyboard that is used when entering file names in Rockbox.
   \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\\
+      \ActionKbdUp/\ActionKbdDown & Move about the virtual keyboard.
+      If you move out of the picker area, you get to the \emph{Line edit mode}. \\
+      \ActionKbdLeft/\ActionKbdRight & (moves the solid cursor). \\
+      \ActionKbdSelect
+      & Inserts the currently selected keyboard letter at the current
+      filename cursor position \\
+      \ActionKbdDone
+      & OK: Exits the virtual keyboard and saves any changes \\
+      \ActionKbdAbort
+      & 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\\
+      \ActionKbdLeft/\ActionKbdRight & Move left and right\\
+      \ActionKbdSelect & Deletes the letter to the left of the cursor\\
+      \ActionKbdUp/\ActionKbdDown & Returns to the picker area\\
     \end{btnmap}
   \end{table}
 }