diff options
Diffstat (limited to 'docs/source')
-rw-r--r-- | docs/source/commandline/commandline-all.rst | 10 | ||||
-rw-r--r-- | docs/source/commandline/sdlconfig.rst | 5 | ||||
-rw-r--r-- | docs/source/conf.py | 4 |
3 files changed, 11 insertions, 8 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 diff --git a/docs/source/conf.py b/docs/source/conf.py index 81385340ed9..15884fc9ff9 100644 --- a/docs/source/conf.py +++ b/docs/source/conf.py @@ -63,9 +63,9 @@ copyright = u'1997-2023, MAMEdev and contributors' # built documents. # # The short X.Y version. -version = '0.251' +version = '0.252' # The full version, including alpha/beta/rc tags. -release = '0.251' +release = '0.252' # The language for content autogenerated by Sphinx. Refer to documentation # for a list of supported languages. |