More passive form, missing screenshot

diff --git a/include/change-note-properties.html b/include/change-note-properties.html
index 542a5c178186a02c4dd92d1804a9951edba80bad..6f23d36a322afda0375ebcd53114380723f90c79 100644 (file)
--- a/include/change-note-properties.html
+++ b/include/change-note-properties.html
@@ -1,8 +1,8 @@
 
 <p>
-  You can view all the details about a selected note by context-clicking on
-  it. The dialog that pops up will also allow you to modify all the properties
-  of the selected note(s). You can modify individual properties more efficiently
+  All the details about a selected note can be viewed by context-clicking on
+  it. The dialog that pops up will also allow to modify all the properties
+  of the selected note(s). Individual properties can also be modified more efficiently
   using the techniques described below.
 </p>
 
@@ -17,8 +17,8 @@
     <kbd>&darr;</kbd> reduces the pitch of the selected notes.<br>
     If any of the selected notes are already at the maximum or minimum value,
     no changes will be made to any of the notes, to preserve relative pitches.
-    You can override this with <kbd class="mod2"> </kbd>. The default shift
-    distance is one semitone. Use <kbd class="mod3"> </kbd> to alter this to
+    This can be overrode with <kbd class="mod2"> </kbd>. The default shift
+    distance is one semitone. <kbd class="mod3"> </kbd> alters this to
     one octave.
   </td></tr>
   <tr><th>Changing velocity values</th>
@@ -27,10 +27,10 @@
     <br/>
     <kbd class="mod1">&darr;</kbd> reduces the velocity of the selected
     notes.<br>
-    If any of the selected notes are already at the maximum or minumum value,
+    If any of the selected notes are already at the maximum or minimum value,
     no changes will be made to any of the notes, to preserve relative velocities.
-    You can override this with <kbd class="mod2"> </kbd>.
-    You can also press <kbd>v</kbd> to popup a dialog that will allow you to set
+    This can be overrode with <kbd class="mod2"> </kbd>.
+    Also, pressing <kbd>v</kbd> pops up a dialog that will allow to set
     the absolute velocity value of each selected note. Finally, the scroll wheel
     <kbd class="mouse">&uArr;</kbd> <kbd class="mouse">&dArr;</kbd> will also
     adjust notes in the same way as the arrow keys (note that like the arrow keys
@@ -38,7 +38,7 @@
   </td></tr>
   <tr><th>Changing channel</th>
   <td>
-    Press <kbd>c</kbd> to bring up a dialog that allow you to see and alter the
+    Pressing <kbd>c</kbd> brings up a dialog that allows to see and alter the
     MIDI channel of the selected notes. If the selected notes use different
     channels, they will all be forced to the newly selected channel.
   </td></tr>
@@ -47,22 +47,22 @@
     <kbd>,</kbd> (comma) will alter the start time of the note. <br>
     <kbd>.</kbd> (period) will alter the end time of the note. Both keys will by
     default make the note longer (either by moving the start earlier or the end
-    later). For the opposite effect, use <kbd class="mod1">,</kbd>/<kbd
-    class="mod1">.</kbd>. The note will be altered by the current grid setting.
-    To change the start/end positions by 1/128th of a beat, use the <kbd
-    class="mod2"> </kbd> modifier in addition to these shortcuts.
+    later). For the opposite effect, <kbd class="mod1">,</kbd>/<kbd
+    class="mod1">.</kbd> can be used. The note will be altered by the current grid setting.
+    To change the start/end positions by 1/128th of a beat, the <kbd
+    class="mod2"> </kbd> modifier must be added to these shortcuts.
   </td></tr>
   <tr><th>Quantization</th>
   <td>
     <kbd>q</kbd> will quantize the selected notes using the current quantize
     settings. If the quantize settings have not been set for this session yet,
     the quantize dialog will appear. <kbd class="mod2">q</kbd> will display the
-    quantize dialog to allow you to reset the quantize settings, and then
+    quantize dialog to allow to reset the quantize settings, and then
     quantizes the selected notes. The default quantize settings are: quantize
     note starts to the current grid setting, no swing, no threshold, full
     strength.
   </td></tr>
   <tr><th>Step Entry, Quantize etc.</th>
