Merge branch 'master' of https://github.com/PipeManMusic/manual

diff --cc _manual/03_setting-up-your-system/05_setting-up-midi.html
index 8fb4083a3fafa85cde1a2cb3623cb21e63f9e897,d76ba5f1ad6a2e9f64d7c1a307cc0ab81d10628e..430035367f78ac1d7e759683337674654a2ff290
--- 1/_manual/03_setting-up-your-system/05_setting-up-midi.html
--- 2/_manual/03_setting-up-your-system/05_setting-up-midi.html
+++ b/_manual/03_setting-up-your-system/05_setting-up-midi.html
@@@ -2,31 -2,17 +2,36 @@@
  layout: default
  title: Setting Up MIDI
  ---                        
+ 
+  <h2>What Can Ardour Do With MIDI?</h2>
+ <p>MIDI is a way of both describing musical data and controlling musical hardware\software. MIDI doesn't actually create any audio but rather describes the audio in order to control hardware/software. Ardour can import MIDI data, record MIDI data and allow MIDI data to be edited in a variety of ways. Also, MIDI can be used to control various things withing Ardour. This allows for the most flexible work flow with regards to MIDI. What Ardour doesn't have is any built in synthesis to turn the MIDI data into audio. Rather, this is handled through the use of plug-ins and external hardware/software. While this makes MIDI a powerful tool it can also  be a stumbling block for first time users who expect MIDI input to result in audio output by default. Please see the section on working with plug-ins for more information on turning MIDI data into audio output with Ardour.</p>
+ 
   <h2>MIDI Handling Frameworks</h2>
+ <p>Below is a list of various MIDI Frameworks for getting MIDI data into and out of Ardour in order to work with MIDI aware software/hardware.</p>
  <h4>CoreMIDI</h4>
 -<p> CoreMIDI is the standard MIDI framework to comunicate with MIDI hardware on OSX systems. It provides drivers and libraries needed by MIDI clients. These ports do not show up in qjackctl</p>
 +
 +<p> CoreMIDI is the standard MIDI framework to comunicate with MIDI
 +hardware on OSX systems. It provides drivers and libraries needed by
 +MIDI clients. These ports do not show up in qjackctl</p>
 +
  <h4>ALSA MIDI</h4>
 -<p> ALSA MIDI is the standard MIDI framework to comunicate with MIDI hardware on Linux systems. It provides drivers and libraries needed by MIDI clients. These ports show up under the "MIDI" tab in qjackctl</p>
 +
 +<p> ALSA MIDI is the standard MIDI framework to comunicate with MIDI
 +hardware on Linux systems. It provides drivers and libraries needed by
 +MIDI clients. These ports show up under the "ALSA" tab in qjackctl</p>
 +
  <h4> JACK MIDI</h4>
 -<p> JACK MIDI is a framework used to comunicate between JACK MIDI software clients. On OSX JACK MIDI provides 0 jitter and a fixed latency of 1 period MIDI routing. On Linux JACK MIDI provides zero latency, except when there is a midi loop where the latency would fixed at 1 perioud, and zero jitter MIDI routing. These ports show up under the "JACK MIDI" tab in qjackctl</p>
 +
 +<p> JACK MIDI is a framework used to comunicate between JACK MIDI
 +software clients. It provides zero jitter and a fixed latency of 1
 +"period" (the same latency that exists for audio). These ports show up
 +under the "MIDI" tab in qjackctl.
 +</p>
      
 +<p>
 +Various ways of "bridging" between the native MIDI framework
 +(e.g. CoreMIDI or ALSA) and JACK MIDI, as described in the sections
 +below.
 +</p>
 +
  {% children %}