More passive form, updated screenshots, updated 'export' and 'vbap panners'

include/export-dialog.html

@@ -1,18 +1,11 @@
 
 <p>
-  When you have finished mixing your session, you probably want to export it to a sound
+  When a session is finished mixing, one probably wants to export it to a sound
   file to burn to a CD, upload to the web, or whatever. <kbd class="menu">Session &gt; Export &gt; Export to Audio file(s)&hellip;</kbd>
   shows the Export Dialog to do this.
 </p>
 
-<p>
-  You can also export the outputs of multiple tracks and busses all at once via
-  <kbd class="menu">Session &gt; Export &gt; Stem Export&hellip;</kbd>.
-</p>
-
-<h2>File Format</h2>
-
-<figure>
+<figure class="center">
   <img src="/images/export-dialog-file-format.png" alt="The Export window">
   <figcaption>
     The Export window
@@ -20,45 +13,57 @@
 </figure>
 
 <p>
-  This tab contains controls for the format of the exported audio file.
-  You can enable more than one format here, in which case each will be exported in turn.
+  The outputs of multiple tracks and busses all at once can also be exported via
+  <kbd class="menu">Session &gt; Export &gt; Stem Export&hellip;</kbd>.
+</p>
+
+<h2>File Format</h2>
+
+<p>
+  This tab contains controls for the format of the exported audio file(s).
+  More than one format can be enabled here, in which case each will be exported in turn.
   Ardour is supplied with a list of export formats, including:
 </p>
 
 <ul>
+<li>BWAV 32float</li>
 <li>CD (Red Book)</li>
 <li>DVD-A</li>
 <li>FLAC 24 bit </li>
 <li>FLAC 24 bit (tagged)</li>
-<li>Ogg_Vorbis</li>
-<li>Ogg_Vorbis (tagged)</li>
+<li>Ogg/Vorbis</li>
+<li>Ogg/Vorbis (tagged)</li>
 <li>Ring Tone</li>
 </ul>
 
 <p>
-  You can edit these formats, or create your own, with the <a href="@@export-format-profiles">"Edit Export Format Profile"</a> dialog, which
-  appears when you click the "Edit" or "New" button to the right of the drop-down list of formats.
+  These formats can be edited, or new ones created, with the <a
+  href="@@export-format-profiles">"Edit Export Format Profile"</a> dialog, which
+  appears when clicking the <kbd class="menu">Edit</kbd> or
+  <kbd class="menu">New</kbd> buttons to the right of the drop-down list of
+  formats.
 </p>
 
 <p>
-  You can also create a 'Preset' consisting of one or more formats. Ardour provides some ready-made presets, too:
+  Presets can also be created, consisting of one or more formats. Ardour
+  provides some ready-made presets, too:
 </p>
 
 <ul>
 <li>CD + DVD-A</li>
 <li>CD + FLAC</li>
 <li>CD + FLAC (tagged)</li>
-<li>CD + Ogg_Vorbis + FLAC (tagged)</li>
-<li>CD + Ogg_Vorbis</li>
-<li>CD + Ogg_Vorbis (tagged)</li>
+<li>CD + Ogg/Vorbis + FLAC (tagged)</li>
+<li>CD + Ogg/Vorbis</li>
+<li>CD + Ogg/Vorbis (tagged)</li>
 <li>CD only</li>
 <li>DVD-A only</li>
 <li>FLAC</li>
 <li>FLAC (tagged)</li>
-<li>Ogg_Vorbis + FLAC</li>
-<li>Ogg_Vorbis + FLAC (tagged)</li>
-<li>Ogg_Vorbis </li>
-<li>Ogg_Vorbis (tagged)</li>
+<li>Ogg/Vorbis + FLAC</li>
+<li>Ogg/Vorbis + FLAC (tagged)</li>
+<li>Ogg/Vorbis </li>
+<li>Ogg/Vorbis (tagged)</li>
 </ul>
 
 <h2>The location</h2>
@@ -83,30 +88,12 @@
   <li>A time (also in multiple format).</li>
 </ul>
 
-<h2>Soundcloud upload</h2>
-<p>
-  When 'Upload to Soundcloud' is ticked on in any format's tab, a pane containing fields
-  to enter in Soundcloud account details (email and password), and what should happen
-  to the uploaded files will become visible.
+<p class="note">
+  As in the screenshot above, when writing a file could erase a present file with
+  the same name, Ardour shows a yellow warning line in the bottom of the window, and
+  a button to list all the files that would be erased and replaced.
 </p>
 
