summaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
author Firehawke <Firehawke@gmail.com>2018-01-26 05:46:47 -0700
committer Vas Crabb <cuavas@users.noreply.github.com>2018-02-01 16:58:52 +1100
commit699de0249880dfec4816739fde1cf0666b1df331 (patch)
tree30c2b2d8ff9d143055b193d56355b0756f9faf79
parent7322eeccc3c828fba27933a58a5406444508807e (diff)
A few corrections for wave 2, more to come. (nw)
-rw-r--r--docs/source/commandline/commandline-all.rst12
-rw-r--r--docs/source/commandline/commandline-index.rst1
2 files changed, 6 insertions, 7 deletions
diff --git a/docs/source/commandline/commandline-all.rst b/docs/source/commandline/commandline-all.rst
index 1c040383ba9..4f149fbae59 100644
--- a/docs/source/commandline/commandline-all.rst
+++ b/docs/source/commandline/commandline-all.rst
@@ -213,19 +213,19 @@ OSD-related Options
**-uimodekey** [*keystring*]
- Key used to toggle emulated keyboard on and off. Default setting is *SCRLOCK*.
+ Key used to toggle emulated keyboard on and off. Default setting is *SCRLOCK* on Windows, *Forward Delete* on Mac (use *FN-Delete* on laptop/compact keyboards).
.. _mame-commandline-uifontprovider:
**\-uifontprovider**
- Chooses provider for UI font: win, none or auto. Default setting is *AUTO*.
+ Chooses provider for UI font.
-.. _mame-commandline-menu:
+ On Windows, you can choose from: **win**, **dwrite**, **none** or **auto**.
+ On Mac, you can choose from: **osx** or **auto**.
+ On other platforms, you can choose from: **sdl** or **auto**.
-**\-menu**
-
- Enables menu bar at the top of the MAME window, if available by UI implementation. Default is *OFF*
+ Default setting is *AUTO*.
.. _mame-commandline-keyboardprovider:
diff --git a/docs/source/commandline/commandline-index.rst b/docs/source/commandline/commandline-index.rst
index 267c82e8aad..e5d447fd4b0 100644
--- a/docs/source/commandline/commandline-index.rst
+++ b/docs/source/commandline/commandline-index.rst
@@ -54,7 +54,6 @@ OSD-related Options
| :ref:`uimodekey <mame-commandline-uimodekey>`
| :ref:`uifontprovider <mame-commandline-uifontprovider>`
-| :ref:`menu <mame-commandline-menu>`
| :ref:`keyboardprovider <mame-commandline-keyboardprovider>`
| :ref:`mouseprovider <mame-commandline-mouseprovider>`
| :ref:`lightgunprovider <mame-commandline-lightgunprovider>`