More cleanup and rearrangement for three column button tables in the manual. Most importantly: move the recently added IRIVER_RC_H100_PAD opt - including the additional column seperator - below everything that belongs to the first column. This way every column is grouped and it also allows to combine different remote control pads if they use the same button. Use HAVEREMOTEKAYMAP if the line refers to an ActionSomething. While at it, add or change some white space to make the tables more readable (there is still a lot to be desired there...) and remove a few tabs in random_folder_advance_config.tex. Also fix sliding.tex to make it show all buttons in an M5 manual by using the appropriate _PAD opt and not simply 'x5'. Finally, remove the one overlooked reference to the H100 remote pad in split_editor.tex.

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@21696 a1c6a512-1295-4272-9138-f99709370657

1 files changed, 8 insertions, 8 deletions

diff --git a/manual/plugins/solitaire.tex b/manual/plugins/solitaire.tex
index 69bf00aed3..d41bfbcf21 100644
--- a/manual/plugins/solitaire.tex
+++ b/manual/plugins/solitaire.tex
@@ -21,7 +21,7 @@ visit
     \opt{IPOD_4G_PAD,IPOD_3G_PAD,SANSA_E200_PAD}{\ButtonScrollFwd{} / \ButtonScrollBack}
     \opt{IRIVER_H10_PAD}{\ButtonScrollUp{} / \ButtonScrollDown}
     / \ButtonLeft{} / \ButtonRight
-       \opt{IRIVER_RC_H100_PAD}{&} 
+       \opt{IRIVER_RC_H100_PAD}{&}
       & Move Cursor around.\\
     %
     \opt{RECORDER_PAD}{\ButtonOn}
@@ -29,28 +29,27 @@ visit
     \opt{IRIVER_H100_PAD,IRIVER_H300_PAD,IPOD_4G_PAD,IPOD_3G_PAD,IAUDIO_X5_PAD%
       ,SANSA_E200_PAD,SANSA_C200_PAD,GIGABEAT_PAD,GIGABEAT_S_PAD,MROBE100_PAD}
       {\ButtonSelect}
-    \opt{IRIVER_RC_H100_PAD}{&} 
     \opt{IRIVER_H10_PAD}{\ButtonPlay}
+    \opt{IRIVER_RC_H100_PAD}{&}
       & Select cards, move cards, reveal hidden cards...\\
     %
     \opt{RECORDER_PAD}{\ButtonFOne}
     \opt{ONDIO_PAD}{Long \ButtonMenu}
     \opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonMode}
-    \opt{IRIVER_RC_H100_PAD}{&}
     \opt{IPOD_4G_PAD,IPOD_3G_PAD,GIGABEAT_PAD,GIGABEAT_S_PAD,MROBE100_PAD}
       {\ButtonMenu}
     \opt{IAUDIO_X5_PAD}{\ButtonPlay}
     \opt{IRIVER_H10_PAD}{Long \ButtonLeft}
     \opt{SANSA_E200_PAD}{\ButtonRec}
     \opt{SANSA_C200_PAD}{\ButtonVolDown}
+    \opt{IRIVER_RC_H100_PAD}{&}
       & If a card was selected -- unselect it, else\\
-      \opt{IRIVER_RC_H100_PAD}{&} 
+      \opt{IRIVER_RC_H100_PAD}{&}
       & Draw 3 new cards from the remains stack\\
     %
     \opt{RECORDER_PAD,IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonPlay}
     \opt{ONDIO_PAD}{Long \ButtonDown}
     \opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonOn{} + \ButtonLeft}
-    \opt{IRIVER_RC_H100_PAD}{&} 
     \opt{IAUDIO_X5_PAD}{Long \ButtonPlay}
     \opt{IRIVER_H10_PAD}{\ButtonFF}
     \opt{SANSA_E200_PAD}{\ButtonLeft}
@@ -58,36 +57,37 @@ visit
     \opt{GIGABEAT_PAD}{\ButtonA{} + \ButtonLeft}
     \opt{GIGABEAT_S_PAD}{\ButtonSelect{} + \ButtonLeft}
     \opt{MROBE100_PAD}{\ButtonDisplay{} + \ButtonLeft}
+    \opt{IRIVER_RC_H100_PAD}{&}
       & Put the card from the top of the remains stack on top of the cursor\\
     %
     \opt{RECORDER_PAD}{\ButtonFTwo}
     \opt{ONDIO_PAD}{Long \ButtonUp}
     \opt{IRIVER_H100_PAD,IRIVER_H300_PAD,GIGABEAT_PAD,GIGABEAT_S_PAD%
       ,MROBE100_PAD,SANSA_C200_PAD}{Long \ButtonSelect}
-    \opt{IRIVER_RC_H100_PAD}{&} 
     \opt{IPOD_4G_PAD,IPOD_3G_PAD}{Long \ButtonMenu}
     \opt{IAUDIO_X5_PAD}{Long \ButtonSelect}
     \opt{IRIVER_H10_PAD}{\ButtonRew}
     \opt{SANSA_E200_PAD}{\ButtonRec{} + \ButtonRight}
+    \opt{IRIVER_RC_H100_PAD}{&}
       & Put the card under the cursor on one of the 4 final colour stacks.\\
     %
     \opt{RECORDER_PAD}{\ButtonFThree}
     \opt{IRIVER_H10_PAD,ONDIO_PAD,IPOD_4G_PAD,IPOD_3G_PAD}{Long \ButtonRight}
     \opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonOn{} + \ButtonRight}
-    \opt{IRIVER_RC_H100_PAD}{&} 
     \opt{IAUDIO_X5_PAD}{\ButtonRec}
     \opt{SANSA_E200_PAD}{\ButtonRight}
     \opt{GIGABEAT_PAD}{\ButtonA{} + \ButtonRight}
     \opt{GIGABEAT_S_PAD}{\ButtonSelect{} + \ButtonRight}
     \opt{MROBE100_PAD}{\ButtonDisplay{} + \ButtonRight}
     \opt{SANSA_C200_PAD}{\ButtonVolUp}
+    \opt{IRIVER_RC_H100_PAD}{&}
       & Put the card on top of the remains stack on one of the final colour stacks.\\
     %
     \opt{RECORDER_PAD,ONDIO_PAD,IRIVER_H300_PAD,IRIVER_H100_PAD}{\ButtonOff}
-    \opt{IRIVER_RC_H100_PAD}{&} 
     \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonMenu{} + \ButtonSelect}
     \opt{IAUDIO_X5_PAD,IRIVER_H10_PAD,SANSA_E200_PAD,SANSA_C200_PAD,GIGABEAT_PAD,MROBE100_PAD}{\ButtonPower}
     \opt{GIGABEAT_S_PAD}{\ButtonBack}
+    \opt{IRIVER_RC_H100_PAD}{&}
       & Show menu\\
    \end{btnmap}
   \end{table}