There is now no split editor/mixer ordering. Attempt to explain ordering of new track...

[ardour-manual] / _manual / 23_video-timeline / 01_setup.html

diff --git a/_manual/23_video-timeline/01_setup.html b/_manual/23_video-timeline/01_setup.html
index 3cd868472edfa3ae3405045989e66e04f224c65d..6fdee82ab541c32dbd1ea03ff20cecbc5fbc23ab 100644 (file)
--- a/_manual/23_video-timeline/01_setup.html
+++ b/_manual/23_video-timeline/01_setup.html
@@ -30,8 +30,8 @@ Ardour requires xjadeo ≥ version 0.6.4, harvid ≥ version 0.7.0 and ffmpeg
 </p>
 
 <p>
-The ardour-dev team is <em>in control</em> of the first two applications. ffmpeg can be a bit of a problem.
-To avoid conflicts with distribution packages, ardour looks for <code>ffmpeg_harvid</code> and <code>ffprobe_harvid</code>.
+The Ardour development team is <em>in control</em> of the first two applications. ffmpeg can be a bit of a problem.
+To avoid conflicts with distribution packages, Ardour looks for <code>ffmpeg_harvid</code> and <code>ffprobe_harvid</code>.
 </p>
 
 <p>
@@ -72,7 +72,7 @@ Setting up a proper A/V post-production studio can be a complicated task. As muc
 </li>
 </ul>
 <ul>
-<li>..or override xjremote&#039;s behavior – instead of  IPC with a local running xjadeo-process, using <abbr title="Open Sound Control - &quot;postmodern MIDI&quot;">OSC</abbr> for example. xjadeo would run permanently and ardour will just tell it to load files and set offsets via <acronym title="Open Sound Control - &quot;postmodern MIDI&quot;">OSC</acronym>. see <a href="http://xjadeo.git.sourceforge.net/git/gitweb.cgi?p=xjadeo/xjadeo;a=blob_plain;f=contrib/xjremote-osc" title="http://xjadeo.git.sourceforge.net/git/gitweb.cgi?p=xjadeo/xjadeo;a=blob_plain;f=contrib/xjremote-osc"  rel="nofollow">xjremote-osc</a> example script.
+<li>..or override xjremote&#039;s behavior – instead of  IPC with a local running xjadeo-process, using <abbr title="Open Sound Control - &quot;postmodern MIDI&quot;">OSC</abbr> for example. xjadeo would run permanently and Ardour will just tell it to load files and set offsets via <acronym title="Open Sound Control - &quot;postmodern MIDI&quot;">OSC</acronym>. see <a href="http://xjadeo.git.sourceforge.net/git/gitweb.cgi?p=xjadeo/xjadeo;a=blob_plain;f=contrib/xjremote-osc" title="http://xjadeo.git.sourceforge.net/git/gitweb.cgi?p=xjadeo/xjadeo;a=blob_plain;f=contrib/xjremote-osc"  rel="nofollow">xjremote-osc</a> example script.
 </li>
 </ul>
 <ul>
@@ -81,5 +81,5 @@ Setting up a proper A/V post-production studio can be a complicated task. As muc
 </ul>
 
 <p>
-Ideally the machines have a common shared folder (NFS or similar).  Ardour&#039;s import (audio-extract) and export (mux) functionality depends on having access to the video file.  Also ardour video-import transcodes the file into a suitable proxy-format that allows reliable seeking to any frame…
+Ideally the machines have a common shared folder (NFS or similar).  Ardour&#039;s import (audio-extract) and export (mux) functionality depends on having access to the video file.  Also Ardour's video-import transcodes the file into a suitable proxy-format that allows reliable seeking to any frame…
 </p>