Corrected error in Windows MIDI system description. Removed information regarding...

diff --git a/include/configuring-midi.html b/include/configuring-midi.html
index 217eee9a3e03ae1c91bb139468c7d85a44775d1e..c0bc0031096935a012ca9e43115b29b6450d1bcf 100644 (file)
--- a/include/configuring-midi.html
+++ b/include/configuring-midi.html
@@ -26,25 +26,16 @@
   <td><dfn><abbr title="Advanced Linux Sound API">ALSA</abbr> MIDI</dfn> is the
   standard MIDI framework on Linux systems.</td></tr>
   <tr><th>Windows</th>
-  <td>There is no single standard MIDI framework on Windows, but Ardour
-  can work with ASIO and others.</td></tr>
+  <td><dfn><abbr title="Microsoft Multimedia Environment">MME</abbr></dfn> is the standard
+  MIDI framework on Windows systems.</td></tr>
 </table>
 
 <p class="note">
-  On Linux systems, <dfn>QJackCtl</dfn> control software displays ALSA MIDI
-  ports under its "ALSA" tab (it does not currently display CoreMIDI ports).
-  By contrast, JACK MIDI ports show up under the <kbd class="menu">MIDI</kbd>
-  tab in QJackCtl. However, when Ardour is using jackd for audio in and out
-  the alsa MIDI ports are not accessable. When Ardour is using ALSA for audio
-  in and out then only alsa MIDI ports are accessable.
+  <dfn><abbr title="JACK Audio Connection Kit">JACK</abbr></dfn> is an
+  alternate audio system which Ardour can utilize for both audio and
+  MIDI.  JACK is used to route audio between independent applications,
+  and is now considered an advanced use case which is not recommended
+  for most users.  Users with a need to use JACK for audio routing
+  should consult the latest documentation at
+  the <a href="https://jackaudio.org/">JACK website</a>.
 </p>
-
-<h2>JACK MIDI Configuration</h2>
-
-<p>
-  By default, JACK will <strong>not</strong> automatically detect and use
-  existing MIDI ports. One of several ways of <dfn>bridging</dfn> between
-  the native MIDI frameworks (e.g. CoreMIDI or ALSA) and JACK MIDI must be
-  chosen, as described in the following sections.
-</p>
-

diff --git a/master-doc.txt b/master-doc.txt
index 28699bf3cee24478257e2757b825620edc26ea1a..f8a2a3c6b1657903fb4dd45eb38cfe1f87c74705 100644 (file)
--- a/master-doc.txt
+++ b/master-doc.txt
@@ -292,22 +292,6 @@ uri: setting-up-your-system/setting-up-midi
 part: chapter
 ---
 
----
-title: MIDI on Linux
-include: midi-on-linux.html
-link: midi-on-linux
-uri: setting-up-your-system/setting-up-midi/midi-on-linux
-part: subchapter
----
-
----
-title: MIDI on OS X
-include: midi-on-os-x.html
-link: midi-on-os-x
-uri: setting-up-your-system/setting-up-midi/midi-on-os-x
-part: subchapter
----
-
 ---
 title: Ardour's Interface
 uri: ardours-interface