cleaning up an obsolete page, adding its useful content to another

diff --git a/include/edit-midi.html b/include/edit-midi.html
index 70895a3090ad642fc81d1a8e3ce8877fb4873470..385e64296b05eefb585481354d7a81304bdf7993 100644 (file)
--- a/include/edit-midi.html
+++ b/include/edit-midi.html
@@ -10,6 +10,20 @@
     All editing is done in-place, in-window. There is no separate piano roll
     window or pane. Edit notes right where you see them.
   </li>
+  <li>
+    MIDI, just like audio, exists in regions. MIDI regions behave like audio
+    regions: they can be moved, trimmed, copied (cloned), or deleted. Ardour allows
+    either editing MIDI (or audio) regions, or MIDI region content (the notes), but
+    never both at the same time. The <kbd class="menu">e</kbd> key (by default)
+    toggles between region level and note level editing
+  </li>
+  <li>
+    Editing note information in Ardour occurs in only a single region. There is no
+    way currently to edit in note data for multiple regions at the same time, so for
+    example notes cannot be selected in several regions and then all deleted, nor
+    can they be copied-and-pasted from one region to another. Region(s), though, can
+    be copy-pasted just as with audio. 
+  </li>
   <li>
     All MIDI I/O is done via JACK for sample accurate timing and maximal
     efficiency when communicating with external software synthesizers.
@@ -59,4 +73,3 @@
     and the operation cannot be undone.
   </li>
 </ul>
-

diff --git a/include/fundamental-concepts.html b/include/fundamental-concepts.html
deleted file mode 100644 (file)
index 0728d30..0000000
--- a/include/fundamental-concepts.html
+++ /dev/null
@@ -1,33 +0,0 @@
-
-<p>Ardour's MIDI editing is based on two basic principles:</p>
-<ol>
-  <li>Editing should be done without having to enter a new window</li>
-  <li>
-    Editing should be able to carried out completely with the keyboard,
-    or completely with the mouse, or with any combination of the two.
-  </li>
-</ol>
-<p>
-  Currently,  MIDI editing is primarily restricted to note data. Other
-  kinds of data (controller events, sysex data) are present and can be
-  added and deleted, but not actually edited.
-</p>
-
-<h2>Fundamentals of MIDI Editing in Ardour 3</h2>
-<p>
-  MIDI, just like audio, exists in <dfn>regions</dfn>. MIDI regions
-  behave like audio regions: they can be moved, trimmed, copied (cloned),
-  or deleted. Ardour allows either editing MIDI (or audio) regions, or MIDI
-  region content (the notes), but never both at the same time. The
-  <kbd>e</kbd> key (by default) toggles between <dfn>region level</dfn>
-  and <dfn>note level</dfn> editing, as will double-clicking on a MIDI region.
-</p>
-<p class="note">
-  One very important thing to note: editing note information in Ardour
-  occurs in only a single region. There is no way currently to edit in note
-  data for multiple regions at the same time, so for example you cannot select
-  notes in several regions and then delete them all, nor can you copy-and-paste
-  notes from one region to another. You can, of course, copy and paste the
-  region(s), just as with audio.
-</p>
-