Prevent crash when loading sessions with unknown plugins.

[ardour.git] / manual / xml / mackie.xml

diff --git a/manual/xml/mackie.xml b/manual/xml/mackie.xml
index a8a3ca012c48882a103202cd51ad7adb9d58ab6c..f8b7a64ba307c6383030d7ad01608e5afb3e6c43 100644 (file)
--- a/manual/xml/mackie.xml
+++ b/manual/xml/mackie.xml
@@ -6,9 +6,12 @@
 
 <section id="sn-mackie">
   <title>Using the Mackie driver for MCU and BCF2000</title>
-  <para>
-               Note: Mackie support is available only for ardour 2.0 beta12 or newer.
-       </para>
+  <note>
+    <para>
+      Mackie support is available only for ardour 2.0 beta12 or newer.
+    </para>
+  </note>
+
   <para>
     This will walk you through the process of configuring and using Mackie
     MCU, or a BCF2000 in
@@ -36,7 +39,7 @@
 
     <para>
       While ardour is not running, edit your
-      <filename>.ardour2/ardour.rc</filename> and add at the top, with the
+      <filename>.ardour3/ardour.rc</filename> and add at the top, with the
       other ports:
 <programlisting>
 &lt;MIDI-port tag="mcu" device="/dev/snd/midiC2D0" type="alsa/raw" mode="duplex"/&gt;
@@ -52,7 +55,7 @@
     <para>
       It is also possible to add MCU extenders, although this is untested
       because nobody we know has access to one right now. To do this, add
-      the following lines to <filename>~/.ardour2/ardour.rc</filename>
+      the following lines to <filename>~/.ardour3/ardour.rc</filename>
 <programlisting>
 &lt;MIDI-port tag="mcu_xt_1" device="/dev/snd/midiC3D0" type="alsa/raw" mode="duplex"/&gt;
 &lt;MIDI-port tag="mcu_xt_2" device="/dev/snd/midiC4D0" type="alsa/raw" mode="duplex"/&gt;
@@ -136,7 +139,7 @@
                   Making a pot pretend to be a shuttle wheel doesn't work
                   very well.
                 </para>
-                </footnote> / nothing
+                </footnote> / global solo
               </entry>
 
               <entry namest="Buttons 1" nameend="Buttons 2">
@@ -158,7 +161,17 @@
               </entry>
 
               <entry>
-                loop (shift2: punch in)
+                <para>
+                  loop
+                </para>
+
+                <para>
+                  shift 1: marker
+                </para>
+
+                <para>
+                  shift 2: punch in
+                </para>
               </entry>
             </row>
 
@@ -176,7 +189,13 @@
               </entry>
 
               <entry>
-                click (shift2: punch out)
+                <para>
+                  click
+                </para>
+
+                <para>
+                  shift 2: punch out
+                </para>
               </entry>
             </row>
 
@@ -210,11 +229,23 @@
 
             <row>
               <entry>
-                previous bank (shift 1: previous route)
+                <para>
+                  previous bank
+                </para>
+
+                <para>
+                  shift 1: previous route
+                </para>
               </entry>
 
               <entry>
-                next bank (shift 1: next route)
+                <para>
+                  next bank
+                </para>
+
+                <para>
+                  shift 1: next route
+                </para>
               </entry>
             </row>