-<figure>
-  <img src="/images/soundcloud-upload.png" alt="Exporting to Soundcloud">
-  <figcaption>
-    Exporting to Soundcloud
-  </figcaption>
-</figure>
-
-<table class="dl">
-  <tr><th>Make files public</th>
-      <td>Choose whether to make uploaded files available to anyone via the Soundcloud web site.</td></tr>
-  <tr><th>Open uploaded files in browser</th>
-      <td>Open each file on soundcloud in your browser after upload.
-      If you don't enable this, you can still see the URLs in the Log window.</td></tr>
-  <tr><th>Make files downloadable</th>
-      <td>Choose whether to allow downloading of files uploaded to Soundcloud.</td></tr>
-</table>
-
 <h2>Analyze exported audio</h2>
 
 <figure>
@@ -155,8 +142,16 @@
 </figure>
 
 <p>
-  This tab allows you to select the range (or ranges) of the timeline to export. By default, "session" is
+  This tab allows to select the range (or ranges) of the timeline to export. By default, "session" is
   enabled&mdash;this will export the whole session from the start marker to the end marker.
+  Any loop or range present in the session can be chosen, or a combination thereof.
+</p>
+<p>
+  The realtime checkboxes allow to export audio as it is played,
+  and not freewheeling to render the file as fast as Ardour can. This can prevent
+  odd behaviours from some plugins (reverbs, etc...). This can be chosen globally
+  (with the <kbd class="option">Realtime Export</kbd> checkbox at the top) or individually on a per time span basis, with
+  the <kbd class="option">RT</kbd> checkbox next to each time span.
 </p>
 
 <h2>Channels</h2>
@@ -169,7 +164,8 @@
 </figure>
 
 <p>
-  Here you can choose which outputs (tracks or busses) should be sent to the exported file.
+  This tab decides which outputs (tracks or busses) should be sent to the exported
+  file. By default, only the Master Bus is sent.
 </p>
 
 <h2>Stem Export</h2>
@@ -182,10 +178,16 @@
 </figure>
 
 <p>
-  If you chose 'Stem Export', the 'Channels' tab appears slightly differently:
-  in this case each chosen channel (track or bus) is exported to its own file,
-  instead of all channels being mixed together into a single file. You can
-  choose to export either the region contents or the track output here in this
-  case.
+  Stem exporting allows to transfer files between different systems and softwares
+  by exporting each track individually, including silence, to keep them in sync.
+</p>
+<p>
+  If 'Stem Export' is chosen, the 'Channels' tab appears slightly differently:
+  in this case each chosen channel (track or bus) is exported to its own file,
+  instead of all channels being mixed together into a single file.
+</p>
+<p>
+  The exported tracks or busses can, by checking <kbd class="option">Apply
+  track/bus processing</kbd>, be exported with the effects/processors applied,
+  so that the destination system does not need those effects plugins.
 </p>
-

include/export-format-profiles.html

@@ -7,111 +7,138 @@ audio files, and also other audio file export options.
 </p>
 
 <p>
-Export Format Profiles are edited via the 'Edit Export Format Profile' dialog.
+  Export Format Profiles are edited via the <kbd class="menu">Edit Export Format
+  Profile</kbd> dialog.
 </p>
 
-<img src="/images/edit-export-format-profile.png" />
-<p>
+<figure class="right">
+  <img src="/images/edit-export-format-profile.png" alt="The 'Edit Export Format Profile' dialog">
+  <figcaption>
+    The 'Edit Export Format Profile' dialog
+  </figcaption>
+</figure>
+
 <h3>Normalize</h3>
 <p>
-If enabled, peak levels of exported files will be normalized to the level chosen here.
+  If enabled, levels of exported files will be normalized to the level chosen here.
+  The normalization can be either:
 </p>
 
-<h3>Trim/Add silence at start/end</h3>
+<ul>
+  <li>Peak, which adjusts the gain to bring the highest signal peak to the
+    chosen level (in <acronym title="decibels relative to full scale">dBFS</acronym>),</li>
+  <li>Loudness, which adjusts the gain to bring the average amplitude to the
+    chosen level (in <acronym title="loudness units relative to full scale">LUFS</acronym>),
+    without exceeding the chosen true-peak value (in
+    <acronym title="decibels true peak">dBTP</acronym>).
+    EBU R128 is only available for mono or stereo sounds while true'peak works
+    for any channel layout.</li>
+</ul>
+
+<h3>Trim silence at start/end</h3>
 <p>
