4 files changed, 18 insertions, 14 deletions

diff --git a/manual/platform/keymap-xduoox3.tex b/manual/platform/keymap-xduoox3.tex
index d99a605c12..da35abf9b7 100644
--- a/manual/platform/keymap-xduoox3.tex
+++ b/manual/platform/keymap-xduoox3.tex
@@ -11,6 +11,10 @@
 \newcommand{\ButtonLock}{\btnfnt{Lock}}
 \newcommand{\ButtonHold}{\btnfnt{Hold Switch}}
 
+% To make some things happier
+\newcommand{\ButtonLeft}{\btnfnt{Prev}}
+\newcommand{\ButtonRight}{\btnfnt{Next}}
+
 %Button actions, standard context
 \newcommand{\ActionStdPrev}{\ButtonPrev}
 \newcommand{\ActionStdPrevRepeat}{Long \ButtonPrev}
diff --git a/manual/plugins/pictureflow.tex b/manual/plugins/pictureflow.tex
index 87f07264fd..1fb9f28c29 100644
--- a/manual/plugins/pictureflow.tex
+++ b/manual/plugins/pictureflow.tex
@@ -19,10 +19,10 @@ Albums can be sorted by:
 PictureFlow uses both the album art (see \reference{ref:album_art}) and
 database (see \reference{ref:database}) features of Rockbox.
 These need to be working correctly before PictureFlow can be used.
