Merge branch '86Box:master' into master

This commit is contained in:
Jasmine Iwanek
2022-02-17 22:21:17 -05:00
committed by GitHub
4 changed files with 4 additions and 9 deletions

View File

@@ -22,12 +22,12 @@ Emulated device to connect to the given parallel (LPT) port.
* Printed pages are saved as .png files in the ``printer`` subdirectory found in the emulated machine's directory.
* Use the **EPSON LQ-2500** printer driver for best results.
* This printer will not work if the included ``freetype.dll`` file is missing from the 86Box directory.
* This printer will not work on Windows hosts if the included ``freetype.dll`` file is missing from the 86Box directory.
* **Generic PostScript Printer:** PostScript-compatible printer with PDF output.
* Printed documents are saved as .ps files in the ``printer`` subdirectory found in the emulated machine's directory. These files are automatically converted to .pdf once printing is completed.
* The original .ps files may remain in the directory if PDF conversion fails, or if the included ``gsdll32.dll`` or ``gsdll64.dll`` file is missing from the 86Box directory.
* The original .ps files may remain in the directory if PDF conversion fails, or (on Windows hosts) if the included ``gsdll32.dll`` or ``gsdll64.dll`` file is missing from the 86Box directory.
* Use the generic PostScript printer driver provided by your operating system.
* Windows 95 and newer do not have a generic PostScript driver; use the **Apple LaserWriter IIf** driver for grayscale, or the **Apple Color LW 12/660 PS** driver for color.

View File

@@ -22,7 +22,7 @@ MIDI Out Device
Device to output MIDI music to, for sound cards equipped with an external MIDI output.
* **None:** don't output MIDI music.
* **FluidSynth:** a software soundfont synthesizer. Selecting a soundfont file is required. There will be no synthesizer output if no soundfont is configured or if the included ``libfluidsynth.dll`` or ``libfluidsynth64.dll`` file is missing from the 86Box directory.
* **FluidSynth:** a software soundfont synthesizer. Selecting a soundfont file is required. There will be no synthesizer output if no soundfont is configured, or (on Windows hosts) if the included ``libfluidsynth.dll`` or ``libfluidsynth64.dll`` file is missing from the 86Box directory.
* **Roland MT-32**/**CM-32L Emulation:** emulate a Roland synthesizer module. Emulation is provided by the `Munt <http://munt.sourceforge.net>`_ library.
* **System MIDI:** output to a MIDI device on the host system, such as the Windows software synthesizer or a USB MIDI adapter.

View File

@@ -76,7 +76,7 @@ Tools
* **Enable Discord integration:** enable Discord Rich Presence. 86Box shares the emulated machine's name, model and CPU with other Discord users.
.. note:: Discord integration will not be available if the Discord desktop app is not running, or if the included ``discord_game_sdk.dll`` file is missing from the 86Box directory.
.. note:: Discord integration will not be available if the Discord desktop app is not running, if (on Windows hosts) the included ``discord_game_sdk.dll`` file is missing from the 86Box directory, or (on Linux hosts) non-x86_64 builds.
* **Take screenshot:** take a screenshot of the emulated display. Screenshots are saved as .png images in the ``screenshots`` subdirectory found in the emulated machine's directory.
* **Sound gain:** open the :ref:`sound gain control <usage/statusbar:|sound| Sound>`, which is also accessible through the status bar.

View File

@@ -17,11 +17,6 @@ Pause emulation of the machine. Press again to resume emulation.
Force a reset of the emulated machine. Requires confirmation, which can be disabled by checking the *Don't show this message again* box.
|acpi_shutdown| ACPI shutdown
-----------------------------
Initiate a clean shutdown of the emulated machine. Only available on machines with ACPI soft power off capability.
|send_cad| |send_cae| Press Ctrl+Alt+Del/Ctrl+Alt+Esc
-------------------------------------------------------