summaryrefslogtreecommitdiffstatshomepage
path: root/docs/source/commandline
diff options
context:
space:
mode:
Diffstat (limited to 'docs/source/commandline')
-rw-r--r--docs/source/commandline/commandline-all.rst10
-rw-r--r--docs/source/commandline/sdlconfig.rst5
2 files changed, 9 insertions, 6 deletions
diff --git a/docs/source/commandline/commandline-all.rst b/docs/source/commandline/commandline-all.rst
index aa91bd6307c..91c69ab8bc1 100644
--- a/docs/source/commandline/commandline-all.rst
+++ b/docs/source/commandline/commandline-all.rst
@@ -899,22 +899,24 @@ Example:
- dinput
- xinput
- none
- - sdl
+ - sdljoy
+ - sdlgame
* - **SDL**
- auto [#JIPAutoSDL]_.
-
-
-
- none
- - sdl
+ - sdljoy
+ - sdlgame
.. rubric:: Footnotes
.. [#JIPAutoWindows] On Windows, auto will default to ``dinput``.
-.. [#JIPAutoSDL] On SDL, auto will default to ``sdl``.
+.. [#JIPAutoSDL] On SDL, auto will default to ``sdljoy``.
-.. Tip:: Note that Microsoft XBox 360 and XBox One controllers connected to
+.. Tip:: Note that Microsoft Xbox 360 and Xbox One controllers connected to
Windows will work best with ``winhybrid`` or ``xinput``. The
``winhybrid`` option supports a mix of DirectInput and XInput
controllers at the same time.
diff --git a/docs/source/commandline/sdlconfig.rst b/docs/source/commandline/sdlconfig.rst
index 0b52739e4c3..84f31bf89b9 100644
--- a/docs/source/commandline/sdlconfig.rst
+++ b/docs/source/commandline/sdlconfig.rst
@@ -70,8 +70,9 @@ SDL Joystick Mapping
**-sixaxis**
- Use special handling for PlayStation 3 SixAxis controllers. Default is OFF
- (**-nosixaxis**)
+ Use special handling for PlayStation 3 SixAxis controllers. May cause
+ undesirable behaviour with other controllers. Only affects the ``sdljoy``
+ joystick provider. Default is OFF (**-nosixaxis**)
SDL Lightgun Mapping