Merge branch 'master' of http://shamusworld.gotdns.org/git/ardour-manual

[ardour-manual-diverged] / master-doc.txt

diff --git a/master-doc.txt b/master-doc.txt
index 08783489cac4a1cb9743ba0b69dda90cb54b9469..84440cacd48a04120239fdaca7b583ccbe380a65 100644 (file)
--- a/master-doc.txt
+++ b/master-doc.txt
@@ -7074,7 +7074,7 @@ part: subchapter
   The <dfn>Transport Bar</dfn> groups all the actions regarding the control of playback and recording.
 </p>
 
-<img src="/images/transport.png" alt="The transport controls" />
+<p class="center"><img src="/images/transport.png" alt="The transport controls" /></p>
 
 <p>
   This bar is made of (from left to right):
@@ -7082,7 +7082,7 @@ part: subchapter
 
 <ul>
   <li>
-    <dfn>Midi Panic</dfn>: allows to immediately stop all midi output.
+    <dfn>Midi Panic</dfn>: Immediately stops all midi output.
   </li>
   <li>
     <dfn>Enable/disable Audio Click</dfn>: Toggles (on/off) a click track (metronome) along the <a href="/tempo-meter/tempo-and-meter/">tempo</a>.
@@ -7094,23 +7094,23 @@ part: subchapter
     <dfn>Go to End of the Session</dfn>: Jumps forward to the end of the session, as defined by the <a href="/working-with-markers/">end marker</a>.
   </li>
   <li>
-    <dfn>Play Loop Range</dfn>: Repeats the defined <a href="/controlling-playback/looping-the-transport/">loop</a> as defined by the <a href="/working-with-markers/loop-range/">Loop range</a>, until the "Stop playback" button is pressed. Clicking the "Play loop Range" button while already active switches to normal Play mode, which allows to exit the loop without stopping and restarting the playback.
+    <dfn>Play Loop Range</dfn>: Repeats the defined <a href="/controlling-playback/looping-the-transport/">loop</a> as defined by the <a href="/working-with-markers/loop-range/">Loop range</a>, until the "Stop playback" button is pressed. Clicking the "Play loop Range" button while already active switches to normal Play mode, which exits the loop without stopping and restarting playback.
   </li>
   <li>
     <dfn>Play Range/Selection</dfn>: If a range has been defined using the Range Mode button, plays the range, of if an audio or MIDI region is selected, plays this region. In both cases, the playback stops at the end of the range or selected region.
   </li>
   <li>
-    <dfn>Play from playhead</dfn>: Starts the playback and optionally record (more bellow).
+    <dfn>Play from playhead</dfn>: Starts the playback and optionally record (more below).
   </li>
   <li>
     <dfn>Stop</dfn>: Whatever the playing mode (loop, range, &hellip;) stops all playback. Depending on other settings, some effects (like chorus or reverb) might still be audible for a while.
   </li>
   <li>
-    <dfn>Toggle Record</dfn>: Global switch button to activate/deactivate recording. While active, the button blinks red. The button doesn't start the recording itself: if one or more tracks are marked as record-enabled, pressing the "Play from Playhead" starts the recording on this/these track(s). See <a href="/recording/">Recording</a>.
+    <dfn>Toggle Record</dfn>: Global switch button to activate/deactivate recording. While active, the button blinks red. The button doesn't start recording by itself: if one or more tracks are marked as record-enabled, pressing the "Play from Playhead" starts recording on those tracks. See <a href="/recording/">Recording</a>.
   </li>
 </ul>
 
-<p class="fixme">Language in the above paragraphs is awkward</p>
+<p class="fixme">Add default keyboard shortcuts to the above.</p>
 
 <p class="note">
   All these actions are bound to keyboard shortcuts, which allows for speedier use and more focused work.
@@ -7145,7 +7145,7 @@ part: subchapter
     <dfn>Follow Edits</dfn> is a toggle that can be used to control whether or not making a selection (range or object) will move the playhead to the start of the selection.
   </li>
   <li>
-    <dfn>Auto Return</dfn> is a toggle switch too. When active, pressing the Stop button returns the playhead to its previous position, and when inactive, pressing Stop keeps the playhead at its current location. Activating Auto Return can be useful for earing back the same part of the audio before and after having tweaked it, without having to loop on it.
+    <dfn>Auto Return</dfn> is a toggle switch too. When active, pressing the Stop button returns the playhead to its previous position, and when inactive, pressing Stop keeps the playhead at its current location. Activating Auto Return can be useful for hearing the same piece of audio before and after tweaking it, without having to set a loop range on it.
   </li>
 </ul>