1 files changed, 19 insertions, 19 deletions

diff --git a/manual/plugins/goban.tex b/manual/plugins/goban.tex
index 18346f91fe..05ca5fb60f 100644
--- a/manual/plugins/goban.tex
+++ b/manual/plugins/goban.tex
@@ -54,30 +54,30 @@ these markers:
 
 \subsubsection{Controls}
     \begin{btnmap}
-        \nopt{IPOD_1G2G_PAD,IPOD_3G_PAD,IPOD_4G_PAD,IRIVER_H10_PAD,COWON_D2_PAD}
+        \nopt{IPOD_1G2G_PAD,IPOD_3G_PAD,IPOD_4G_PAD,IRIVER_H10_PAD,touchscreen}
              {\ButtonUp}%
         \opt{IPOD_1G2G_PAD,IPOD_3G_PAD,IPOD_4G_PAD}{\ButtonMenu}%
         \opt{IRIVER_H10_PAD}{\ButtonScrollUp}
-        \opt{COWON_D2_PAD}{\TouchTopMiddle}
+        \opt{touchscreen}{\TouchTopMiddle}
             &
         \opt{HAVEREMOTEKEYMAP}{
             &}
         Move cursor up
         \\
         
-        \nopt{IPOD_1G2G_PAD,IPOD_3G_PAD,IPOD_4G_PAD,IRIVER_H10_PAD,COWON_D2_PAD}
+        \nopt{IPOD_1G2G_PAD,IPOD_3G_PAD,IPOD_4G_PAD,IRIVER_H10_PAD,touchscreen}
              {\ButtonDown}%
         \opt{IPOD_1G2G_PAD,IPOD_3G_PAD,IPOD_4G_PAD}{\ButtonPlay}%
         \opt{IRIVER_H10_PAD}{\ButtonScrollDown}
-        \opt{COWON_D2_PAD}{\TouchBottomMiddle}
+        \opt{touchscreen}{\TouchBottomMiddle}
             &
         \opt{HAVEREMOTEKEYMAP}{
             &}
         Move cursor down
         \\
             
-        \nopt{COWON_D2_PAD}{\ButtonLeft}
-        \opt{COWON_D2_PAD}{\TouchMidLeft}
+        \nopt{touchscreen}{\ButtonLeft}
+        \opt{touchscreen}{\TouchMidLeft}
             &
         \opt{HAVEREMOTEKEYMAP}{
             &}
@@ -86,8 +86,8 @@ these markers:
             node in the game tree if in \emph{tree} navigation mode}
         \\
              
-        \nopt{COWON_D2_PAD}{\ButtonRight}
-        \opt{COWON_D2_PAD}{\TouchMidRight}
+        \nopt{touchscreen}{\ButtonRight}
+        \opt{touchscreen}{\TouchMidRight}
             &
         \opt{HAVEREMOTEKEYMAP}{
             &}
@@ -103,12 +103,12 @@ these markers:
             \\
         }
         