-  <td></td></tr>
+    <td>Refer to the <a href="@@step-entry">Step Entry</a>, <a
+    href="@@quantize-midi">Quantizing MIDI</a>, etc. specific pages.</td></tr>
 </table>
-

diff --git a/include/handling-overlapping-notes.html b/include/handling-overlapping-notes.html
index 4cc371e1f74e5b4c6d8948098e8209c508f20ef6..a79f30512f8ac155480f42c7edb9509fc21dd794 100644 (file)
--- a/include/handling-overlapping-notes.html
+++ b/include/handling-overlapping-notes.html
@@ -9,9 +9,9 @@
   in a DAW—simply overlapping two instances of the same note will do it.
 </p>
 <p>
-  Ardour offers many options for how to deal with instances where you overlap
-  two instances of the same note. Which one to use is a per-session property
-  and can be modified from <kbd class="menu">Session &gt; Properties &gt; Misc &gt; MIDI
+  Ardour offers many options for how to deal with instances where  two instances
+  of the same note overlap. Which one to use is a per-session property and can
+  be modified from <kbd class="menu">Session &gt; Properties &gt; Misc &gt; MIDI
   Options</kbd>.
 </p>
 
@@ -35,6 +35,5 @@
 </p>
 <p class="warning">
   Ardour does not check for note overlaps across tracks or even across regions.
-  If you create these, it is your responsibility to deal with the consequences.
+  Dealing with the consequences is up to the user.
 </p>
-

diff --git a/include/note-cut-copy-and-paste.html b/include/note-cut-copy-and-paste.html
index 0327413f0e159e32a3c7fe2cf1ce988b59365896..fe29f5db14078586a6750eb5e2d983d696b73631 100644 (file)
--- a/include/note-cut-copy-and-paste.html
+++ b/include/note-cut-copy-and-paste.html
@@ -1,9 +1,18 @@
 
 <p>
-  While in note edit mode, selected notes can be cut using
-  <kbd class="mod1">x</kbd>, copied with <kbd class="mod1">c</kbd> and
-  deleted with <kbd>Delete</kbd>, just as regions can. Once cut or
-  copied, they can be pasted at the edit point using
-  <kbd class="mod1">v</kbd>.
-</p>
+  While in <a href="@@add-new-notes">note edit</a> mode, selected notes can be
+  cut and paste as in most software, that is:
+<p>
+
+<ul>
+  <li>cut: <kbd class="mod1">x</kbd></li>
+  <li>copy: <kbd class="mod1">c</kbd></li>
+  <li>delete: <kbd>Delete</kbd></li>
+  <li>paste: <kbd class="mod1">v</kbd>.</li>
+</ul>
 
+<p>
+  These operations use the same keyboard shortcuts as most editing software does,
+  and as Ardour uses for regions. Obviously, the paste operation only works if a
+  cut or copy operation has happened beforehand.
+</p>

diff --git a/include/note-selection.html b/include/note-selection.html
index 753b9a2dbfa4dd07d12fcabd4aad2492158bbfcc..14dc8fc68429d34302fac9eeca655bf9e7778a1c 100644 (file)
--- a/include/note-selection.html
+++ b/include/note-selection.html
@@ -1,22 +1,21 @@
 
 <h2>Selecting/Navigating note-by-note</h2>
 <p>
-  Tab selects the next note. <kbd class="mod1">Tab</kbd> selects the previous
+  <kbd>Tab</kbd> selects the next note. <kbd class="mod1">Tab</kbd> selects the previous
   note. <kbd class="mod3">Tab</kbd> or <kbd class="mod13">Tab</kbd> adds
   the next/previous note to the selection.
 </p>
 
 <h2>Selecting notes with the mouse</h2>
 <p>
