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

[Stephen Kitt]

The following commit has been merged in the master branch:
commit 0a67fd4bd3db324f8b8f7f1c513a6c6c20abe0d3
Author: Stephen Kitt <steve at sk2.org>
Date:   Tue May 31 09:00:41 2011 +0200

    Update documentation.

diff --git a/debian/changelog b/debian/changelog
index 79cb272..ec841f4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,7 @@
 stella (3.4-1) unstable; urgency=low
 
   * New upstream version.
-  * Update package description with new features in 3.4.
+  * Update package description and manpage with new features in 3.4.
   * Standards-Version 3.9.2, no change required.
   * Drop all patches, merged upstream.
 
diff --git a/debian/stella.6 b/debian/stella.6
index d0a1130..8fd08e6 100644
--- a/debian/stella.6
+++ b/debian/stella.6
@@ -1,4 +1,4 @@
-.TH stella 6 "Jun 10, 2010" stella
+.TH stella 6 "May 31, 2011" stella
 .SH NAME
 stella \- Atari 2600 emulator
 .SH SYNOPSIS
@@ -81,9 +81,6 @@ mode. If \fBauto\fP, let Stella decide which resolution to use.
 .BR \-center " <" 1 | 0 >
 Centers game window (if possible).
 .TP
-.BR \-grabmouse " <" 1 | 0 >
-Keeps the mouse in the game window.
-.TP
 .BR \-palette " <" standard | z26 | user >
 Sets the palette to either normal Stella, the one used in the \fBz26\fP
 emulator, or a user-defined palette.
@@ -155,14 +152,20 @@ all 4 directions.
 Enable using the mouse for various controllers (paddle, driving,
 etc).
 .TP
-.BR \-pspeed " <\fInumber\fP>"
-Speed for digital emulation of paddles (1\-15).
+.BR \-dsense " <\fInumber\fP>"
+Sensitivity for emulation of paddles when using a digital device
+(joystick digital axis or button, keyboard key, etc.). \fInumber\fP
+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.
 .TP
 .BR \-sa1 " <" left | right >
-Stelladaptor 1 emulates specified joystick port.
+Stelladaptor/2600-daptor 1 emulates specified joystick port.
 .TP
 .BR \-sa2 " <" left | right >
-Stelladaptor 2 emulates specified joystick port.
+Stelladaptor/2600-daptor 2 emulates specified joystick port.
 .TP
 .BR \-ctrlcombo " <" 1 | 0 >
 Use control-x key combos. This is normally enabled, since the Quit
@@ -547,4 +550,4 @@ Stella Team.
 This manual page was adapted from the provided documentation by
 Stephen Kitt <steve at sk2.org>, for the Debian GNU/Linux system (but may
 be used by others). It was last modified for \fBstella\fP version
-3.1.2.
+3.4.

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