Removing a duplicate

diff --git a/include/copy-regions.html b/include/copy-regions.html
index 0f707a841224b5fc852e939b50f449bc5c46dc35..4cc589c287950c73d3ecf1552fd53ee23e737c5f 100644 (file)
--- a/include/copy-regions.html
+++ b/include/copy-regions.html
@@ -4,7 +4,7 @@
   Copying a region is done using the <a href="@@toolbox">Grab mouse mode</a>, by
   moving the mouse pointer into the region and <kbd class="mouse mod1">left</kbd>-dragging.
   Ardour creates a new region and follows the mouse pointer as it moves. See
-  <a href="@@move-regions">Move Regions</a> for more
+  <a href="@@move-regions-with-the-mouse">Move Regions</a> for more
   details on moving the copied region.
 </p>
 

diff --git a/include/getting-more-plugins.html b/include/getting-more-plugins.html
index bd4a63731611e552e618abef0bed236976503c60..9a3c0bfa4e38d9f78c382ed93c0f0d6115873723 100644 (file)
--- a/include/getting-more-plugins.html
+++ b/include/getting-more-plugins.html
@@ -24,7 +24,7 @@
 <h3 id="LADSPA">LADSPA</h3>
 
 <ul>
-<li>Kokkini Zita<a href="http://kokkinizita.linuxaudio.org/linuxaudio/">http://kokkinizita.linuxaudio.org/linuxaudio/</a> [GNU GPL/GNU GPLv3]</li>
+<li>Kokkini Zita <a href="http://kokkinizita.linuxaudio.org/linuxaudio/">http://kokkinizita.linuxaudio.org/linuxaudio/</a> [GNU GPL/GNU GPLv3]</li>
 <li>Blepvco <a href="http://smbolton.com/linux.html">http://www.smbolton.com/linux.html</a> [GNU GPLv2+]</li>
 <li>Blop <a href="http://blop.sourceforge.net/">http://blop.sourceforge.net/</a> [GNU GPLv2]</li>
 <li>CAPS <a href="http://quitte.de/dsp/caps.html">http://quitte.de/dsp/caps.html</a> [GNU GPLv3]</li>

diff --git a/include/move-regions.html b/include/move-regions.html
deleted file mode 100644 (file)
index bfe466f..0000000
--- a/include/move-regions.html
+++ /dev/null
@@ -1,30 +0,0 @@
-
-<p>
-  Ardour has a global <dfn>edit mode</dfn> selector at the left of the
-  Editing toolbar, which affect how regions are moved or copied:</p>
-<table class="dl">
-  <tr><th><kbd class="menu">Slide</kbd></th>
-  <td>Regions move freely. Ardour creates overlaps when necessary.</td></tr>
-  <tr><th><kbd class="menu">Lock</kbd></th>
-  <td>No region motion is permitted (except for "nudge").</td></tr>
-  <tr><th><kbd class="menu">Ripple</kbd></th>
-  <td>The effect of an edit is reflected in the regions to the "right" of the edit</td></tr>
-</table>
-<h2>More details about Ripple</h2>
-<p>
-  Ripple Edit mode provides the following conveniences:
-  <ul>
-    <li> Deleting a range will move later regions to compensate for the deleted time </li>
-    <li> Deleting a region will move later regions to compensate for the deleted region's length </li>
-    <li> Moving a region will move later regions to compensate for the length of the move</li>
-    <li> Inserting a new region (via dragging or via Paste) will move later regions to the right to compensate</li>
-  </ul>
-</p>
-<p class="note">
-  If <kbd class="menu">Snap To Grid</kbd> is enabled, then regions can
-  only move so that they align with locations determined by the current
-  snap settings (beats, or seconds, or other region boundaries, etc).
-  See <a href="@@grid-controls">Snap To the Grid</a>
-  for details.
-</p>
-

diff --git a/master-doc.txt b/master-doc.txt
index 759d71f5259e924de1de448230893d5cd8bae21e..4f684dce035ab3400105e91a0c64fa4b17d90731 100644 (file)
--- a/master-doc.txt
+++ b/master-doc.txt
@@ -1171,19 +1171,11 @@ uri: editing-and-arranging/copy-regions
 part: subchapter
 ---
 
----
-title: Move Regions
-include: move-regions.html
-link: move-regions
-uri: editing-and-arranging/move-regions
-part: subchapter
----
-
 ---
 title: Move Regions With the Mouse
 include: move-regions-with-the-mouse.html
 link: move-regions-with-the-mouse
-uri: editing-and-arranging/move-regions/move-regions-with-the-mouse
+uri: editing-and-arranging/move-regions
 part: subchapter
 ---
 

diff --git a/uri_to_fix.txt b/uri_to_fix.txt
index a4f09727018ac5794ce361a75e23e60a85be5f44..2c56c58b199afe646d9946dd84ec30f2d9b023e3 100644 (file)
--- a/uri_to_fix.txt
+++ b/uri_to_fix.txt
@@ -24,3 +24,4 @@ http://www.manual.ardour.org/ardours-interface/introducing-the-editor-window/the
 http://www.manual.ardour.org/working-with-markers/getting-to-know-the-rangesmarks-list/
 http://www.manual.ardour.org/working-with-markers/the-punch-range/
 http://www.manual.ardour.org/signal-routing/role-of-jack/
+http://www.manual.ardour.org/editing-and-arranging/move-regions/move-regions-with-the-mouse