X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=include%2Fabout-ardours-interface.html;h=e6431261268cd2d1c660bd63c438e49eeba344fa;hb=dfec6899ef2a121ccf2ff1d47008e7ac4844cf70;hp=79297292828170565b032ed217696ab92e512a31;hpb=e6123839d20de4f903ed74820cc087fc8401f625;p=ardour-manual

diff --git a/include/about-ardours-interface.html b/include/about-ardours-interface.html
index 7929729..e643126 100644
--- a/include/about-ardours-interface.html
+++ b/include/about-ardours-interface.html
@@ -82,13 +82,11 @@ title: Ardour's Interface
 </figure>
 
 <p>
-  The Editor and the Mixer share the same toolbar (the top of the window). The sections displayed
-  in this toolbar can be customized to the user's workflow, by checking options in
-  <kbd class="menu">Preferences &gt; Appearance &gt; Toolbar</kbd>.
+  The Editor and the Mixer share the same toolbar (the top of the window). The sections displayed in this toolbar can be customized to the user's workflow, by checking options in <kbd class="menu">Preferences &gt; Appearance &gt; Toolbar</kbd>.
 </p>
 
 <p>
-  Switching between the Editor and the Mixer windows is done :
+  Switching between the Editor and the Mixer windows is done:
 </p>
 <ul>
 	<li>with the <a href="/ardours-interface/status-indicators/#mode_selector">Mode Selector buttons</a> in the upper right</li>
@@ -109,7 +107,7 @@ title: Ardour's Interface
   window where editing and arranging a project is done. The window
   has a general "horizontal" sense to it: the timeline flows from left to
   right, the playhead showing the current position in the session moves
-  from left to right &mdash; the window really represents <dfn>time</dfn>
+  from left to right&mdash;the window really represents <dfn>time</dfn>
   in a fairly literal way.
 </p>
 <p>
@@ -133,5 +131,8 @@ title: Ardour's Interface
   To learn more about the process of mixing, see <a href="/mixing/">Mixing<a>.
 </p>
 
+<<<<<<< HEAD
 
 {% children %}
+=======
+>>>>>>> Initial cleanup of manual content.