9 files changed, 24 insertions, 10 deletions
diff --git a/manual/platform/h1xx.tex b/manual/platform/h1xx.tex
index 467ae2fc10..1285a02f22 100644
--- a/manual/platform/h1xx.tex
+++ b/manual/platform/h1xx.tex
@@ -80,7 +80,7 @@
 \newcommand{\ActionKbdDone}{\ButtonOn}
 \newcommand{\ActionKbdAbort}{\ButtonOff}
 \newcommand{\ActionKbdBackSpace}{\ButtonRec}
-\newcommand{\ActionKbdMorseInput}{Long \ButtonDown}
+\newcommand{\ActionKbdMorseInput}{\ButtonOn{} + \ButtonMode}
 \newcommand{\ActionKbdMorseSelect}{\ButtonSelect}
 \newcommand{\ActionKbdUp}{\ButtonUp}
 \newcommand{\ActionKbdDown}{\ButtonDown}
diff --git a/manual/platform/h300.tex b/manual/platform/h300.tex
index 7f09210b54..1ce2d86608 100644
--- a/manual/platform/h300.tex
+++ b/manual/platform/h300.tex
@@ -82,7 +82,7 @@
 \newcommand{\ActionKbdDone}{\ButtonOn}
 \newcommand{\ActionKbdAbort}{\ButtonOff}
 \newcommand{\ActionKbdBackSpace}{\ButtonRec}
-\newcommand{\ActionKbdMorseInput}{Long \ButtonDown}
+\newcommand{\ActionKbdMorseInput}{\ButtonOn{} + \ButtonMode}
 \newcommand{\ActionKbdMorseSelect}{\ButtonSelect}
 \newcommand{\ActionKbdUp}{\ButtonUp}
 \newcommand{\ActionKbdDown}{\ButtonDown}
diff --git a/manual/platform/ipod3g.tex b/manual/platform/ipod3g.tex
index 41ddf846bc..292712752b 100644
--- a/manual/platform/ipod3g.tex
+++ b/manual/platform/ipod3g.tex
@@ -67,11 +67,12 @@
 \newcommand{\ActionKbdLeft}{\ButtonLeft}
 \newcommand{\ActionKbdRight}{\ButtonRight}
 \newcommand{\ActionKbdSelect}{\ButtonSelect}
-\newcommand{\ActionKbdDone}{Long \ButtonSelect}
+\newcommand{\ActionKbdDone}{\ButtonPlay}
 \newcommand{\ActionKbdAbort}{\ButtonMenu}
 \newcommand{\ActionKbdUp}{\ButtonScrollBack}
 \newcommand{\ActionKbdDown}{\ButtonScrollFwd}
-
+\newcommand{\ActionKbdMorseInput}{Long \ButtonMenu}
+\newcommand{\ActionKbdMorseSelect}{\ButtonSelect}
 
 %Button actions, Pitch Screen context
 \newcommand{\ActionPsToggleMode}{\ButtonPlay}
diff --git a/manual/platform/ipod4g.tex b/manual/platform/ipod4g.tex
index f5cc8fe4f3..6a969b953d 100644
--- a/manual/platform/ipod4g.tex
+++ b/manual/platform/ipod4g.tex
@@ -67,11 +67,12 @@
 \newcommand{\ActionKbdLeft}{\ButtonLeft}
 \newcommand{\ActionKbdRight}{\ButtonRight}
 \newcommand{\ActionKbdSelect}{\ButtonSelect}
-\newcommand{\ActionKbdDone}{Long \ButtonSelect}
+\newcommand{\ActionKbdDone}{\ButtonPlay}
 \newcommand{\ActionKbdAbort}{\ButtonMenu}
 \newcommand{\ActionKbdUp}{\ButtonScrollBack}
 \newcommand{\ActionKbdDown}{\ButtonScrollFwd}
-
+\newcommand{\ActionKbdMorseInput}{Long \ButtonMenu}
+\newcommand{\ActionKbdMorseSelect}{\ButtonSelect}
 
 %Button actions, Pitch Screen context
 \newcommand{\ActionPsToggleMode}{\ButtonPlay}
diff --git a/manual/platform/ipodcolor.tex b/manual/platform/ipodcolor.tex
index 1b2c2007fc..b7fe48e99e 100644
--- a/manual/platform/ipodcolor.tex
+++ b/manual/platform/ipodcolor.tex
@@ -68,10 +68,12 @@
 \newcommand{\ActionKbdLeft}{\ButtonLeft}
 \newcommand{\ActionKbdRight}{\ButtonRight}
 \newcommand{\ActionKbdSelect}{\ButtonSelect}
