[SCM] Atari 2600 Emulator for SDL & the X Window System branch, master, updated. debian/3.5-1-4-g298c9f2

[Stephen Kitt]

The following commit has been merged in the master branch:
commit 298c9f2342e8aee4d71eb2fe3a7337e93aa2403b
Author: Stephen Kitt <steve at sk2.org>
Date:   Sun Feb 5 08:10:39 2012 +0100

    Update manpage.

diff --git a/debian/changelog b/debian/changelog
index 23b0d92..561c98b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ stella (3.5.5-1) unstable; urgency=low
 
   * New upstream version.
   * Rewrite debian/copyright, using DEP-5 and updating for 2012.
+  * Update manpage.
 
  -- Stephen Kitt <steve at sk2.org>  Sun, 05 Feb 2012 08:09:05 +0100
 
diff --git a/debian/stella.6 b/debian/stella.6
index 020539b..9f5026c 100644
--- a/debian/stella.6
+++ b/debian/stella.6
@@ -135,11 +135,10 @@ all 4 directions.
 .BR \-grabmouse " <" 1 | 0 >
 Keeps the mouse in the game window in emulation mode.
 .TP
-.BR \-mcontrol " <" auto | \fIXY\fP >
-Enable using the mouse axes for various controllers automatically
-(paddle, driving, etc), or specifically use each axis for a particular
-paddle. In the latter case, \fIXY\fP indicates how to use the X/Y axis
-(ie, \fB02\fP is paddle0/paddle2).
+.BR \-mcontrol " <" never | auto | rom >
+Disable mouse input entirely, enable using the mouse axes for various
+controllers automatically (paddle, driving, etc), or use the settings
+specified by the current ROM.
 .TP
 .BR \-dsense " <\fInumber\fP>"
 Sensitivity for emulation of paddles when using a digital device
@@ -148,7 +147,7 @@ may range from 1 to 10, with larger numbers causing faster movement.
 .TP
 .BR \-msense " <\fInumber\fP>"
 Sensitivity for emulation of paddles when using a mouse. \fInumber\fP
-may range from 1 to 10, with larger numbers causing faster movement.
+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.
@@ -331,7 +330,12 @@ Sets both "Controller.Left" and "Controller.Right" properties. See the
 types.
 .TP
 .BR \-cp " <" Yes | No >
-Set "Controller.SwapPaddles" property.
+Set "Controller.SwapPaddles" property. See the \fIGame Properties\fP
+section in the provided documentation for valid types.
+.TP
+.BR \-ma " <" Auto | XY >
+Set "Controller.MouseAxis" property. See the \fIGame Properties\fP
+section in the provided documentation for valid types.
 .TP
 .BR \-format " <\fIformat\fP>"
 Set "Display.Format" property. See the \fIGame Properties\fP section

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