include/editing-clocks.html

@@ -1,7 +1,7 @@
 <h2>Clock Modes</h2>
 
 <p>
-  Every clock in Ardour has multiple different, selectable <dfn>clock
+  Every clock in Ardour has four different, selectable <dfn>clock
   modes</dfn>. Each mode displays time using different units.
   The clock mode can be changed by <kbd class="mouse">Right</kbd>-clicking
   on the clock and selecting the desired mode from the menu. Some clocks are
@@ -10,60 +10,42 @@
 </p>
 
 <table class="dl">
-  <tr>
-	  <th>Timecode</th>
-	  <td>Time is shown as <dfn><abbr title="Society of Motion Picture and Television Engineers">SMPTE</abbr>
-	  timecode</dfn> in Hours:Minutes:Seconds:Frames, measured from the 
-	  timecode zero point on the timeline (which may not correspond to 
-	  the session start and/or absolute zero on the timeline, depending 
-	  on configurable timecode offsets). The frames value is dictated 
-	  by either the Timecode frames-per-second <a 
-	  href="@@session-properties#properties-timecode">session 
-	  property</a>, or, if slaved to an external timecode master, the 
-	  master's setting. Under the transport clocks is an indication of 
-	  the current timecode source (<samp>INT</samp> means that Ardour 
-	  is its own timecode source).
-	  </td>
-  </tr>
-  <tr>
-	  <th>Bars:Beats</th>
-	  <td>Time is shown as Bars:Beats:Ticks, indicating <dfn>musical 
-	  time</dfn>.
-	  </td>
-  </tr> 
-  <tr>
-	  <th>Minutes:Seconds</th>
-	  <td>Time is shown as Hours:Minutes:Seconds.Milliseconds.
-	  </td>
-  </tr>
-  <tr>
-	  <th>Seconds</th>
-	  <td>Time is shown as Seconds.Deciseconds.
-	  </td>
-  </tr>
-  <tr>
-	  <th>Samples</th>
-	  <td>Time is shown as a <dfn>sample count</dfn>. The number of 
-	  samples per second is given by the current sample rate.
-	  </td>
-  </tr>
+  <tr><th>Timecode</th><td>Time is shown as <dfn><abbr title="Society of Motion Picture and Television
+  Engineers">SMPTE</abbr> timecode</dfn> in Hours:Minutes:Seconds:Frames,
+  measured from the timecode zero point on the timeline (which may not
+  correspond to the session start and/or absolute zero on the timeline,
+  depending on configurable timecode offsets).
+  The frames value is dictated by either the session <abbr title="Frames Per
+  Second">FPS</abbr> setting, or, if slaved to an external timecode master,
+  the master's setting. In the transport clocks, the FPS value is shown below
+  the time display, along with an indication of the current timecode source
+  (<samp>INT</samp> means that Ardour is its own timecode source).</td></tr>
+  <tr><th>BBT</th><td>Time is shown as Bars:Beats:Ticks, indicating <dfn>musical time</dfn> measured
+  from the start of the session. The transport clocks show the current tempo
+  in <abbr title="Beats Per Minute">bpm</abbr> and meter below the time
+  display.</td></tr>
+  <tr><th>Minutes:Seconds</th><td>Time is shown as Hours:Minutes:Seconds.Milliseconds, measured from the
+  absolute start of the timeline (ignoring the session start and any timecode
+  offsets).</td></tr>
+  <tr><th>Samples</th><td>Time is shown as a <dfn>sample count</dfn> from the absolute start of the timeline
+  (ignoring the session start and any timecode offsets). The number of
+  samples per second is given by the current sample rate, and in the transport
+  clocks, this rate is shown below the time display along with any
+  pullup/pulldown adjustment.</td></tr>
 </table>
 
 <h2>Changing clock values with the keyboard</h2>
 
 <p>
