X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=_manual%2F25_tempo-meter%2F01_tempo-and-meter.html;h=aa137e59a15ff8991cda1574af56ad76eaa9b8e8;hb=907fd498b770b9c2af3711c3ab0b42903d46c1f3;hp=bad765b215abd23b079d922408bed08ed924a5bc;hpb=776c3f6416d3c5163aecb894ea92a7681b914a6c;p=ardour-manual

diff --git a/_manual/25_tempo-meter/01_tempo-and-meter.html b/_manual/25_tempo-meter/01_tempo-and-meter.html
index bad765b..aa137e5 100644
--- a/_manual/25_tempo-meter/01_tempo-and-meter.html
+++ b/_manual/25_tempo-meter/01_tempo-and-meter.html
@@ -6,13 +6,12 @@ menu_title: Tempo and Meter
 
 <p>Tempo and meter belong together. without both, there is no way to know where a beat lies in time.</p>
 
-<p>Tempo provides a musical pulse, which is divided into beats and bars by a meter.</p>
+<p>Tempo provides a musical pulse, which is divided into beats and bars by a meter.
+When you change tempo or move an audio-locked meter, all objects on the timeline that are glued to bars and beats (locations, regions) will move in sympathy.</p>
 
-<br>
 <h3>Tempo</h3>
-</br>
 <br>
-<p>In PROGRAM_NAME, tempo can be adjusted in several ways:
+<p>Tempo can be adjusted in several ways:
 
 <ul><li>by double clicking on a tempo marker.
 this opens the tempo dialog which will allow you to enter the tempo directly into an entry box.
@@ -30,15 +29,15 @@ this is best used for complex tempo solving, as it allows you to change the posi
 it is, however, a useful way to adjust the first tempo for a quick result.
 </li>
 </p>
-<p>Tempo may be locked to audio or musical time. You may change this by right-clicking on a tempo.
+<p>A tempo may be locked to audio or musical time. You may change this by right-clicking on a tempo.
 If a tempo is locked to music, an entry will be available to lock it to audio.
 Similarly an audio-locked tempo may be locked to music by right clicking it an selecting the "Lock to Music" entry.
 </p>
-<p>Audio locked tempos stay in their frame position as their neigbours positions are altered. Their pulse (musical) position will change as their neighbours move.
-Music locked tempos move their frame position as their neighbours are moved, but keep their pulse position (they will move as the music is moved).
+<p>Audio locked tempo marks stay in their frame position as their neigbours 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 music is moved).
 </p>
 <br>
-Tempo may also be remped or constant.
+<em>A tempo may also be remped or constant.</em>
 
 <p>A constant tempo will keep the sesion 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).</p>
@@ -55,10 +54,8 @@ The new tempo will be the same as the tempo at the position of the mouse click (
 <.p>
 <p>To copy a tempo, hold down the primary modifier and drag the tempo you wish to copy.</p>
 
-<br>
 <h3>Meter</h3>
 <br>
-<br>
 <p>Meter positions beats using the musical pulse of a tempo, and groups them into bars using its number of divisions per bar.
 </p>
 <p>The first meter in a new session may be moved freely. It has an associated tempo which cannot be dragged by itself (although all others can).
@@ -84,9 +81,9 @@ If you need another bar, lock the meter to music again (right click->"Lock to Mu
 <br>
 <h3>Techniques </h3>
 <br>
-<p>As a general approach, the best way to control tempo ramps is to use them in pairs (disregarding the first one).
+<p>As a general approach, the best way to control tempo ramps is to use them in pairs.
 </p>
-<p>Lets imagine we want to match PROGRAM_NAMEs click to a drum performance recorded in 'free time'.
+<p>Lets imagine we want to match the click to a drum performance recorded in 'free time'.<br>
 The first thing we need to do is determine where the first beat is. Drag the first meter to that position.
 </p>
 <p>Now the first click will be in time with the first beat. To get all the other beats to align, we listen to the drums
@@ -133,9 +130,8 @@ would be good for this, but you want an accelerando to that point.
 <p>Holding down the constraint modifier, and with snap set to 'TC Frames', grab the BBT ruler just *after* 4|1|0.
 Drag the ruler so that 4|1|0 snaps to the 'phone' frame.
 </p>
-<p>Notice what happened : The second tempo was changed.
-</p>
-<p>You had set a musical position for the second tempo marker. It was not alignaed with the frame you wanted, so
+<p class="note">Notice what happened : The second tempo was changed.<br>
+You had set a musical position for the second tempo marker. It was not aligned with the frame you wanted, so
 you dragged the BBT ruler, making the second tempo provide enough pulses over the ramp for 4|1|0 to align with the desired frame.
 </p>
 <p>If your ramp doesn't feel correct, you may add more points within it and keep adjusting beat positions in a similar manner.