In Ardour, work is done in two main windows: the Editor and the
@@ -131,8 +128,3 @@ title: Ardour's Interface
To learn more about the process of mixing, see Mixing.
-<<<<<<< HEAD
-
-{% children %}
-=======
->>>>>>> Initial cleanup of manual content.
diff --git a/include/mini-timeline.html b/include/mini-timeline.html
index 26e6e12..6227b4a 100644
--- a/include/mini-timeline.html
+++ b/include/mini-timeline.html
@@ -1,26 +1,36 @@
+
+
- The mini-timeline allows, as the Summary,
- to navigate a session. It's main advantage though is that it stays visible even in Mixer mode.
+ The mini-timeline allows, as the
+ Summary does, navigation of a
+ session. Its main advantage, though, is that it stays visible even when in
+ Mixer mode.
- The range of time covered by the mini-timeline is set by Right clicking the
- timeline, and chossing from 30 seconds up to 20 minutes.
+ The range of time covered by the mini-timeline is set by Right clicking the timeline, and choosing a time span
+ from 30 seconds up to 20 minutes.
- The mini-timeline also shows all the markers (both start/end and user set ones).
- Clicking a marker jumps to that point on the timeline, allowing for quick access
- to key timings in the session.
+ The mini-timeline also shows all markers (start, end and any user
+ defined ones). Clicking a marker jumps to that point on the timeline,
+ allowing for quick access to key timings in the session.
+
While hovering with the mouse over the mini-timeline,
+
-
left clicking jumps the playhead to the time under the mouse cursor
-
using the scroll wheel scrolls the playhead inside the session
-
using the scroll wheel scrolls more finely inside the session
-
using the scroll wheel scrolls even more finely inside the session.
+
left clicking moves the playhead to the time under the mouse cursor
+
using the scroll wheel scrolls the playhead back and forth inside the session
+
using the scroll wheel scrolls more finely inside the session
+
using the scroll wheel scrolls even more finely inside the session.
+
diff --git a/include/other-toolbar-items.html b/include/other-toolbar-items.html
index 934e086..1a0ebc1 100644
--- a/include/other-toolbar-items.html
+++ b/include/other-toolbar-items.html
@@ -68,3 +68,4 @@
The buttons in between the Mode Selector and the global meter are script buttons,
which are user-definable buttons to attach any session lua-script to.
+
diff --git a/include/plugin-manager.html b/include/plugin-manager.html
index f018684..602895e 100644
--- a/include/plugin-manager.html
+++ b/include/plugin-manager.html
@@ -15,7 +15,10 @@
connections. The plugins can be sorted by clicking on a column header.
+