Manual: Unify and simplify manual uninstallation for couple targets.

Change-Id: Ib90aaf3652be4ea4cfc5f873aa5ab1f4ef4dd004

5 files changed, 10 insertions, 22 deletions

diff --git a/manual/getting_started/installation.tex b/manual/getting_started/installation.tex
index 802302946e..ea9568e42c 100644
--- a/manual/getting_started/installation.tex
+++ b/manual/getting_started/installation.tex
@@ -721,31 +721,15 @@ completely follow the manual uninstallation instructions below.}}
   \fname{\firmwarefilename} file.
 }
 
-\opt{iriverh10,iriverh10_5gb}{
+\opt{iriverh10,iriverh10_5gb,mrobe100,vibe500}{
   If you would like to go back to using the original \playerman{} software,
   connect the \dap{} to your computer, and delete the
-  \opt{iriverh10}{\fname{H10\_20GC.mi4}}\opt{iriverh10_5gb}{\fname{H10.mi4}}
-      file and rename \fname{OF.mi4} to \opt{iriverh10}{\fname{H10\_20GC.mi4}}%
-      \opt{iriverh10_5gb}{\fname{H10.mi4}} in the \fname{System} directory on
-      your \playertype{}. As in the installation, it may be necessary to first
-      put your device into UMS mode.
-  }
-
-\opt{vibe500}{
-  If you would like to go back to using the original \playerman{} software,
-  connect the \dap{} to your computer, and delete the
-  \fname{jukebox.mi4} file and rename
-  \fname{OF.mi4} to \fname{JUKEBOX.mi4}
-  in the \fname{System} directory on your \playertype{}. As in the installation,
-  it may be necessary to first put your device into UMS mode.
-}
-
-\opt{mrobe100}{
-  If you would like to go back to using the original \playerman{} software,
-  connect the \dap{} to your computer, and delete the
-  \fname{pp5020.mi4} file and rename
-  \fname{OF.mi4} to \fname{pp5020.mi4}
+  \originalfirmwarefilename{} file and rename
+  \fname{OF.mi4} to \originalfirmwarefilename{}
   in the \fname{System} directory on your \playertype{}.
+  \nopt{mrobe100}{As in the installation,
+  it may be necessary to first put your device into UMS mode.
+  }
 }
 
 \opt{e200}{
diff --git a/manual/platform/iriverh10.tex b/manual/platform/iriverh10.tex
index 460c269ce5..e09da7a04d 100644
--- a/manual/platform/iriverh10.tex
+++ b/manual/platform/iriverh10.tex
@@ -18,6 +18,7 @@
 \newcommand{\dap}{player}
 %For use when referring to the player. E.g. the \daps\ capacity ...
 \newcommand{\daps}{player's}
+\newcommand{\originalfirmwarefilename}{\fname{H10\_20GC.mi4}}
 \newcommand{\firmwarefilename}{\fname{rockbox.mi4}}
 \newcommand{\firmwareextension}{\fname{mi4}}
 \newcommand{\screenshotsize}{4cm}
diff --git a/manual/platform/iriverh10_5gb.tex b/manual/platform/iriverh10_5gb.tex
index 14adcfedd0..02359c3536 100644
--- a/manual/platform/iriverh10_5gb.tex
+++ b/manual/platform/iriverh10_5gb.tex
@@ -18,6 +18,7 @@
 \newcommand{\dap}{player}
 %For use when referring to the player. E.g. the \daps\ capacity ...
 \newcommand{\daps}{player's}
+\newcommand{\originalfirmwarefilename}{\fname{H10.mi4}}
 \newcommand{\firmwarefilename}{\fname{rockbox.mi4}}
 \newcommand{\firmwareextension}{\fname{mi4}}
 \newcommand{\screenshotsize}{4cm}
diff --git a/manual/platform/mrobe100.tex b/manual/platform/mrobe100.tex
index 148028ecd3..9650467b7e 100644
--- a/manual/platform/mrobe100.tex
+++ b/manual/platform/mrobe100.tex
@@ -20,6 +20,7 @@
 \newcommand{\dap}{player}
 %For use when referring to the player. E.g. the \daps\ capacity ...
 \newcommand{\daps}{player's}
+\newcommand{\originalfirmwarefilename}{\fname{pp5020.mi4}}
 \newcommand{\firmwarefilename}{\fname{rockbox.mi4}}
 \newcommand{\firmwareextension}{\fname{mi4}}
 \newcommand{\screenshotsize}{4cm}
diff --git a/manual/platform/vibe500.tex b/manual/platform/vibe500.tex
index 7397796cea..644e6888b4 100644
--- a/manual/platform/vibe500.tex
+++ b/manual/platform/vibe500.tex
@@ -18,6 +18,7 @@
 \newcommand{\dap}{player}
 %For use when referring to the player. E.g. the \daps\ capacity ...
 \newcommand{\daps}{player's}
+\newcommand{\originalfirmwarefilename}{\fname{JUKEBOX.mi4}}
 \newcommand{\firmwarefilename}{\fname{rockbox.mi4}}
 \newcommand{\firmwareextension}{\fname{mi4}}
 \newcommand{\screenshotsize}{4cm}