rename region equivalence to correspondence for consistency

diff --git a/_manual/08_working-with-regions/02_region-selection-equivalence.html b/_manual/08_working-with-regions/02_corresponding-regions-selection.html
similarity index 71%
rename from _manual/08_working-with-regions/02_region-selection-equivalence.html
rename to _manual/08_working-with-regions/02_corresponding-regions-selection.html
index 13f3f9cb254403657f143eb6828fb351a0101a00..68464010382f2b47c13a518ae95b30a587946277 100644 (file)
--- a/_manual/08_working-with-regions/02_region-selection-equivalence.html
+++ b/_manual/08_working-with-regions/02_corresponding-regions-selection.html
@@ -1,13 +1,13 @@
 ---
 layout: default
-title: Equivalent Region Selection
+title: Corresponding Regions Selection
 ---                        
   
 <p>
   <a href="/working-with-tracks/track-and-bus-groups/">Track Groups</a> have
   a property titled <kbd class="option">Select</kbd> which, if enabled, cause 
   Ardour to propagate a region selection in one track of a group to the
-  <dfn>equivalent regions</dfn> of the other tracks in that group.
+  <dfn>corresponding regions</dfn> of the other tracks in that group.
  </p>
 <p>
   For example, let's assume you have used multiple microphones to record a 
@@ -18,9 +18,9 @@ title: Equivalent Region Selection
   subsequent edit operation will affect all the drum tracks together. 
 </p>
 
-<h2>How Ardour Decides Which Regions are "Equivalent"</h2>
+<h2>How Ardour Decides Which Regions are "Corresponding"</h2>
 <p>
-  Regions in different tracks are considered to be equivalent for the purposes 
+  Regions in different tracks are considered to be corresponding for the purposes 
   of sharing <dfn>selection</dfn> if they satisfy <em>all</em> the following criteria:
 </p>
 <ol>
@@ -29,17 +29,18 @@ title: Equivalent Region Selection
   <li>each region has the <dfn>same length</dfn>.</li>
 </ol>
 
-<h2>Overlap Equivalence</h2>
+<h2>Overlap Correspondence</h2>
 <p>
   Sometimes, the rules outlined above are too strict to get Ardour to do what you 
   want. Regions may have been trimmed to slightly different lengths, or positioned 
   slightly differently, and this will cause Ardour to not select regions in other 
   grouped tracks.</p>
 <p>
-  In this case, enable 
-  <kbd class="option">Edit &gt; Preferences &gt; Editor &gt; Use overlap equivalency for
-  regions</kbd>. With this option enabled, regions in different tracks will be 
-  considered equivalent for the purposes of selection if they
+  In this case, change  
+  <kbd class="menu">Edit &gt; Preferences &gt; Editor &gt; Regions in
+  active edit groups are edited together:</kbd> to <kbd
+  class="menu">whenever they overlap in time</kbd>. With this option enabled, r
+  egions in different tracks will be considered equivalent for the purposes of selection if they
   <dfn>overlap</dfn>. This is much more flexible and will cover almost all of the 
   cases that the fixed rules above might make cumbersome.
 </p>

diff --git a/_manual/10_working-with-tracks/03_selecting-tracks/01_region-and-track-selection.html b/_manual/10_working-with-tracks/03_selecting-tracks/01_region-and-track-selection.html
deleted file mode 100644 (file)
index 55d0727..0000000
--- a/_manual/10_working-with-tracks/03_selecting-tracks/01_region-and-track-selection.html
+++ /dev/null
@@ -1,11 +0,0 @@
----
-layout: default
-title: Region and Track Selection
----                        
-
-
-  
-  <p>By default, selecting regions has no impact on track selection. You can select a track, then select a region in another track (or vice versa) and both selections will co-exist happily. Operations that are applied to tracks will use the track selection, and those that apply to regions will use the region selection. Similarly, deselecting a region will not deselect the track it is in (if that track was selected).</p>
-<p>In some workflows, and particularly if you have experience with other <abbr title="Digital Audio Workstation">DAW</abbr>s, this is not the most comfortable way to work. You may prefer to work in a style where selecting a region will also select the track that the region is in. Similarly, when the last selected region in a track is deselected, the track will also become unselected.</p>
-<p>To control this behaviour, set <code>Edit &gt; Preferences &gt; Editor &gt; Link selection of regions and tracks</code>. </p>
-  

diff --git a/_manual/10_working-with-tracks/05_controlling-track-ordering/01_track-ordering-and-remote-control-ids.html b/_manual/10_working-with-tracks/05_controlling-track-ordering/02_track-ordering-and-remote-control-ids.html
similarity index 100%
rename from _manual/10_working-with-tracks/05_controlling-track-ordering/01_track-ordering-and-remote-control-ids.html
rename to _manual/10_working-with-tracks/05_controlling-track-ordering/02_track-ordering-and-remote-control-ids.html