summaryrefslogtreecommitdiffstats
path: root/docs/source/usingmame
diff options
context:
space:
mode:
author Robbbert <Robbbert@users.noreply.github.com>2022-06-14 16:33:21 +1000
committer Robbbert <Robbbert@users.noreply.github.com>2022-06-14 16:33:21 +1000
commit1f26ec6836364ef523aa4e375c63186bd8fe323f (patch)
tree883f691395a7fbe71865a624844942d28124d7a8 /docs/source/usingmame
parent4a4b718bc9d32b4cd55a90762c960165be2f6043 (diff)
parent6741eca4d61627072710dc86f458f34a3acf7c5c (diff)
Merge remote-tracking branch 'upstream/master'
# Conflicts: # scripts/build/verinfo.py # scripts/resources/windows/mame/mame.rc # scripts/src/main.lua # src/mame/drivers/8080bw.cpp
Diffstat (limited to 'docs/source/usingmame')
-rw-r--r--docs/source/usingmame/mamemenus.rst8
1 files changed, 4 insertions, 4 deletions
diff --git a/docs/source/usingmame/mamemenus.rst b/docs/source/usingmame/mamemenus.rst
index 0673528214d..297f3870a6d 100644
--- a/docs/source/usingmame/mamemenus.rst
+++ b/docs/source/usingmame/mamemenus.rst
@@ -165,10 +165,6 @@ from the :ref:`main menu <menus-main>`. The items shown on this menu depend on
available emulated inputs for the running system. Available emulated inputs may
depend on slot options, machine configuration settings and DIP switch settings.
-Input Assignments (general)
- Lets you select assign user interface controls, or assign default controls
- for all emulated systems. See the section on :ref:`configuring inputs
- <ui-inptcfg>` for more details.
Input Assignments (this system)
Lets you select assign controls to emulated inputs for the running system.
See the section on :ref:`configuring inputs <ui-inptcfg>` for more details.
@@ -190,6 +186,10 @@ Toggle Inputs
Shows the :ref:`Toggle Inputs menu <menus-inputtoggle>`, where you can view
and adjust the state of multi-position or toggle inputs. This item is not
shown if the running system has no enabled toggle inputs.
+Input Assignments (general)
+ Lets you select assign user interface controls, or assign default controls
+ for all emulated systems. See the section on :ref:`configuring inputs
+ <ui-inptcfg>` for more details.
Input Devices
Shows the :ref:`Input Devices menu <menus-inputdevices>`, which lists the
input devices recognised by MAME.