summaryrefslogtreecommitdiff
path: root/manual/xml
diff options
context:
space:
mode:
authorPaul Davis <paul@linuxaudiosystems.com>2007-04-26 20:54:31 +0000
committerPaul Davis <paul@linuxaudiosystems.com>2007-04-26 20:54:31 +0000
commit87726495c30f90554b5204b5385d17274a8fe93e (patch)
treed7ecaf0be9b5cbd2afa226cd02cb53a36875d6a2 /manual/xml
parent45d3ec1437cf661533bc7750c623865def4424df (diff)
Merged changes from trunk 1699:1751 into 2.1-staging
git-svn-id: svn://localhost/ardour2/branches/2.1-staging@1752 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'manual/xml')
-rw-r--r--manual/xml/mackie.xml19
1 files changed, 12 insertions, 7 deletions
diff --git a/manual/xml/mackie.xml b/manual/xml/mackie.xml
index da9b6aafeb..829ccb4d5d 100644
--- a/manual/xml/mackie.xml
+++ b/manual/xml/mackie.xml
@@ -136,7 +136,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 +158,9 @@
</entry>
<entry>
- loop
+ <para>loop</para>
+ <para>shift 1: marker</para>
+ <para>shift 2: punch in</para>
</entry>
</row>
@@ -176,7 +178,8 @@
</entry>
<entry>
- click
+ <para>click</para>
+ <para>shift 2: punch out</para>
</entry>
</row>
@@ -190,11 +193,11 @@
</entry>
<entry>
- punch in
+ rewind
</entry>
<entry>
- punch out
+ ffwd
</entry>
</row>
@@ -210,11 +213,13 @@
<row>
<entry>
- previous bank (shift 1 is previous route)
+ <para>previous bank</para>
+ <para>shift 1: previous route</para>
</entry>
<entry>
- next bank (shift 1 is next route)
+ <para>next bank</para>
+ <para>shift 1: next route</para>
</entry>
</row>