[SCM] Atari 2600 Emulator for SDL & the X Window System branch, master, updated. debian/3.5.5-3-5-gb29c3df

[Stephen Kitt]

The following commit has been merged in the master branch:
commit 5ca79d7f6e86c7aca607462451833c44b40fbf6f
Author: Stephen Kitt <steve at sk2.org>
Date:   Sat Mar 17 23:21:21 2012 +0100

    Update documentation.

diff --git a/debian/changelog b/debian/changelog
index 4cadf96..6a915d0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
 stella (3.6-1) unstable; urgency=low
 
   * New upstream version.
+  * Update documentation with new features in 3.6, notably CompuMate
+    emulation and 2600-daptor II support.
 
  -- Stephen Kitt <steve at sk2.org>  Sat, 17 Mar 2012 13:37:20 +0100
 
diff --git a/debian/control b/debian/control
index 868a4f7..bf373d3 100644
--- a/debian/control
+++ b/debian/control
@@ -27,8 +27,9 @@ Description: Atari 2600 Emulator for SDL & the X Window System
     controllers using the host system's input peripherals;
   * emulation of trackballs, joysticks, booster grips, driving
     controllers and the Amiga Mouse using the host system's mouse;
-  * support for real Atari 2600 controllers using the Stelladaptor or
-    the 2600-daptor;
+  * support for real Atari 2600 controllers using the Stelladaptor,
+    2600-daptor or 2600-daptor II;
+  * support for real Atari 7800 controllers using the 2600-daptor II;
   * support for the speech portion of a real AtariVox device;
   * support for Supercharger single-load and multi-load games.
  .
diff --git a/debian/stella.6 b/debian/stella.6
index 04c0863..57ae067 100644
--- a/debian/stella.6
+++ b/debian/stella.6
@@ -149,11 +149,10 @@ may range from 1 to 10, with larger numbers causing faster movement.
 Sensitivity for emulation of paddles when using a mouse. \fInumber\fP
 may range from 1 to 15, with larger numbers causing faster movement.
 .TP
-.BR \-sa1 " <" left | right >
-Stelladaptor/2600-daptor 1 emulates specified joystick port.
-.TP
-.BR \-sa2 " <" left | right >
-Stelladaptor/2600-daptor 2 emulates specified joystick port.
+.BR \-saport " <" lr | rl >
+Determines how to enumerate the Stelladaptor/2600-daptor devices in
+the order they are found: 'lr' means first is left port, second is
+right port, 'rl' means the opposite.
 .TP
 .BR \-ctrlcombo " <" 1 | 0 >
 Use control-x key combos. This is normally enabled, since the Quit
@@ -397,7 +396,7 @@ Right Player Difficulty B
 .IP F9
 Save state to current slot
 .IP F10
-Chaneg current state slot
+Change current state slot
 .IP F11
 Load state from current slot
 .IP F12
@@ -533,6 +532,27 @@ Right keypad:
 .IP /
 #
 
+.SS CompuMate Controller (cannot be remapped)
+.P
+.IP 0-9
+0-9
+.IP A-Z
+A-Z
+.IP Comma
+Comma
+.IP Period
+Period
+.IP Control
+Func
+.IP Shift
+Shift
+.IP "; or Return/Enter"
+Enter
+.IP "/ or Space"
+Space
+.IP Backspace
+Func-Space
+
 .SH FILES
 .IP ~/.stella/stellarc
 Default options (command line options override these). Lines starting

-- 
Atari 2600 Emulator for SDL & the X Window System