-  New values for the clock can be typed in after clicking on the 
-  relevant clock. Clicking on the clock will show a thin vertical 
-  cursor bar just to the right of the next character to be overwritten. 
-  Time should be typed in the same order as the current clock 
-  mode&mdash;if the clock is in Timecode mode, it should be hours, 
-  minutes, seconds, frames. So, to change to a time of 12:15:20:15 one 
-  would type <kbd>1</kbd><kbd>2</kbd><kbd>1</kbd><kbd>5</kbd><kbd>2</kbd>
-  <kbd>0</kbd><kbd>1</kbd><kbd>5</kbd>. 
-  Freshly typed numbers will appear in a different color, from right to 
-  left, overwriting the existing value. Mid-edit, after typing 
-  <kbd>3</kbd><kbd>2</kbd><kbd>2</kbd><kbd>2</kbd> the clock might look 
-  like this:
+  New values for the clock can be typed in after clicking on the relevant clock.
+  Clicking on the clock will show a thin vertical cursor bar just to the right
+  of the next character to be overwritten. Time should be typed in the same
+  order as the current clock mode&mdash;if the clock is in Timecode mode, it
+  should be hours, minutes, seconds, frames. So, to change to a time of
+  12:15:20:15 one would type
+  <kbd>1</kbd><kbd>2</kbd><kbd>1</kbd><kbd>5</kbd><kbd>2</kbd><kbd>0</kbd><kbd>1</kbd><kbd>5</kbd>.
+  Each number typed will appear in a different color, from right to left,
+  overwriting the existing value. Mid-edit, after typing <kbd>3</kbd><kbd>2</kbd><kbd>2</kbd><kbd>2</kbd> the clock might look like this:
 </p>
 
 <figure>
@@ -74,25 +56,24 @@
 </figure>
 
 <p>
-  Finishing the edit is done by pressing <kbd>ENTER</kbd> or 
-  <kbd>Tab</kbd>. The <kbd>ESC</kbd> key allows to exit an edit without 
-  changing the clock. If an entry is mis-typed  so that the new value 
-  would be illegal (for example, resulting in more than 30 frames when 
-  Timecode is set to 30 frames per second), the clock will reset at the 
-  end of the edit, and move the cursor back to the start to allow for 
-  another try.
+  Finishing the edit is done by pressing <kbd>&crarr;</kbd> or <kbd>Tab</kbd>.
+  The <kbd>ESC</kbd> key allows to exit an edit without changing the clock. If an
+  entry is mis-typed  so that the new value would be illegal (for example,
+  resulting in more than 30 frames when Timecode is set to 30 frames per second),
+  the clock will reset at the end of the edit, and move the cursor back to the
+  start to allow for another try.
 </p>
 
 <h2>Avoiding the mouse entirely</h2>
 
 <p>
-  There is a shortcut available to edit the transport clocks entirely 
-  without the mouse. It can be found in the <a 
-  href="@@keyboard-shortcuts">Keyboard Shortcuts</a> window, <kbd 
-  class="menu">Global &gt; Transport &gt; Focus On Clock</kbd>. If 
-  bound to a key (<kbd>/</kbd> by default), then pressing that key is 
-  equivalent to clicking on the primary (left) transport clock, and 
-  editing can begin immediately.
+  There is a shortcut available to edit the transport
+  clocks entirely without the mouse. It can be found in
+  <kbd class="menu">Window &gt; Keyboard Shortcuts &gt; Transport &gt; Focus On
+  Clock</kbd>. If bound to a key (<kbd>&divide;</kbd> on the numerical
+  keypad is the
+  default), then pressing that key is equivalent to clicking on the primary (left)
+  transport clock, and editing can begin immediately.
 </p>
 
 <h2>Entering Partial Times</h2>
@@ -102,7 +83,7 @@
   possible to enter part of a full time value.
 </p>
 <p>
-  As an example, supposing that the clock is in Bars:Beat mode, displaying
+  As an example, supposing that the clock is in BBT mode, displaying
   <samp>024|03|0029</samp>, altering the value to the first beat of the current
   bar can be done by clicking on the clock and typing
   <kbd>0</kbd><kbd>1</kbd><kbd>0</kbd><kbd>0</kbd><kbd>0</kbd><kbd>0</kbd>.
@@ -117,7 +98,7 @@
 
 <p>
   Values can also be typed into the clock that are intended as a relative change,
-  rather than a new absolute value, by <em>ending</em> the edit by pressing
+  rather than a new absolute value, by ending the edit by pressing
   <kbd>+</kbd> or <kbd>-</kbd> (the ones on any keypad will also work). The plus
   key will add the entered value to the current value of the clock, minus will
   subtract it. For example, if the clock is in Samples mode and displays

include/mini-timeline.html

@@ -5,9 +5,10 @@
 </figure>
 
 <p>
-  The mini-timeline allows, as the <a href="@@summary">Summary</a> 
-  does, navigating a session. Its main advantage, though, is that it 
-  stays visible even when in Mixer mode.
+  The mini-timeline allows, as the
+  <a href="@@summary">Summary</a> does, navigation of a
+  session. Its main advantage, though, is that it stays visible even when in
+  Mixer mode.
 </p>
 
 <p>
