X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=include%2Ftempo-and-meter.html;h=31a1ca3ab067762ce919a7376e8a9501bce83dbe;hb=f8d53fa7c3f6bde67827efe1a03cffc3cd4c1de2;hp=acebf4ec3dd8d7f2a43dd3b43f3a271224e4197c;hpb=fc55149168a9d75cf6760d96558d63cbdbbbc5df;p=ardour-manual

diff --git a/include/tempo-and-meter.html b/include/tempo-and-meter.html
index acebf4e..31a1ca3 100644
--- a/include/tempo-and-meter.html
+++ b/include/tempo-and-meter.html
@@ -1,6 +1,6 @@
 
 <p>
-  Tempo and meter belong together. without both, there is no way to know where
+  Tempo and meter belong together. Without both, there is no way to know where
   a beat lies in time.
 </p>
 
@@ -14,7 +14,8 @@
 <p class="note">
   When performing meter or tempo operations, it is advisable to use the BBT
   ruler (available by right-clicking an existing marker or ruler name), and
-  ensure that the constraint modifier is set (in Preferences->User Interaction)
+  ensure that the constraint modifier is set (<kbd class="mod3n"></kbd> by default, 
+  may be changed in Preferences->Editor->Modifiers)
   so that no other modifiers share its key combination. The constraint modifier
   is the "Constrain drags using: " setting under the "When Beginning a Drag"
   heading. One viable setting is
@@ -30,20 +31,21 @@
 <ul>
   <li>by double clicking on a tempo marker. This opens the tempo dialog which
   allows entering the tempo directly into an entry box.</li>
-  <li>by using the constraint modifier (which is set in Preferences->User
-  Interaction) to drag the beat/bars in the BBT ruler or the tempo/meter lines.
+  <li>by using the constraint modifier (<kbd class="mod3n"></kbd> by default, 
+  may be changed in Preferences->Editor->Modifiers)
+  to drag the beat/bars in the BBT ruler or the tempo/meter lines.
   This is the preferred way to match the tempo to previously recorded
   material.</li>
 
   <p class ="note">
     When dragging the BBT ruler, musical snap has no effect, however be warned
     that non-musical snap is in effect if enabled. Snapping to a minute while
-    dragging a beat may result in some verly slow tempos. Snapping a beat to a
+    dragging a beat may result in some very slow tempos. Snapping a beat to a
     video frame however is an incredibly useful way to ensure a soundtrack is
     punchy and synchronised to the sample.
   </p>
 
-  <li>by holding down the constaint modifier while dragging a tempo vertically.
+  <li>by holding down the constraint modifier while dragging a tempo vertically.
   This is used for more complex tempo solving, as it allows changing of the
   position and tempo of a tempo marker in the same drag; it is, however, a
   useful way to adjust the first tempo for a quick result.</li>
@@ -58,7 +60,7 @@
 </p>
 
 <p>
-  Audio locked tempo marks stay in their frame position as their neigbour's
+  Audio locked tempo marks stay in their frame position as their neighbour's
   positions are altered. Their pulse (musical) position will change as their
   neighbours move. Music locked tempo marks move their frame position as their
   neighbours are moved, but keep their pulse position (they will move as the
@@ -70,12 +72,12 @@
 </p>
 
 <ul>
-  <li>A constant tempo will keep the sesion tempo constant until the next tempo
+  <li>A constant tempo will keep the session tempo constant until the next tempo
   section, at which time it will jump instantly to the next tempo. These are
   mostly useful abrupt changes, and is the way in which traditional DAWs deal
   with tempo changes (abrupt jumps in tempo).</li>
   <li>A ramped tempo increases its tempo over time so that when the next tempo
-  section has arrived, the sesion tempo is the same as the second one. This is
+  section has arrived, the session tempo is the same as the second one. This is
   useful for matching the session tempo to music which has been recorded
   without a metronome. Ramps may also be used as a compositional tool, but more
   on this later. Note that a ramp requires two points&mdash;a start and an end