-
+  These checkboxes allow to remove any part Ardour considers silent (0dB),
+  at the beginning or/and end of each exported track.
 </p>
 
+<h3>Add silence at start/end</h3>
+<p>
+  These checkboxes allow to add silence at the beginning or/and end of each
+  exported track. The duration of the added silence can be manually fixed in the
+  adjascent 'timer' input fields.
+
 <h3>Compatibility/Quality/File format/Sample rate</h3>
+
 <h4>Compatibility</h4>
 <p>
-Selecting an item in the 'Compatibility' column will display options in the
-other columns that are incompatible with that item in red.
+  Selecting an item in the 'Compatibility' emphasizes the settinggs in the other
+  columns that are compatible with the selected standard, by turning incompatible
+  options red. When an incompatible quality/format/sample rate is selected, the
+  compatibility column checkbox disapears.
 </p>
 
 <h4>Quality</h4>
 <p>
-The appropriate item in the 'Quality' column will be highlighted when you
-choose a file format. Clicking on items in the 'Quality' column currently
-doesn't seem to do anything useful.
+  The appropriate item in the 'Quality' column will be highlighted a file format
+  is chosen. At the moment, selecting a Quality settings does not show the
+  compatible File formats.
 </p>
 
 <h4>File format</h4>
 <p>
-This column contains a list of Ardour's supported export file types. Click on
-the format you want to use.
+  This column contains a list of Ardour's supported export file types. Selecting
+  one updates the options underneath it.
 </p>
 
 <h4>Sample rate</h4>
 <p>
-You can explicitly choose the sample rate of your exported files here, or
-choose 'Session rate' to export in the current session's sample rate, without
-sample rate conversion.
+  A specific sample rate can be chosen for the exported files, or the current session's
+  sample rate (by choosing 'Session rate'), without sample rate conversion.
 </p>
 
 <h4>Sample rate conversion quality</h4>
 <p>
-If your chosen sample rate does not match the current session's sample rate,
-choose the sample rate conversion quality here. Better quality options are
+  In case the chosen sample rate does not match the current session's sample rate,
+  the sample rate conversion quality can be chosen here. Better quality options are
   slower.
 </p>
 
+<h3>Format Options</h3>
+<p>
+  Options relevant to the chosen file format will appear just under the
+  Compatibility/Quality/File format/Sample rate table.
+</p>
+
+<h4>Tag with session's metadata</h4>
+<p>
+  If the exported file format supports metadata (e.g. FLAC, Ogg Vorbis), use data
+  entered in the <a href="@@metadata">Session Metadata</a> window to tag the
+  exported files.
+</p>
+
+<h4>Sample Format and Dithering</h4>
+<p>
+  The <kbd class="menu">Sample Format</kbd> is the bit depth of exported files,
+  i.e. the numbers of values a sample can have. Increasing the sample format
+  results in a better defined audio file at the cost of increasing the file size.
+</p>
+<p>
+  If the exported files bit depth is less than Ardour's native bit depth
+  (32 bits floating point by default), the dithering algorithm, that chooses how
+  to compute the conversion can be chosen in the <kbd class="menu">Dithering</kbd>
+  column.
+</p>
+
 <h3>Options</h3>
 <p>
-Options relevant to the chosen file format will appear here.
-Categories of audio file format are:
-<ul>
-<li>Linear encoding</li>
-<li>Broadcast Wave</li>
-<li>Ogg Vorbis</li>
-<li>FLAC</li>
-</ul>
-
-<p>
-Available options include a selection of the following:</p>
-
-<h4>Sample Format</h4>
-<p>
-Choose the bit depth of exported files.
+  These options are presented whatever the chosen format is:
 </p>
 
-<h4>Dithering</h4>
+<h4>Create CUE/TOC/chapter mark file</h4>
 <p>
