3 files changed, 33 insertions, 9 deletions

diff --git a/manual/rockbox_interface/browsing_and_playing.tex b/manual/rockbox_interface/browsing_and_playing.tex
index fcfeb39546..b5d151f474 100644
--- a/manual/rockbox_interface/browsing_and_playing.tex
+++ b/manual/rockbox_interface/browsing_and_playing.tex
@@ -215,7 +215,7 @@ example when renaming a file or creating a new directory.
   \setting{Use Morse Code Input} setting%
   \opt{IRIVER_H100_PAD,IRIVER_H300_PAD,IPOD_4G_PAD,IPOD_3G_PAD,IRIVER_H10_PAD%
       ,GIGABEAT_PAD,GIGABEAT_S_PAD,MROBE100_PAD,SANSA_E200_PAD,PBELL_VIBE500_PAD%
-      ,SANSA_FUZEPLUS_PAD,SAMSUNG_YH92X_PAD}
+      ,SANSA_FUZEPLUS_PAD,SAMSUNG_YH92X_PAD,SAMSUNG_YH820_PAD}
     { or by pressing \ActionKbdMorseInput{} in the virtual keyboard}%
   .}
 
@@ -226,7 +226,7 @@ example when renaming a file or creating a new directory.
 \begin{btnmap}
     \opt{IRIVER_H100_PAD,IRIVER_H300_PAD,RECORDER_PAD,GIGABEAT_PAD,GIGABEAT_S_PAD%
         ,MROBE100_PAD,SANSA_E200_PAD,SANSA_FUZE_PAD,SANSA_C200_PAD,SANSA_FUZEPLUS_PAD%
-        ,SAMSUNG_YH92X_PAD}{
+        ,SAMSUNG_YH92X_PAD,SAMSUNG_YH820_PAD}{
         \ActionKbdCursorLeft{} / \ActionKbdCursorRight
             &
         \opt{HAVEREMOTEKEYMAP}{\ActionRCKbdCursorLeft{} / \ActionRCKbdCursorRight
@@ -259,7 +259,7 @@ example when renaming a file or creating a new directory.
         \\
     %
     \nopt{IPOD_3G_PAD,IPOD_4G_PAD,IRIVER_H10_PAD,ONDIO_PAD,PBELL_VIBE500_PAD%
-         ,SANSA_FUZEPLUS_PAD,SAMSUNG_YH92X_PAD}{
+         ,SANSA_FUZEPLUS_PAD,SAMSUNG_YH92X_PAD,SAMSUNG_YH820_PAD}{
         \ActionKbdPageFlip
             &
         \opt{HAVEREMOTEKEYMAP}{\ActionRCKbdPageFlip
@@ -292,7 +292,7 @@ example when renaming a file or creating a new directory.
       \opt{morse_input}{
         \opt{IRIVER_H100_PAD,IRIVER_H300_PAD,GIGABEAT_PAD,GIGABEAT_S_PAD,MROBE100_PADD%
             ,SANSA_E200_PA,IPOD_4G_PAD,IPOD_3G_PAD,IRIVER_H10_PAD,PBELL_VIBE500_PAD%
-            ,SAMSUNG_YH92X_PAD}{
+            ,SAMSUNG_YH92X_PAD,SAMSUNG_YH820_PAD}{
           \ActionKbdMorseInput
           \opt{HAVEREMOTEKEYMAP}{& \ActionRCKbdMorseInput}
           & Toggle keyboard input mode and Morse code input mode. \\}
diff --git a/manual/rockbox_interface/main.tex b/manual/rockbox_interface/main.tex
index 37dd3fba8e..edd0a776db 100644
--- a/manual/rockbox_interface/main.tex
+++ b/manual/rockbox_interface/main.tex
@@ -476,6 +476,27 @@ detail in the following paragraph.
   On the top on the \dap{} is the internal microphone on the left and the line-in socket on the 
   right, near the headphone socket.}
   %
+  \opt{samsungyh820}{
+  Hold or lay the \dap{} so that the side with the controls and
+  LCD is facing towards you. Directly below the bottom edge of the screen are three buttons:
+  \ButtonRew{} on the left, \ButtonPlay{} in the middle and \ButtonFF{} on the right. Below them
+  is a four-way pad which contains the \ButtonDown{}, \ButtonUp{}, \ButtonLeft{} and 
+  \ButtonRight{} controls.
+
+  At the top of the right hand side of the \dap{} is the \ButtonRec{} button.
+
+  On the top panel of the \dap{}, from left to right, you can find the following: headphone 
+  socket, line-in socket, internal microphone, and the \ButtonHold{} switch. Note that when the 
+  \ButtonHold{} switch is moved towards the center of the \dap{}, hold is turned on and all the 
+  other controls are disabled. Be sure \ButtonHold{} is off before trying to use your player. 
+
+  At the top of the back side of the player, just under the \ButtonHold{} button is the reset 
+  hole, if you need to perform a hardware reset. 
+
+  The USB/dock connector that is used to connect your \dap{} to your computer is on 
+  the bottom panel of the \dap{}.
+  }
+  %
   \opt{samsungyh920,samsungyh925}{
   Hold or lay the \dap{} so that the side with the controls and
   LCD is facing towards you. Below the LCD is a four-way pad with the \ButtonDown{}, 
@@ -560,7 +581,8 @@ detail in the following paragraph.
 To turn on and off your Rockbox enabled \dap{} use the following keys:
     \begin{btnmap}
       \opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonOn}%
-      \opt{MPIO_HD200_PAD,MPIO_HD300_PAD,SAMSUNG_YH92X_PAD}{Long \ButtonPlay}%
+      \opt{MPIO_HD200_PAD,MPIO_HD300_PAD,SAMSUNG_YH92X_PAD,SAMSUNG_YH820_PAD}%
+          {Long \ButtonPlay}%
       \opt{IPOD_4G_PAD}{\ButtonMenu{} / \ButtonSelect}%
       \opt{IPOD_3G_PAD}{\ButtonMenu{} / \ButtonPlay}%
       \opt{ONDIO_PAD}{\ButtonOff}\opt{RECORDER_PAD,PLAYER_PAD}%
@@ -580,7 +602,8 @@ To turn on and off your Rockbox enabled \dap{} use the following keys:
           \\
 
       \opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{Long \ButtonOff}%
-      \opt{MPIO_HD200_PAD,MPIO_HD300_PAD,SAMSUNG_YH92X_PAD}{Long \ButtonPlay}%
+      \opt{MPIO_HD200_PAD,MPIO_HD300_PAD,SAMSUNG_YH92X_PAD,SAMSUNG_YH820_PAD}%
+          {Long \ButtonPlay}%
       \opt{IPOD_4G_PAD,IPOD_3G_PAD}{Long \ButtonPlay}%
       \opt{ONDIO_PAD,recorderv2fm}{Long \ButtonOff}%
       \opt{recorder}{Double tap \ButtonOff\ when playback is stopped}%
@@ -618,7 +641,8 @@ To turn on and off your Rockbox enabled \dap{} use the following keys:
   {\ButtonPower} until the \dap{} shuts off or reboots.
 }%
 \opt{IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_M3_PAD,IRIVER_H10_PAD,MROBE100_PAD
-,PBELL_VIBE500_PAD,MPIO_HD200_PAD,MPIO_HD300_PAD,SAMSUNG_YH92X_PAD}{%
+    ,PBELL_VIBE500_PAD,MPIO_HD200_PAD,MPIO_HD300_PAD,SAMSUNG_YH92X_PAD%
+    ,SAMSUNG_YH820_PAD}{%
   In the unlikely event of a software failure, a hardware reset can be
   performed by inserting a paperclip gently into the Reset hole.
 }%
diff --git a/manual/rockbox_interface/wps.tex b/manual/rockbox_interface/wps.tex
index 0a5b970206..af594d0cd3 100644
--- a/manual/rockbox_interface/wps.tex
+++ b/manual/rockbox_interface/wps.tex
@@ -132,7 +132,7 @@ your WPS (While Playing Screen).
           & Show \setting{Pitch Screen} (see \reference{sec:pitchscreen}).\\%
       }%
       \opt{GIGABEAT_PAD,GIGABEAT_S_PAD,SANSA_CLIP_PAD,MROBE100_PAD,PBELL_VIBE500_PAD%
-          ,SAMSUNG_YH92X_PAD}{%
+          ,SAMSUNG_YH92X_PAD,SAMSUNG_YH820_PAD}{%
         \ActionWpsPlaylist
         \opt{HAVEREMOTEKEYMAP}{&}
           & Show current \setting{Playlist}.\\%
@@ -276,7 +276,7 @@ album etc. To access this screen, %
   press \ActionWpsIdThreeScreen. }%
 \opt{PLAYER_PAD,ONDIO_PAD,IPOD_4G_PAD,IPOD_3G_PAD,IAUDIO_X5_PAD,IAUDIO_M3_PAD,%
       GIGABEAT_PAD,GIGABEAT_S_PAD,MROBE100_PAD,SANSA_CLIP_PAD,PBELL_VIBE500_PAD,%
-      MPIO_HD200_PAD,MPIO_HD300_PAD,SAMSUNG_YH92X_PAD}%
+      MPIO_HD200_PAD,MPIO_HD300_PAD,SAMSUNG_YH92X_PAD,SAMSUNG_YH820_PAD}%
       {press \ActionWpsContext{} to access the 
       \setting{WPS Context Menu} and select \setting{Show Track Info}. }
 \opt{RECORDER_PAD,PLAYER_PAD,ONDIO_PAD}{Use \ButtonLeft\ and \ButtonRight\