-        \nopt{IRIVER_H10_PAD,COWON_D2_PAD,ONDIO_PAD,RECORDER_PAD,IAUDIO_M3_PAD%
-             ,PBELL_VIBE500_PAD}{%
+        \nopt{IRIVER_H10_PAD,ONDIO_PAD,RECORDER_PAD,IAUDIO_M3_PAD,PBELL_VIBE500_PAD%
+            ,touchscreen}{%
             \ButtonSelect}%
         \opt{IRIVER_H10_PAD,RECORDER_PAD,PBELL_VIBE500_PAD}{\ButtonPlay}%
         \opt{ONDIO_PAD}{\ButtonMenu}
-        \opt{COWON_D2_PAD}{\TouchCenter}
+        \opt{touchscreen}{\TouchCenter}
             &
         \opt{HAVEREMOTEKEYMAP}{
             &}
@@ -125,7 +125,7 @@ these markers:
             \opt{MROBE100_PAD}{\ButtonMenu}%
             \opt{IAUDIO_X5_PAD}{\ButtonPlay}%
             \opt{RECORDER_PAD}{\ButtonFOne}
-            \opt{COWON_D2_PAD}{\TouchBottomLeft}
+            \opt{touchscreen}{\TouchBottomLeft}
             \opt{PBELL_VIBE500_PAD}{\ButtonOK{} + \ButtonLeft}
                 &
             \opt{HAVEREMOTEKEYMAP}{
@@ -141,7 +141,7 @@ these markers:
             \opt{MROBE100_PAD}{\ButtonPlay}%
             \opt{IAUDIO_X5_PAD}{\ButtonRec}%
             \opt{RECORDER_PAD}{\ButtonFThree}
-            \opt{COWON_D2_PAD}{\TouchBottomRight}
+            \opt{touchscreen}{\TouchBottomRight}
             \opt{PBELL_VIBE500_PAD}{\ButtonOK{} + \ButtonRight}
                 &
             \opt{HAVEREMOTEKEYMAP}{
@@ -158,7 +158,7 @@ these markers:
         \opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonMode}%
         \opt{RECORDER_PAD}{\ButtonFTwo}%
         \opt{ONDIO_PAD}{Long \ButtonMenu}
-        \opt{COWON_D2_PAD}{\TouchTopLeft}
+        \opt{touchscreen}{\TouchTopLeft}
             &
         \opt{HAVEREMOTEKEYMAP}{
             &}
@@ -168,10 +168,10 @@ these markers:
 %        \nopt{IPOD_1G2G_PAD,IPOD_3G_PAD,IPOD_4G_PAD,ONDIO_PAD,RECORDER_PAD}{%
         \opt{SANSA_E200_PAD,SANSA_FUZE_PAD,SANSA_C200_PAD,GIGABEAT_PAD,GIGABEAT_S_PAD%
             ,IRIVER_H100_PAD,IRIVER_H300_PAD,MROBE100_PAD,IAUDIO_X5_PAD,IRIVER_H10_PAD%
-            ,PBELL_VIBE500_PAD}{% 
-            \nopt{IRIVER_H10_PAD,COWON_D2_PAD,PBELL_VIBE500_PAD}{Long \ButtonSelect}%
+            ,PBELL_VIBE500_PAD,touchscreen}{% 
+            \nopt{IRIVER_H10_PAD,touchscreen,PBELL_VIBE500_PAD}{Long \ButtonSelect}%
             \opt{IRIVER_H10_PAD}{Long \ButtonPlay}
-            \opt{COWON_D2_PAD}{Long \TouchCenter}
+            \opt{touchscreen}{Long \TouchCenter}
             \opt{PBELL_VIBE500_PAD}{\ButtonOK}
                 &
             \opt{HAVEREMOTEKEYMAP}{
@@ -182,7 +182,7 @@ these markers:
         
         \opt{SANSA_E200_PAD,SANSA_C200_PAD,SANSA_FUZE_PAD,RECORDER_PAD,MROBE100_PAD%
             ,GIGABEAT_PAD,GIGABEAT_S_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD,SANSA_CLIP_PAD%
-            ,PBELL_VIBE500_PAD}{%
+            ,PBELL_VIBE500_PAD,touchscreen}{%
             \opt{SANSA_E200_PAD,SANSA_C200_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD}{%
                 \ButtonRec}%
             \opt{SANSA_FUZE_PAD,SANSA_CLIP_PAD}{\ButtonHome}%
@@ -190,7 +190,7 @@ these markers:
             \opt{MROBE100_PAD}{\ButtonPower}%
             \opt{GIGABEAT_PAD}{\ButtonA}%
             \opt{GIGABEAT_S_PAD}{\ButtonPlay}%
-            \opt{COWON_D2_PAD}{\TouchTopRight}
+            \opt{touchscreen}{\TouchTopRight}
             \opt{PBELL_VIBE500_PAD}{\ButtonCancel}
                 &
             \opt{HAVEREMOTEKEYMAP}{