-  While in mouse object mode, you can click on a note to select it. Once you
-  have selected one note, <kbd class="mouse mod3">Left</kbd>-click on another
-  to select all notes between them. To add or remove a note to/from the
-  selection, click <kbd class="mouse mod1">Left</kbd>. You can also click and
-  drag outside of a note to <dfn>rubberband select</dfn> a series of notes.
+  While in mouse object mode, any note can be clicked to select it. Once a note
+  has been selected, <kbd class="mouse mod3">Left</kbd>-clicking on another
+  selects all notes between them. Adding or removing a note to/from the
+  selection is done by <kbd class="mouse mod1">Left</kbd> clicking it. Clicking and
+  dragging outside of a note <dfn>rubberband selects</dfn> a series of notes.
 </p>
 <p>
-  Three different selection operations are possible if you switch to mouse
-  range mode:
+  Three different selection operations are possible while in mouse range mode:
 </p>
 <ul>
   <li>
@@ -37,7 +36,6 @@
 <p>
   If <kbd class="menu">Edit &gt; Preferences &gt; MIDI &gt; Sound MIDI notes
   as they are selected</kbd> is enabled, Ardour will send a pair of
-  NoteOn/NoteOff messages through the track, which will typically allow you to
+  NoteOn/NoteOff messages through the track, which will typically allow to
   hear each note as it is selected.
 </p>
-

diff --git a/include/step-entry.html b/include/step-entry.html
index 22d4706ac35b56f913480ff8e9d94a1d33c119af..b6ab75f5f29f0930f0c9cbb183644c92174c82df 100644 (file)
--- a/include/step-entry.html
+++ b/include/step-entry.html
@@ -1,22 +1,30 @@
 
 <p>
-  Sometimes you will  want to edit MIDI data directly from a connected
-  MIDI device like a music keyboard or pad controller. Sometimes you will
-  want to use the mouse. Sometimes you'll want the fine-grain control,
-  precision and speed of entry that comes from using a custom note entry
-  dialog.
+  Editing MIDI can be a tedious task. Ardour allows using a connected
+  MIDI device like a music keyboard or pad controller, or use the mouse.
+  A third option, providing fine-grain control, precision and speed of entry
+  comes from using a custom note entry dialog.
 </p>
 <p>
   The step entry dialog is accessed via a right click context menu on the
-  rec-enable button, because step entry is related to <em>recording</em>
-  MIDI data. You cannot simultaneously step edit and record MIDI via the
-  track's MIDI port.
+  rec-enable button, because step entry is related to <em>recording</em> MIDI
+  data. Step editing and recording MIDI via the track's MIDI port cannot happen
+  simultaneously.
 </p>
-<img src="/images/a3_step_entry.png" />
-<p>The dialog (quite closely modelled on Logic's) contains:</p>
+
+<figure>
+    <img src="/images/a3_step_entry.png" alt="Ardour's Step Entry dialog">
+    <figcaption>
+      Ardour's Step Entry dialog
+    </figcaption>
+</figure>
+
+<p>
+  The dialog (quite closely modelled on Logic's) contains:
+</p>
+
 <ul>
-  <li>
-    Chord entry switch (successive notes are stacked in a chord until
+  <li>Chord entry switch (successive notes are stacked in a chord until
     it is released)</li>
   <li>Note length selectors</li>
   <li>Triplet toggle</li>
@@ -33,17 +41,15 @@
   </li>
   <li>Dynamics controls from pianississimo to fortississimo</li>
   <li>Channel selector</li>
-  <li>
-    Explicit numerical velocity selector, for more precise control
-    than the dynamics selectors offer
-  </li>
+  <li>Explicit numerical velocity selector, for more precise control
+    than the dynamics selectors offer</li>
   <li>Octave selector</li>
   <li>Buttons to add bank or program change events</li>
   <li>a full 10 octave virtual keyboard</li>
 </ul>
+
 <p>
-  More or less all actions in the step entry dialog can be driven
-  directly from the keyboard, so you do not need to keep moving back
-  and forth from keyboard to mouse to do complex data insertion.
+  More or less all actions in the step entry dialog can be driven directly from
+  the keyboard, so that moving back and forth from the keyboard to the mouse is
+  not necessary even for complex data insertion.
 </p>
-

diff --git a/source/images/instrument_plugins-keyboard.png b/source/images/instrument_plugins-keyboard.png
new file mode 100644 (file)
index 0000000..c65c4ff
Binary files /dev/null and b/source/images/instrument_plugins-keyboard.png differ