@@ -17,17 +18,9 @@
 </p>
 
 <p>
-  The mini-timeline shows all markers (<em>start</em>, <em>end</em> and 
-  any user defined ones). Clicking a marker jumps to that point on the 
-  timeline, allowing for quick access to key timings in the session. 
-  The next and previous markers out of the mini-timeline range are 
-  indicated by arrows, as the <em>end</em> marker in the screenshot 
-  above.
-</p>
-
-<p>
-  <a href="@@mixing-linear-nonlinear-workflows">Cue markers</a> are 
-  also displayed, with their play time duration shown by a line.
+  The mini-timeline also shows all markers (start, end and any user
+  defined ones). Clicking a marker jumps to that point on the timeline,
+  allowing for quick access to key timings in the session.
 </p>
 
 <p>
@@ -35,9 +28,9 @@
 </p>
 
 <ul>
-  <li><kbd class="mouse">left</kbd> clicking moves the playhead to the time under the mouse cursor</li>
-  <li>using the <kbd class="mouse">scroll wheel</kbd> scrolls the playhead back and forth inside the session</li>
-  <li>using <kbd class="mod1"></kbd><kbd class="mouse">scroll wheel</kbd> scrolls more finely inside the session</li>
-  <li>using <kbd class="mod1"></kbd><kbd class="mod2"></kbd><kbd class="mouse">scroll wheel</kbd> scrolls even more finely inside the session</li>
+  <li><kbd class=mouse>left</kbd> clicking moves the playhead to the time under the mouse cursor</li>
+  <li>using the <kbd class=mouse>scroll wheel</kbd> scrolls the playhead back and forth inside the session</li>
+  <li>using <kbd class=mod1n></kbd><kbd class=mouse>scroll wheel</kbd> scrolls more finely inside the session</li>
+  <li>using <kbd class=mod12n></kbd><kbd class=mouse>scroll wheel</kbd> scrolls even more finely inside the session</li>
 </ul>
 

include/nudge-controls.html

@@ -1,5 +1,5 @@
 
-<figure class="right">
+<figure class="left">
   <img src="/images/toolbar-nudge.png" alt="Editor toolbar's Nudge">
   <figcaption>
     Editor toolbar's Nudge
@@ -7,34 +7,10 @@
 </figure>
 
 <p>
-  The <dfn>nudge controls</dfn> will move the selected region(s) by a 
-  fixed amount of time. The left and right buttons move either backward 
-  or forward in time, and the small clock to the right of these buttons 
-  sets the amount of time to nudge by.
+  The <dfn>nudge controls</dfn> will move the selected region(s) by a fixed amount of time. The left and right buttons move either backward or forward in time, and the small clock to the left of these buttons sets the amount of time to nudge by. As with all other clocks, you can right-click on the clock to choose the time representation you want to use.
 </p>
 
 <p>
-  The clock, as with all other clocks, can be <kbd 
-  class="mouse">right</kbd>-clicked on to choose the desired <a 
-  href="@@editing-clocks">time representation</a>. The menu also allows :
-</p>
-
-<ul>
-	<li><dfn>Set from Playhead</dfn> : the clock is the current position of the playhead</li>
-	<li><dfn>Locate to this time</dfn> : moves the playhead to the the clock time</li>
-	<li><dfn>Copy to clipboard</dfn> : copies the clock (with formatting) to the clipboard.</li>
-</ul>
-
-<p>
-  Combining these three options allow to e.g. memorize the current 
-  playhead position (<em>Set from playhead</em>) and reposition the 
-  playhead (<em>Locate to this time</em>) at that position after 
-  another edit.
-</p>
-
-<p>
-  If there are no selected objects, the nudge controls can be used to 
-  move the playhead backward or forward by the amount shown on the 
-  clock.
+  If there are no selected objects, the nudge controls can be used to move the playhead backward or forward by the amount shown on the clock.
 </p>
 

include/status-bar.html

@@ -45,7 +45,7 @@
 	<tr>
 		<th>Timecode Format:</th>
 		<td>
-			opens the <em>Timecode</em> section of	the <a href="@@session-properties#properties-timecode">
+			opens the <em>Media</em> section of	the <a href="@@session-properties#properties-timecode">
 			Session Properties</a>
 		</td>
 	</tr>

include/zoom-controls.html