-If the exported files bit depth is less than Ardour's native bit depth,
-choose the dithering algorithm to use.
-</p>
-
-<h4>Create CUE file/Create TOC file</h4>
-<p>
-As well as exporting an audio file, create a file (in CUE or TOC format
+  As well as exporting an audio file, Ardour can create a file (in CUE, TOC or MP4ch format
   respectively) containing CD track information, as defined in the
   <a href="@@the-ranges-and-marks-lists">Ranges &amp; Marks List</a>.
-
-
-<h4>Tag with session's metadata</h4>
-<p>
-If the exported file format supports metadata, use data entered in the
-<a href="@@metadata">Session Metadata</a>
-window to tag the exported files.
-</p>
-
+  Those files can then be used to either burn a CD or DVD, or to create "chapters"
+  inside a compatible mp4 video container.
 
 <h3>Label</h3>
 <p>
-The 'Label' field lets you choose the name which will be shown for this format
-in the drop-down list of export formats in the 'File Formats' tab of the
-<a href="@@export-dialog">Export dialog</a>.
+  The <kbd class="menu">Label</kbd> field allows to choose the name which will be
+  shown for this format in the drop-down list of export formats in the
+  'File Formats' tab of the <a href="@@export-dialog">Export dialog</a>.
+</p>
 
 <h3>Command to run post-export</h3>
 <p>
   If this is not blank, it is considered as a command to be run after the export
-of each file. Either the command must exist in $PATH, or you can specify an
-absolute path to an executable file here.
+  of each file. Either the command must exist in $PATH, or an absolute path to
+  an executable file can be specified here.
 </p>
 
 <p>
-Certain sequences are allowed here to stand for the exported file name and the
-like. Currently these are:
+  Certain sequences are allowed here to stand for the exported file name and
+  various parameters. Currently these are:
 <table class="dl">
 <tr><th><code>%f</code></th>
 <td>Full path and filename of the exported audio file</td></tr>
@@ -126,6 +153,13 @@ like. Currently these are:
 <tr><th><code>%%</code></th>
 <td>A literal percent sign</td></tr>
 </table>
+
 <p>
   Any part of the command-line enclosed in double-quotes (") will be used as-is.
+</p>
 
+<p>
+  As an exemple, exporting an mp3 file can be done by inserting <code>lame -b320 %f</code>
+  which will convert the exported audio file ('%f') to a 320 kbs mp3 using the lame encoder
+  (provided lame is installed first on the system).
+</p>

include/getting-more-plugins.html

@@ -9,61 +9,36 @@
 <h3 id="LADSPA">LADSPA</h3>
 
 <ul>
-<li>AMB <a href="http://kokkinizita.linuxaudio.org/linuxaudio/">http://kokkinizita.linuxaudio.org/linuxaudio/</a>
-</li>
-<li>Blepvco <a href="http://smbolton.com/linux.html">http://www.smbolton.com/linux.html</a>
-</li>
-<li>Blop <a href="http://blop.sourceforge.net/">http://blop.sourceforge.net/</a>
-</li>
-<li>CAPS <a href="http://quitte.de/dsp/caps.html">http://quitte.de/dsp/caps.html</a>
-</li>
-<li>CMT <a href="http://www.ladspa.org/cmt/overview.html">http://www.ladspa.org/cmt/overview.html</a>
-</li>
-<li>FIL <a href="http://kokkinizita.linuxaudio.org/linuxaudio/">http://kokkinizita.linuxaudio.org/linuxaudio/</a>
-</li>
-<li>FOO <a href="http://code.google.com/p/foo-plugins/">http://code.google.com/p/foo-plugins/</a>
-</li>
-<li>MCP <a href="http://kokkinizita.linuxaudio.org/linuxaudio/">http://kokkinizita.linuxaudio.org/linuxaudio/</a>
-</li>
-<li>NJL <a href="https://github.com/tialaramex/njl-plugins">https://github.com/tialaramex/njl-plugins</a>
-</li>
-<li>Omins <a href="http://www.nongnu.org/om-synth/omins.html">http://www.nongnu.org/om-synth/omins.html</a>
-</li>
-<li>REV <a href="http://kokkinizita.linuxaudio.org/linuxaudio/">http://kokkinizita.linuxaudio.org/linuxaudio/</a>
-</li>
-<li>SWH <a href="http://plugin.org.uk/">http://plugin.org.uk/</a>
-</li>
-<li>TAP <a href="http://tap-plugins.sourceforge.net/">http://tap-plugins.sourceforge.net/</a>
-</li>
-<li>VCF <a href="http://users.suse.com/~mana/ladspa.html">http://www.suse.de/~mana/ladspa.html</a>
-</li>
-<li>VCO <a href="http://kokkinizita.linuxaudio.org/linuxaudio/">http://kokkinizita.linuxaudio.org/linuxaudio/</a>
-</li>
-<li>VLevel <a href="http://vlevel.sourceforge.net/about/">http://vlevel.sourceforge.net/</a>
-</li>
-<li>Vocoder <a href="http://www.sirlab.de/linux/download_vocoder.html">http://www.sirlab.de/linux/download_vocoder.html</a>
-</li>
-<li>WASP <a href="http://linux01.gwdg.de/~nlissne/wasp/index.html">http://linux01.gwdg.de/~nlissne/wasp/index.html</a> (mar wanted!)
-</li>
-<li>Nova <a href="http://klingt.org/~tim/nova-filters/">http://klingt.org/~tim/nova-filters/</a>
-</li>
-<li>Socal’s LEET Plugins <a href="http://code.google.com/p/leetplugins/">http://code.google.com/p/leetplugins/</a>
-</li>
-<!--<li>Holap synthesizer and DSP effects <a href="http://holap.berlios.de/">http://holap.berlios.de/</a>
-</li>-->
+<li>AMB <a href="http://kokkinizita.linuxaudio.org/linuxaudio/">http://kokkinizita.linuxaudio.org/linuxaudio/</a></li>
+<li>Blepvco <a href="http://smbolton.com/linux.html">http://www.smbolton.com/linux.html</a></li>
+<li>Blop <a href="http://blop.sourceforge.net/">http://blop.sourceforge.net/</a></li>
+<li>CAPS <a href="http://quitte.de/dsp/caps.html">http://quitte.de/dsp/caps.html</a></li>
+<li>CMT <a href="http://www.ladspa.org/cmt/overview.html">http://www.ladspa.org/cmt/overview.html</a></li>
+<li>FIL <a href="http://kokkinizita.linuxaudio.org/linuxaudio/">http://kokkinizita.linuxaudio.org/linuxaudio/</a></li>
+<li>FOO <a href="http://code.google.com/p/foo-plugins/">http://code.google.com/p/foo-plugins/</a></li>
+<li>MCP <a href="http://kokkinizita.linuxaudio.org/linuxaudio/">http://kokkinizita.linuxaudio.org/linuxaudio/</a></li>
+<li>NJL <a href="https://github.com/tialaramex/njl-plugins">https://github.com/tialaramex/njl-plugins</a></li>
+<li>Omins <a href="http://www.nongnu.org/om-synth/omins.html">http://www.nongnu.org/om-synth/omins.html</a></li>
+<li>REV <a href="http://kokkinizita.linuxaudio.org/linuxaudio/">http://kokkinizita.linuxaudio.org/linuxaudio/</a></li>
+<li>SWH <a href="http://plugin.org.uk/">http://plugin.org.uk/</a></li>
+<li>TAP <a href="http://tap-plugins.sourceforge.net/">http://tap-plugins.sourceforge.net/</a></li>
+<li>VCF <a href="http://users.suse.com/~mana/ladspa.html">http://www.suse.de/~mana/ladspa.html</a></li>
+<li>VCO <a href="http://kokkinizita.linuxaudio.org/linuxaudio/">http://kokkinizita.linuxaudio.org/linuxaudio/</a></li>
+<li>VLevel <a href="http://vlevel.sourceforge.net/about/">http://vlevel.sourceforge.net/</a></li>
+<li>Vocoder <a href="http://www.sirlab.de/linux/download_vocoder.html">http://www.sirlab.de/linux/download_vocoder.html</a></li>
+<li>WASP <a href="http://linux01.gwdg.de/~nlissne/wasp/index.html">http://linux01.gwdg.de/~nlissne/wasp/index.html</a> (mar wanted!)</li>
+<li>Nova <a href="http://klingt.org/~tim/nova-filters/">http://klingt.org/~tim/nova-filters/</a></li>
+<li>Socal’s LEET Plugins <a href="http://code.google.com/p/leetplugins/">http://code.google.com/p/leetplugins/</a></li>
+<!--<li>Holap synthesizer and DSP effects <a href="http://holap.berlios.de/">http://holap.berlios.de/</a></li>-->
 </ul>
 
 <h3 id="LV2">LV2</h3>
 
 <ul>
-<li>SWH <a href="http://plugin.org.uk/lv2/">http://plugin.org.uk/lv2/</a>
-</li>
-<li>ll-plugins <a href="http://ll-plugins.nongnu.org/">http://ll-plugins.nongnu.org/</a>
-</li>
-<li>zynadd <a href="http://home.gna.org/zyn/">http://home.gna.org/zyn/</a>
-</li>
-<li>LinuxDSP <a href="http://www.overtonedsp.co.uk/download/linuxdsp-archive/">http://www.overtonedsp.co.uk/download/linuxdsp-archive/</a>
-</li>
+<li>SWH <a href="http://plugin.org.uk/lv2/">http://plugin.org.uk/lv2/</a></li>
+<li>ll-plugins <a href="http://ll-plugins.nongnu.org/">http://ll-plugins.nongnu.org/</a></li>
+<li>zynadd <a href="http://home.gna.org/zyn/">http://home.gna.org/zyn/</a></li>
+<li>LinuxDSP <a href="http://www.overtonedsp.co.uk/download/linuxdsp-archive/">http://www.overtonedsp.co.uk/download/linuxdsp-archive/</a></li>
 <li>Invada Studio <a href="https://launchpad.net/invada-studio/">https://launchpad.net/invada-studio/</a></li>
 </ul>
 
@@ -75,20 +50,20 @@
   <li>Argotlunar <a href="http://argotlunar.info/">http://argotlunar.info/</a></li>
 </ul>
 
-<h2>How do I install plugins?</h2>
+<h2>How to install plugins?</h2>
 
 <h3>Linux</h3>
 
 <p>
-  <dfn>Installation</dfn> will vary a little depending on how you get plugins.  If
-  your repository has a particular plugin package, just install it using
-  the normal software package management tool for your system. Most
-  Linux distributions that are good for audio work will have most of
-  the LADSPA and LV2 plugins mentioned above available in ready-to-use
-  forms.
+  <dfn>Installation</dfn> will vary a little depending on how the plugins have
+  been obtained. If a particular plugin package appears in the local repository,
+  installing it using is done by using the normal software package management
+  tool for the system. Most Linux distributions that are good for audio work
+  will have most of the LADSPA and LV2 plugins mentioned above available in
+  ready-to-use form.
 </p>
 <p>
-  Finding them will typically require <em>searching</em> your
+  Finding them will typically require <em>searching</em> the
   distribution's repository to find the name of the package. The tools
   for doing this vary from distribution to distribution. A good place
   to start searching is with the name of the package (e.g. "caps" or
@@ -96,36 +71,34 @@
   distributions call their packages for a given set of plugins.
 </p>
 <p>
-  If the package isn't available, then you can build the plugins from
-  source (plugins are generally fairly easy to compile if you've ever
-  done this sort of thing before).
+  If the package isn't available, then the plugins can be built from
+  source (plugins are generally fairly easy to compile and well-documented).
 </p>
 <p>
   LADSPA plugins are shared library files. They need to be installed
   in either /usr/lib/ladspa, /usr/local/lib/ladspa or in a directory
-  mentioned in your LADSPA_PATH environment variable.
+  mentioned in the local LADSPA_PATH environment variable.
 </p>
 <p>
   LV2 plugins are folders/directories. They need to be
   installed in either /usr/lib/lv2, /usr/local/lib/lv2 or a directory
-  mentioned in your LV2_PATH environment variable.
+  mentioned in the local LV2_PATH environment variable.
 </p>
 <p>
   Linux VST (LXVST) plugins are distributed as shared library
   files. They are typically installed in /usr/lib/lxvst,
-  /usr/local/lib/lxvst or a directory mentioned in your LXVST_PATH
+  /usr/local/lib/lxvst or a directory mentioned in the local LXVST_PATH
   environment variable.
 </p>
 
 <h3>OS X</h3>
 <p>
-  Unless you're a particularly technical computer user, building and
+  Except for the particularly technical computer user, building and
   installing plugins in the LV2 (or LADSPA) format is probably not
   something worth planning on.
 </p>
 <p>
-  Most of the plugins you are likely to use on OS X will be in Apple's
+  Most of the plugins likely to be used on OS X will be in Apple's
   AudioUnit format. These have their own installation process that tends to
   just work.
 </p>
-

include/managing-plugin-presets.html

@@ -5,7 +5,12 @@
   These include 4 controls for managing <dfn>plugin presets</dfn>.
 </p>
 
-<p class=fixme>Add pictures</p>
+<figure class="center">
+  <img src="/images/plugins_preset_bar.png" alt="The plugin presets toolbar">
+  <figcaption>
+    The plugin presets toolbar.
+  </figcaption>
+</figure>
 
 <h2>What Is a Plugin Preset?</h2>
 
@@ -20,45 +25,43 @@
 <h2>The Preset Selector</h2>
 
 <p>
-  The <dfn>preset selector</dfn> is a regular selector that can be
+  The <dfn>preset selector</dfn> (1) is a regular selector that can be
   clicked to display a list of all known presets for this plugin. This
-  will include presets that you have created yourself, and for some
+  will include presets that have been created by the user, and for some
   plugin formats, presets that come with the plugin itself.
 </p>
 
-<h2>Load a New Preset</h2>
+<h2>Loading a New Preset</h2>
 
 <p>
-  Click on the preset selector to pop up a menu showing the names of
-  all available presets. Click on the name of the preset you wish to load.
-  The preset will be loaded&mdash;you may see various controls in the
-  plugin editor change to reflect the new value of some or all parameters.
+  Clicking on the preset selector pops up a menu showing the names of
+  all available presets. Clicking on the name of a preset loads it, and various
+  controls in the plugin editor change to reflect the new value of some or all
+  parameters.
 </p>
 
-<h2>Create a Preset</h2>
+<h2>Creating a Preset</h2>
 
 <p>
-  To save the current plugin settings as a new preset, click on the
-  <kbd class="menu">Add</kbd> button at the top of the window. A dialog
-  will appear to ask for the name of the preset.
+  Saving the current plugin settings as a new preset is done by clicking on the
+  <kbd class="menu">Add</kbd> button (2) at the top of the window. A dialog
+  will appear asking for a name for the preset.
 </p>
 
-<h2>Save a Preset</h2>
+<h2>Saving a Preset</h2>
 
 <p>
-  If you wish to modify the settings in an existing preset, first use
-  the preset selector to load the preset, then adjust the settings as
-  you wish. When done, click the <kbd class="menu">Save</kbd> button
-  and the new values will be stored, overwriting the previous version
-  of this preset.
+  To modify the settings in an existing preset, the preset selector must be used
+  to load the preset, then, when the settings have been adjusted, the
+  <kbd class="menu">Save</kbd> button (3) clicked. The new values will be stored,
+  overwriting the previous version of this preset.
 </p>
 
-<h2>Delete a preset</h2>
+<h2>Deleting a preset</h2>
 
 <p>
-  To delete an existing preset, use the preset selector to load the preset.
-  Click the <kbd class="menu">Delete</kbd> button, and the preset will be
-  removed. The preset selector turn blank, showing that no preset is
+  Deleting an existing preset is achieved by loading the preset first, then
+  clicking the <kbd class="menu">Delete</kbd> button (4). The preset will be
+  removed, and the preset selector turns blank, showing that no preset is
   currently loaded (although the settings will stay as they were).
 </p>
-

include/vbap-panner.html

@@ -1,8 +1,8 @@
 
 <p class="warning">
   Ardour's VBAP panner is currently in development, and its semantics may
-  change in the near future, possibly affecting your mixes. Please do not
-  rely on it for important production work while the dust settles.<br/>
+  change in the near future, possibly affecting mixes using it. It is advised not
+  to rely on it for important production work while the dust settles.<br/>
   The Panner only works in fixed static mode, it does not support
   automation playback.
 </p>
@@ -15,7 +15,7 @@
 
 <h2>Basic concepts</h2>
 <p>
-  VBAP was developed by Ville Pulkki at Aalto University, Helsinki, in 2001.
+  VBAP was developed by Ville Pulkki at Aalto University, Helsinki, in 1997.
   It works by distributing the signal to the speakers nearest to the desired
   direction with appropriate weightings, aiming to create a maximally sharp
   phantom source by using as few speakers as possible:
@@ -28,15 +28,15 @@
   <li>and three speakers in the general 3D case.</li>
 </ul>
 <p>
-  Thus, if you move the panner onto a speaker, you can be sure that only
-  this speaker will get any signal. This is handy when you need precise
-  1:1 routing.<br>
-  The drawback of VBAP is that a moving source will constantly change its
-  apparent sharpness, as it transitions between the three states mentioned
-  above.
+  Thus, if the panner is moved onto a speaker, only this speaker will get any
+  signal. This is handy when precise 1:1 routing is needed.
 </p>
 <p>
-  A <dfn>horizontal</dfn> VBAP panner has one parameter, the <dfn>azimuth
+  The drawback of VBAP is that a moving source will constantly change its
+  apparent sharpness, as it transitions between the three states mentioned above.
+</p>
+<p>
+  An <dfn>horizontal</dfn> VBAP panner has one parameter, the <dfn>azimuth
   angle</dfn>. A <dfn>full-sphere</dfn> panner offers an additional
   <dfn>elevation angle</dfn> control.
 </p>
@@ -49,6 +49,14 @@
 </p>
 
 <h2>Speaker layout</h2>
+
+<figure class="right">
+  <img class="mini" src="/images/VBAP-panner-5.png" alt="The VBAP panner with 5 outputs">
+  <figcaption>
+    The VBAP panner with 5 outputs
+  </figcaption>
+</figure>
+
 <p>
   Each VBAP panner is specific to its <dfn>speaker layout</dfn>&mdash;the
   panner has
@@ -56,17 +64,25 @@
   implementation must therefore include the possibility to define this
   layout.
 </p>
-<a href="/images/VBAP-panner-5.png"><img src="/images/VBAP-panner-5.png" class="right" style="width:150px;" alt="The VBAP panner with 5 outputs"></a>
+
 <p>
   Ardour currently uses a simplified approach: if a track or bus has more
-  than two output channels (which implies stereo), it assumes that you
-  have N speakers distributed in a regular N-gon. That means that for
-  irregular layouts such as 5.1 or 7.1, the direction you dial in will
-  differ a bit from the actual auditory result, but you can still achieve
-  any desired spatialisation.
+  than two output channels (which implies stereo), it assumes that there are
+  N speakers distributed in a regular N-gon. That means that for
+  irregular layouts such as 5.1 or 7.1, the direction dialed in will
+  differ a bit from the actual auditory result, but any desired spatialisation
+  can still be achieved.
 </p>
-<h3>Experimental 3D VBAP</h3>
-<a href="/images/VBAP-panner-10.png"><img src="/images/VBAP-panner-10.png" class="right" style="width:150px;" alt="The VBAP panner with 10 outputs, in experimental 3D mode"></a>
+
+<h3 class="clear">Experimental 3D VBAP</h3>
+<figure class="right">
+  <img class="mini" src="/images/VBAP-panner-10.png" alt="The VBAP panner with 10 outputs, in experimental 3D mode">
+  <figcaption>
+    The VBAP panner with 10 outputs, in experimental 3D mode
+  </figcaption>
+</figure>
+
+<!--<a href="/images/VBAP-panner-10.png"><img src="/images/VBAP-panner-10.png" class="right" style="width:150px;" alt="The VBAP panner with 10 outputs, in experimental 3D mode"></a>-->
 <p>
   For tracks with 10 outputs, Ardour will currently assume a 3-dimensional
   speaker layout corresponding to Auro-3D 10.1, which is a horizontal 5.1
@@ -74,12 +90,18 @@
   "voice-of-god" speaker at the zenith.
 </p>
 
-<h2>N:M panning</h2>
-<a href="/images/VBAP-panner-4in5.png"><img src="/images/VBAP-panner-4in5.png" class="right" style="width:150px;" alt="The VBAP panner in 4 in, 5 out mode"></a>
+<h2 class="clear">N:M panning</h2>
+
+<figure class="right">
+  <img class="mini" src="/images/VBAP-panner-4in5.png" alt="The VBAP panner in 4 in, 5 out mode">
+  <figcaption>
+    The VBAP panner in 4 in, 5 out mode
+  </figcaption>
+</figure>
+
 <p>
   For tracks and busses with more than one input, Ardour will (for now) assume that
-  you wish to distribute the inputs symmetrically along the latitude around
+  the inputs are distributed symmetrically along the latitude around
   the panner direction. The width parameter controls the opening angle of
   the distribution sector.
 </p>
-