-{\bf PictureFlow does not support embedded album art.}
+\textbf{PictureFlow does not support embedded album art.}
 
 \opt{tc_ramcache}{\note{It is strongly recommended you enable the database's "Load to RAM" feature
-(and restart your player afterwards)! See \reference{ref:databasemenu}. This will {\bf vastly} speed up
+(and restart your player afterwards)! See \reference{ref:databasemenu}. This will \textbf{vastly} speed up
 building the album index as well as loading of track titles when browsing albums.}}
 
 \opt{dircache}{\note{Enabling the disk's directory cache – see \reference{ref:dircache} – noticeably
@@ -57,7 +57,7 @@ reduces the time it takes for cover art to be displayed.}}
         % only scroll wheel and `strip' targets use the same action in album and track list
         \nopt{scrollwheel,IRIVER_H10_PAD,PBELL_VIBE500_PAD,MPIO_HD300_PAD}{%
             % currently the M3 does not use buttons of the main unit which has no display
-            \nopt{IAUDIO_M3_PAD,MPIO_HD200_PAD,touchscreen}{\ButtonLeft{} / \ButtonRight}
+            \nopt{IAUDIO_M3_PAD,MPIO_HD200_PAD,touchscreen}{\ButtonLeft{} / \ButtonRight{}}
             \opt{MPIO_HD200_PAD}{FIXME}
             \opt{touchscreen}{\TouchMidLeft{} / \TouchMidRight}
                 &
@@ -79,7 +79,7 @@ reduces the time it takes for cover art to be displayed.}}
         }
 
         \opt{FIIO_M3K_PAD}{
-                \ButtonLeft{} / \ButtonRight
+                \ButtonLeft{} / \ButtonRight{}
                 &
                 \opt{HAVEREMOTEKEYMAP}{&}
                 Quickly jump to another album (alphabetically or by year) /
@@ -87,7 +87,7 @@ reduces the time it takes for cover art to be displayed.}}
                 \\
         }
         \opt{IPOD_4G_PAD,IPOD_3G_PAD,IPOD_1G2G_PAD}{
-                \ButtonLeft{} / \ButtonRight
+                \ButtonLeft{} / \ButtonRight{}
                 &
                 \opt{HAVEREMOTEKEYMAP}{&}
                 Quickly jump to another album (alphabetically or by year)
@@ -104,7 +104,7 @@ reduces the time it takes for cover art to be displayed.}}
         \nopt{IAUDIO_M3_PAD}{%
             \nopt{IRIVER_H10_PAD,touchscreen,PBELL_VIBE500_PAD%
                  ,SANSA_FUZE_PAD,MPIO_HD200_PAD,MPIO_HD300_PAD,SAMSUNG_YH92X_PAD%
-                 ,SAMSUNG_YH820_PAD}
+                 ,SAMSUNG_YH820_PAD,XDUOO_X3_PAD}
                  {\ButtonSelect}
             \opt{IRIVER_H10_PAD,PBELL_VIBE500_PAD}{\ButtonRight}
             \opt{SAMSUNG_YH92X_PAD,SAMSUNG_YH820_PAD}{\ButtonFF}
@@ -112,6 +112,7 @@ reduces the time it takes for cover art to be displayed.}}
             \opt{SANSA_FUZE_PAD}{\ButtonRight}
             \opt{MPIO_HD200_PAD}{\ButtonFunc}
             \opt{MPIO_HD300_PAD}{\ButtonEnter}
+            \opt{XDUOO_X3_PAD}{\ButtonPlay}
         }
             &
         \opt{HAVEREMOTEKEYMAP}{
diff --git a/manual/plugins/text_viewer.tex b/manual/plugins/text_viewer.tex
index 2e215cca38..307ee3edc5 100644
--- a/manual/plugins/text_viewer.tex
+++ b/manual/plugins/text_viewer.tex
@@ -234,7 +234,7 @@ by using \emph{Open with} from the \emph{Context Menu}
             (Useful for displaying right-to-left languages, such as Arabic or Hebrew)
             \item[Left] Set the text alignment to the left.
         \end{description}
-    \item[Show Header] Select whether to show the header. The header displays the file path. 
+    \item[Show Header] Select whether to show the header. The header displays the file path.
         \begin{description}
             \item[No] Do not display the header.
             \item[Yes] Display the header.
@@ -333,7 +333,7 @@ stores its settings, the current position and bookmarks in
 \end{description}
 
 \subsubsection{Bookmarks}
-    To add a bookmark, press 
+    To add a bookmark, press
     \opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonOn+\ButtonSelect}%
     \opt{IPOD_4G_PAD,IPOD_3G_PAD,GIGABEAT_PAD,GIGABEAT_S_PAD,MROBE100_PAD}{\ButtonSelect}%
     \opt{IRIVER_H10_PAD}{\ButtonFF}\opt{IAUDIO_X5_PAD}{\ButtonRec}%
@@ -346,4 +346,3 @@ stores its settings, the current position and bookmarks in
     press the same button again.
 
 \screenshot{plugins/images/ss-text_viewer-bookmark}{A bookmark}{img:text_viewer-bookmark}
-
diff --git a/manual/preamble.tex b/manual/preamble.tex
index 187f7c1f3a..379d00173b 100644
--- a/manual/preamble.tex
+++ b/manual/preamble.tex
@@ -20,7 +20,7 @@
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
 \documentclass[a4paper,11pt,hyphens]{scrreprt}
-\usepackage[utf8]{inputenx}
+\usepackage[utf8]{inputenc}
 \usepackage[T1]{fontenc}
 % load ix-utf8enc.dfu to get additional characters from the inputenx package.
 \makeatletter\input{ix-utf8enc.dfu}\makeatother
@@ -126,7 +126,7 @@
 %% \newenvironment{example}
 %%     {\stepcounter{example}\paragraph{Example \theexample:}}
 %%     {\hfill$\Box$
-    
+
 %%     \bigskip
 %%     \noindent}
 
@@ -146,7 +146,7 @@
 \long\gdef\nil#1{\IfN@Ught#1* {#1}!}% if null
 \long\gdef\IfN@Ught#1 #2!{\blank{#2}}
 \long\gdef\Ifbl@nk#1#2Q#3!{\ifx#3}% same as above
-} 
+}
 
 % environment for setting the changelog.
 \newenvironment{changelog}%
@@ -262,7 +262,7 @@
 % B1 & B2\\
 % C1 & C2\\
 % \end{rbtabular}
-%    
+%
 \newenvironment{rbtabular}[5]{%
   \rowcolors{2}{tbloddrowbgcolor}{tblevenrowbgcolor}
   \expandafter\let\expandafter\SavedEndTab\csname endtabular*\endcsname
@@ -317,7 +317,7 @@
 
 % set link to download server
 % Usage: \download{bootloader/bootloader-ipodnano.ipod}
-%        gets expanded to 
+%        gets expanded to
 %        "https://download.rockbox.org/bootloader/bootloader-ipodnano.ipod"
 \newcommand{\download}[1]{\url{https://download.rockbox.org/#1}}