-\newcommand{\ActionKbdDone}{Long \ButtonSelect}
+\newcommand{\ActionKbdDone}{\ButtonPlay}
 \newcommand{\ActionKbdAbort}{\ButtonMenu}
 \newcommand{\ActionKbdUp}{\ButtonScrollBack}
 \newcommand{\ActionKbdDown}{\ButtonScrollFwd}
+\newcommand{\ActionKbdMorseInput}{Long \ButtonMenu}
+\newcommand{\ActionKbdMorseSelect}{\ButtonSelect}
 
 %Button actions, Pitch Screen context
 \newcommand{\ActionPsToggleMode}{\ButtonPlay}
diff --git a/manual/platform/ipodmini.tex b/manual/platform/ipodmini.tex
index a3d59196a0..2f648aa509 100644
--- a/manual/platform/ipodmini.tex
+++ b/manual/platform/ipodmini.tex
@@ -67,10 +67,12 @@
 \newcommand{\ActionKbdLeft}{\ButtonLeft}
 \newcommand{\ActionKbdRight}{\ButtonRight}
 \newcommand{\ActionKbdSelect}{\ButtonSelect}
-\newcommand{\ActionKbdDone}{Long \ButtonSelect}
+\newcommand{\ActionKbdDone}{\ButtonPlay}
 \newcommand{\ActionKbdAbort}{\ButtonMenu}
 \newcommand{\ActionKbdUp}{\ButtonScrollBack}
 \newcommand{\ActionKbdDown}{\ButtonScrollFwd}
+\newcommand{\ActionKbdMorseInput}{Long \ButtonMenu}
+\newcommand{\ActionKbdMorseSelect}{\ButtonSelect}
 
 %Button actions, Pitch Screen context
 \newcommand{\ActionPsToggleMode}{\ButtonPlay}
diff --git a/manual/platform/ipodnano.tex b/manual/platform/ipodnano.tex
index 7d284e4c67..dd679c0bb0 100644
--- a/manual/platform/ipodnano.tex
+++ b/manual/platform/ipodnano.tex
@@ -68,10 +68,12 @@
 \newcommand{\ActionKbdLeft}{\ButtonLeft}
 \newcommand{\ActionKbdRight}{\ButtonRight}
 \newcommand{\ActionKbdSelect}{\ButtonSelect}
-\newcommand{\ActionKbdDone}{Long \ButtonSelect}
+\newcommand{\ActionKbdDone}{\ButtonPlay}
 \newcommand{\ActionKbdAbort}{\ButtonMenu}
 \newcommand{\ActionKbdUp}{\ButtonScrollBack}
 \newcommand{\ActionKbdDown}{\ButtonScrollFwd}
+\newcommand{\ActionKbdMorseInput}{Long \ButtonMenu}
+\newcommand{\ActionKbdMorseSelect}{\ButtonSelect}
 
 
 %Button actions, Pitch Screen context
diff --git a/manual/platform/ipodvideo.tex b/manual/platform/ipodvideo.tex
index 3644074f18..a94086b155 100644
--- a/manual/platform/ipodvideo.tex
+++ b/manual/platform/ipodvideo.tex
@@ -68,10 +68,12 @@
 \newcommand{\ActionKbdLeft}{\ButtonLeft}
 \newcommand{\ActionKbdRight}{\ButtonRight}
 \newcommand{\ActionKbdSelect}{\ButtonSelect}
-\newcommand{\ActionKbdDone}{Long \ButtonSelect}
+\newcommand{\ActionKbdDone}{\ButtonPlay}
 \newcommand{\ActionKbdAbort}{\ButtonMenu}
 \newcommand{\ActionKbdUp}{\ButtonScrollBack}
 \newcommand{\ActionKbdDown}{\ButtonScrollFwd}
+\newcommand{\ActionKbdMorseInput}{Long \ButtonMenu}
+\newcommand{\ActionKbdMorseSelect}{\ButtonSelect}
 
 
 %Button actions, Pitch Screen context
diff --git a/manual/rockbox_interface/playback.tex b/manual/rockbox_interface/playback.tex
index 61160a244a..3ce302ec01 100644
--- a/manual/rockbox_interface/playback.tex
+++ b/manual/rockbox_interface/playback.tex
@@ -252,6 +252,10 @@ This is the virtual keyboard that is used when entering text in Rockbox, for
       & Exits the virtual keyboard and saves any changes \\
       \ActionKbdAbort
       & Exits the virtual keyboard without saving any changes\\
+      \ActionKbdMorseInput
+      & Enters Morse input mode \\
+      \ActionKbdMorseSelect
+      & Tap to select a character in Morse input mode \\
     \end{btnmap}
   \end{table}
   \textbf{Line edit mode}