@@ -1,23 +1,14 @@
 
-<figure class="right">
+<figure class="left">
   <img src="/images/toolbar-zoom.png" alt="Editor toolbar's zoom">
   <figcaption>
     Editor toolbar's zoom
   </figcaption>
 </figure>
 
-<p>
-	The zoom controls allow to navigate the session along both the time 
-	and track axes. The controls are described from right to left :
-</p>
+<p>The zoom controls allow to navigate the session along both the time and track axes.</p>
 
-<h2 id="zoom-along-time-axis">Along the time axis</h2>
-
-<p>
-	The drop down <em>Zoom Focus</em> (<kbd class="menu">Playhead</kbd> 
-	by default) menu allows to select a focus point for the zoom, i.e. 
-	the center of the zoom, to choose amongst:
-</p>
+<p>The drop down <kbd class="menu">Zoom Focus</kbd> menu allows to select a focus point for the zoom, i.e. the center of the zoom. The choices are:</p>
 
 <ul>
   <li><dfn>Left</dfn> of the screen</li>
@@ -28,55 +19,22 @@
   <li><dfn>Edit Point</dfn> as set in the <a href="@@edit-point-control">Edit point</a> control.</li>
 </ul>
 
-<p>
-	The two zoom buttons (<kbd class="menu">&minus;</kbd> and <kbd 
-	class="menu">&plus;</kbd>) use this zoom focus to zoom out and in 
-	respectively.
-<p>
+<p>The two leftmost zoom buttons (<kbd class="menu">&minus;</kbd> and <kbd class="menu">&plus;</kbd>) use this zoom focus to zoom out and in respectively.<p>
 
-<p>
-	The <kbd class="menu">[&nbsp;]</kbd> <em>Zoom to session</em> 
-	button is a handy shortcut to zoom out or in until all the session 
-	(as defined by its <a href="@@working-with-markers">start/end 
-	markers</a>) fits horizontally.
-</p>
+<p>The <kbd class="menu">Zoom to session</kbd> button is a handy shortcut to zoom out or in until all the session (as defined by its <a href="@@working-with-markers">start/end markers</a>) fits horizontally.</p>
 
-<h2 id="zoom-along-track-axis">Along the tracks axis</h2>
+<p>Changing the <kbd class="menu">Number of visible tracks</kbd> dropdown menu
+allows to fit this number of tracks vertically in the screen.<p>
 
-<p>
-	Two buttons <kbd class="menu">Shrink tracks</kbd> and 
-	<kbd class="menu">Expand tracks</kbd> reduce or expand the vertical 
-	size of the selected tracks. If no track is selected, all the 
-	tracks will be shrunk or expanded each time the button is pushed.
-</p>
+<p class="note">There <em>is</em> a minimal track height to keep it visible, so
+according to you screen vertical size, some high number can have no effect.</p>
 
-<p>
-	Last, the dropdown menu (<kbd class="menu">*</kbd> by default) 
-	allows changing the number of visible tracks to fit vertically on 
-	screen.
-<p>
-
-<p class="note">
-	There <em>is</em> a minimal track height to keep it visible, so 
-	according to the vertical screen size, some high number can have no 
-	effect.
-</p>
-
-<p>
-	Besides numbers that correspond to the number of tracks to show, 
-	there are two special choices:
-</p>
+<p>Inside this menu are two handy choices:</p>
 
 <ul>
-  <li>
-	<dfn>Selection</dfn> that focus on the selected tracks. If 
-	  the selected tracks are not contiguous, the unselected tracks 
-	  inbetween will be hidden, see the <a 
-	  href="@@the-tracks-and-busses-list">Track and Bus list</a>.
-  </li>
-  <li>
-	  <dfn>All</dfn> that fits all the tracks of the sessions 
-	  vertically (provided there's enough screen estate).
-  </li>
+  <li><dfn>Selected tracks</dfn> that focus on the selected tracks. If the selected tracks are not contiguous, the unselected tracks inbetween will be hidden, see the <a href="@@the-tracks-and-busses-list">Track and Bus list</a>.</li>
+  <li><dfn>All</dfn> that fits all the tracks of the sessions vertically (provided there's enough screen estate).</li>
 </ul>
 
+<p>The rightmost buttons <kbd class="menu">Shrink tracks</kbd> and <kbd class="menu">Expand tracks</kbd> reduce or expand the vertical size of the selected tracks. If no track is selected, all the tracks will be shrunk or expanded each time the button is pushed.
+