Some manual updates.

16 files changed, 144 insertions, 127 deletions

diff --git a/doc/manual/dcpomatic.xml b/doc/manual/dcpomatic.xml
index a2610f990..0bb5ed1ca 100644
--- a/doc/manual/dcpomatic.xml
+++ b/doc/manual/dcpomatic.xml
@@ -47,7 +47,9 @@ cinema projectors.
 <title>Licence</title>
 
 <para>
-DCP-o-matic is licensed under the <ulink url="http://www.gnu.org/licenses/old-licenses/gpl-2.0.html">GNU GPL</ulink>.
+DCP-o-matic is free and open-source and is licensed under the <ulink
+url="http://www.gnu.org/licenses/old-licenses/gpl-2.0.html">GNU
+GPL</ulink>.
 </para>
 
 </section>
@@ -113,8 +115,9 @@ like to install it.
 
 <para>
 You can install DCP-o-matic on Ubuntu 12.04 (&lsquo;Precise
-Pangolin&rsquo;) or 14.04 (&lsquo;Trusty Tahr&rsquo;) using <code>.deb</code> packages: download the
-appropriate package from <ulink
+Pangolin&rsquo;), 14.04 (&lsquo;Trusty Tahr&rsquo;) or 15.04
+(&lsquo;Vivid Vervet&rsquo;) using <code>.deb</code> packages:
+download the appropriate package from <ulink
 url="http://dcpomatic.com/">http://dcpomatic.com/</ulink> and
 double-click it.  Ubuntu will install the necessary bits and pieces
 and set DCP-o-matic up for you.
@@ -127,7 +130,7 @@ and set DCP-o-matic up for you.
 <section>
 <title>Debian Linux</title>
 <para>
-Packages are available for Debian 7 (squeeze) and unstable (sid) from <ulink
+Packages are available for Debian 7 (squeeze), 8 (jessie) and unstable (sid) from <ulink
 url="http://dcpomatic.com/">http://dcpomatic.com/</ulink>.
 </para>
 </section>
@@ -159,10 +162,11 @@ thanks to Stefan Karner.
 <title>Other Linux distributions</title>
 
 <para>
-Installation on non-Ubuntu Linux is currently a little involved, as
-there are no packages available (yet); you will have to compile it
-from source.  If you are using a non-Ubuntu distribution, do let me
-know by <ulink url="mailto:carl@dcpomatic.com">email</ulink> and I will see about building some packages.
+Installation on other Linux systems (for which no packages are
+available) is quite hard; you will have to compile it from source.  If
+you are using distribution for which no packages are available, do let
+me know by <ulink url="mailto:carl@dcpomatic.com">email</ulink> and I
+will look into providing packages on the website.
 </para>
 
 <para>
@@ -205,7 +209,7 @@ With any luck, this will build and install DCP-o-matic on your system.  To run i
 </para>
 
 <programlisting>
-dcpomatic
+dcpomatic2
 </programlisting>
 
 <para>
@@ -389,9 +393,10 @@ linkend="ch-files"/> for details about the files that DCP-o-matic creates.
 </para>
 
 <para>
-Alternatively, if you have a projector or TMS that is accessible via
-SCP across your network, you can upload the content directly from
-DCP-o-matic.  See the <xref linkend="sec-prefs-tms" endterm="sec-prefs-tms-short"/>.
+Alternatively, if  you have a  projector or Theatre  Management System
+(TMS) that is accessible via SCP across your network, you can upload
+the content directly from DCP-o-matic.  See the <xref
+linkend="sec-prefs-tms" endterm="sec-prefs-tms-short"/> in <xref linkend="sec-prefs-tms"/>.
 </para>
 
 </section>
@@ -495,7 +500,7 @@ content as you like, and they can be of the following types:
 
 <itemizedlist>
 <listitem>Movie &mdash; a file containing some video, probably some
-audio and possibly some subtitles; for example, a MOV, MP4 or VOB.
+audio and possibly some embedded subtitles; for example, a MOV, MP4 or VOB.
 </listitem>
 
 <listitem>Sound &mdash; a file containing one or more channels of
@@ -509,10 +514,15 @@ example, a JPEG, PNG or TIFF file.
 <listitem>Moving image &mdash; a directory containing many still
 images which should be treated as the frames of a video.
 </listitem>
+
+<listitem>Subtitle &mdash; a file containing subtitle which will be
+superimposed on the image of the DCP.  These can be
+<guilabel>.srt</guilabel> or <guilabel>.xml</guilabel>
+files.</listitem>
 </itemizedlist>
 
 <para>
-To add one or more movie, sound or still-image files, select
+To add one or more movie, sound, still-image or subtitle files, select
 <guilabel>Add file(s)...</guilabel> and choose them from the selector.
 </para>
 
@@ -673,24 +683,10 @@ converting the selected content into the XYZ colourspace for the DCP.
 </para>
 
 <para>
-Clicking <guilabel>Edit...</guilabel> will open the colour conversion
-dialogue box, as shown in <xref linkend="fig-colour-conversion"/>.
-</para>
-
-<figure id="fig-colour-conversion">
-  <title>Dialogue box for setting colour conversion</title> 
-  <mediaobject>
-    <imageobject> 
-      <imagedata fileref="screenshots/colour-conversion&scs;"/>
-    </imageobject> 
-  </mediaobject>
-</figure>
-
-<para>
-In most cases, it is only necessary to select one of DCP-o-matic's
-presets.  DCP-o-matic knows how to convert from four common
-colourspaces: sRGB, Rec. 601, Rec. 709 and P3.  If you do not know
-which preset you should use, refer to the suggestions in <xref
+The easiest way to select the required conversion is to choose one of
+DCP-o-matic's presets.  DCP-o-matic knows how to convert from four
+common colourspaces: sRGB, Rec. 601, Rec. 709 and P3.  If you do not
+know which preset you should use, refer to the suggestions in <xref
 linkend="tab-colour-conversion"/>.
 </para>
 
@@ -701,7 +697,7 @@ linkend="tab-colour-conversion"/>.
 <colspec colwidth='5*'/>
 <tbody>
 <row>
-<entry>sRGB</entry><entry>Still images in RGB, e.g. photographs</entry>
+<entry>sRGB</entry><entry>Still images in RGB, e.g. photographs</entry>.
 </row>
 <row>
 <entry>Rec. 601</entry><entry>Standard-definition content (lower than about 1000 pixels across) including DVD rips.</entry>
@@ -717,13 +713,28 @@ linkend="tab-colour-conversion"/>.
 </table>
 
 <para>
-For other required colour conversion, and if you know what you are
-doing, you can edit the values in the lower half of the dialogue box.
+For other required colour conversions, and if you know what you are
+doing, you can choose <guilabel>Custom</guilabel> which will open the full
+colour conversion editing dialogue box:
+</para>
+
+<figure id="fig-colour-conversion">
+  <title>Dialogue box for custom colour conversion</title> 
+  <mediaobject>
+    <imageobject> 
+      <imagedata fileref="screenshots/colour-conversion&scs;"/>
+    </imageobject> 
+  </mediaobject>
+</figure>
+
+<para>
+Alternatively, choose <guilabel>None</guilabel> if your source files
+are already in the XYZ colour space and require no conversion.
 </para>
 
 <para>
-Colour conversion is discussed in much more detail in a separate
-document <ulink
+DCP-o-matic's colour conversion processes are discussed in much more
+detail in a separate document <ulink
 url="http://dcpomatic.com/manual/colour.pdf">colour.pdf</ulink>.
 </para>
 
@@ -734,7 +745,7 @@ url="http://dcpomatic.com/manual/colour.pdf">colour.pdf</ulink>.
 <title>Other settings</title>
 
 <para>
-The &lsquo;crop&rsquo; settings can be used to crop your content,
+The <guilabel>crop</guilabel> settings can be used to crop your content,
 which can be used to remove black borders from round the edges of DVD
 images, for example.  The specified number of pixels will be trimmed
 from each edge, and the content image in the right of the window will
@@ -742,6 +753,13 @@ be updated to show the effect of the crop.
 </para>
 
 <para>
+The <guilabel>fade in</guilabel> and <guilabel>fade out</guilabel>
+settings can be used to apply linear fades into and out of a piece of
+content.  Specify the time for each, clicking <guilabel>Set</guilabel>
+after making any changes.
+</para>
+
+<para>
 The <guilabel>Scale to</guilabel> option governs the shape that
 DCP-o-matic will scale the content's image into.  Select the aspect
 ratio that your content should be presented in.
@@ -795,57 +813,6 @@ The <guilabel>Audio</guilabel> tab controls properties of the image, as shown in
 
 <!-- ============================================================== -->
 <section>
-<title>Show audio</title>
-
-<para>
-The <guilabel>Show Audio</guilabel> button will instruct DCP-o-matic
-to examine the audio in your content and plot a graph of its level
-over time.  This can be useful for getting a rough idea of how loud
-the sound will be in the cinema auditorium.  A typical plot is shown
-in <xref linkend="fig-audio-plot"/>
-</para>
-
-<figure id="fig-audio-plot"> 
-  <title>Audio plot</title>
-  <mediaobject>
-    <imageobject> 
-       <imagedata fileref="screenshots/audio-plot&scs;"/>
-    </imageobject> 
-  </mediaobject>
-</figure>
-
-<para>
-The plot gives the audio level (vertical axis, in dB) with time
-(horizontal axis).  0dB represents full scale, so if there is anything
-near this you are in danger of clipping the projector's audio outputs.
-</para>
-
-<para>
-There are two plot types: the peak level and the RMS, which can be
-shown or hidden using the check-boxes on the right hand side of the
-window.
-</para>
-
-<para>
-The channel check-boxes will show or hide the plot(s) for
-the corresponding channels in the DCP.
-</para>
-
-<para>
-The smoothing slider applies a variable degree of temporal smoothing
-to the plots, which can make them easier to read in some cases.
-</para>
-
-<para>
-Obviously the audio plot is no substitute for listening in an
-auditorium, but it can be useful to get levels in the right rough area.
-</para>
-
-</section>
-
-
-<!-- ============================================================== -->
-<section>
 <title>The audio map</title>
 
 <para>
@@ -1405,6 +1372,56 @@ your content for the DCP, if required.  Bicubic is a fine choice in
 most situations.
 </para>
 
+<!-- ============================================================== -->
+<section>
+<title>Show audio</title>
+
+<para>
+The <guilabel>Show Audio</guilabel> button will instruct DCP-o-matic
+to examine the audio in your content and plot a graph of its level
+over time.  This can be useful for getting a rough idea of how loud
+the sound will be in the cinema auditorium.  A typical plot is shown
+in <xref linkend="fig-audio-plot"/>
+</para>
+
+<figure id="fig-audio-plot"> 
+  <title>Audio plot</title>
+  <mediaobject>
+    <imageobject> 
+       <imagedata fileref="screenshots/audio-plot&scs;"/>
+    </imageobject> 
+  </mediaobject>
+</figure>
+
+<para>
+The plot gives the audio level (vertical axis, in dB) with time
+(horizontal axis).  0dB represents full scale, so if there is anything
+near this you are in danger of clipping the projector's audio outputs.
+</para>
+
+<para>
+There are two plot types: the peak level and the RMS, which can be
+shown or hidden using the check-boxes on the right hand side of the
+window.
+</para>
+
+<para>
+The channel check-boxes will show or hide the plot(s) for
+the corresponding channels in the DCP.
+</para>
+
+<para>
+The smoothing slider applies a variable degree of temporal smoothing
+to the plots, which can make them easier to read in some cases.
+</para>
+
+<para>
+Obviously the audio plot is no substitute for listening in an
+auditorium, but it can be useful to get levels in the right rough area.
+</para>
+
+</section>
+
 </chapter>
 
 <chapter xml:id="ch-encryption" xmlns="http://docbook.org/ns/docbook" version="5.0" xml:lang="en">
@@ -1769,7 +1786,7 @@ The servers tab is shown in <xref linkend="fig-prefs-servers"/>.
 <para>
 If <guilabel>Use all servers</guilabel> is ticked DCP-o-matic will
 locate encoding servers automatically (see <xref
-linkend="ch:servers"/>).
+linkend="ch-servers"/>).
 </para>
 
 <para>
@@ -2039,7 +2056,7 @@ even refuse to ingest.
 
 <para>
 The only rates that are (pretty much) guaranteed to work on all DCI
-projectors is 24 frames per second (fps) for video and 48kHz or 96kHz
+projectors are 24 frames per second (fps) for video and 48kHz or 96kHz
 for audio.  If you are sending your DCPs to unknown places it wise to
 consider using these rates if at all possible.
 </para>
@@ -2170,7 +2187,7 @@ To run the command line version, simply enter:
 </para>
 
 <programlisting>
-dcpomatic_server_cli
+dcpomatic2_server_cli
 </programlisting>
 
 <para>
@@ -2180,7 +2197,7 @@ by doing something like:
 </para>
 
 <programlisting>
-dcpomatic_server_cli -t 4
+dcpomatic2_server_cli -t 4
 </programlisting>
 
 <para>
diff --git a/doc/manual/diagrams/3d-left-right.svg b/doc/manual/diagrams/3d-left-right.svg
index a51c93833..1621200d9 100644
--- a/doc/manual/diagrams/3d-left-right.svg
+++ b/doc/manual/diagrams/3d-left-right.svg
@@ -13,7 +13,7 @@
    height="1052.3622047"
    id="svg4899"
    version="1.1"
-   inkscape:version="0.48.4 r9939"
+   inkscape:version="0.91 r13725"
    sodipodi:docname="3d-left-right.svg">
   <defs
      id="defs4901">
@@ -93,17 +93,17 @@
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
      inkscape:zoom="2.4155251"
-     inkscape:cx="274"
-     inkscape:cy="557.5"
+     inkscape:cx="222.25142"
+     inkscape:cy="623.73819"
      inkscape:document-units="px"
      inkscape:current-layer="layer1"
      showgrid="false"
      showguides="true"
      inkscape:guide-bbox="true"
-     inkscape:window-width="1366"
-     inkscape:window-height="714"
-     inkscape:window-x="1024"
-     inkscape:window-y="27"
+     inkscape:window-width="1680"
+     inkscape:window-height="1028"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
      inkscape:window-maximized="1">
     <sodipodi:guide
        orientation="1,0"
@@ -132,26 +132,26 @@
      id="layer1">
     <text
        xml:space="preserve"
-       style="font-size:12px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Latin Modern Mono;-inkscape-font-specification:Latin Modern Mono"
-       x="182.2476"
-       y="462.34418"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:12px;line-height:125%;font-family:'Latin Modern Roman';-inkscape-font-specification:'Latin Modern Roman, ';letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;"
+       x="183.07558"
+       y="462.3082"
        id="text4907"
        sodipodi:linespacing="125%"><tspan
          sodipodi:role="line"
          id="tspan4909"
-         x="182.2476"
-         y="462.34418">Left</tspan><tspan
+         x="183.07558"
+         y="462.3082">Left</tspan><tspan
          sodipodi:role="line"
-         x="182.2476"
-         y="477.34418"
+         x="183.07558"
+         y="477.3082"
          id="tspan4911">eye</tspan><tspan
          sodipodi:role="line"
-         x="182.2476"
-         y="492.34418"
+         x="183.07558"
+         y="492.3082"
          id="tspan4913">image</tspan></text>
     <text
        xml:space="preserve"
-       style="font-size:12px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Latin Modern Mono;-inkscape-font-specification:Latin Modern Mono"
+       style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:12px;line-height:125%;font-family:'Latin Modern Roman';-inkscape-font-specification:'Latin Modern Roman, ';text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:0px;word-spacing:0px;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate;filter-blend-mode:normal;filter-gaussianBlur-deviation:0;"
        x="310.8606"
        y="462.3082"
        id="text4915"
@@ -189,14 +189,14 @@
        sodipodi:nodetypes="cc" />
     <text
        xml:space="preserve"
-       style="font-size:12px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Latin Modern Mono;-inkscape-font-specification:Latin Modern Mono"
-       x="246.67448"
+       style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:12px;line-height:125%;font-family:'Latin Modern Roman';-inkscape-font-specification:'Latin Modern Roman, ';text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:0px;word-spacing:0px;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate;filter-blend-mode:normal;filter-gaussianBlur-deviation:0;"
+       x="244.46959"
        y="396.21439"
        id="text6541"
        sodipodi:linespacing="125%"><tspan
          sodipodi:role="line"
          id="tspan6543"
-         x="246.67448"
+         x="244.46959"
          y="396.21439">width</tspan></text>
     <path
        style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;marker-start:url(#Arrow2Mstart);marker-end:url(#Arrow2Mend)"
@@ -206,14 +206,14 @@
        sodipodi:nodetypes="cc" />
     <text
        xml:space="preserve"
-       style="font-size:12px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Latin Modern Mono;-inkscape-font-specification:Latin Modern Mono"
-       x="170.6097"
+       style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:12px;line-height:125%;font-family:'Latin Modern Roman';-inkscape-font-specification:'Latin Modern Roman, ';text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:0px;word-spacing:0px;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate;filter-blend-mode:normal;filter-gaussianBlur-deviation:0;"
+       x="172.87373"
        y="560.70441"
        id="text6575"
        sodipodi:linespacing="125%"><tspan
          sodipodi:role="line"
          id="tspan6577"
-         x="170.6097"
+         x="172.87373"
          y="560.70441">width / 2</tspan></text>
   </g>
 </svg>
diff --git a/doc/manual/diagrams/3d-top-bottom.svg b/doc/manual/diagrams/3d-top-bottom.svg
index f30814fbc..5c0b41eb7 100644
--- a/doc/manual/diagrams/3d-top-bottom.svg
+++ b/doc/manual/diagrams/3d-top-bottom.svg
@@ -13,7 +13,7 @@
    height="1052.3622047"
    id="svg4899"
    version="1.1"
-   inkscape:version="0.48.4 r9939"
+   inkscape:version="0.91 r13725"
    sodipodi:docname="3d-top-bottom.svg">
   <defs
      id="defs4901">
@@ -100,10 +100,10 @@
      showgrid="false"
      showguides="true"
      inkscape:guide-bbox="true"
-     inkscape:window-width="1366"
-     inkscape:window-height="714"
-     inkscape:window-x="1024"
-     inkscape:window-y="27"
+     inkscape:window-width="1680"
+     inkscape:window-height="1028"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
      inkscape:window-maximized="1">
     <sodipodi:guide
        orientation="0,1"
@@ -132,7 +132,7 @@
      id="layer1">
     <text
        xml:space="preserve"
-       style="font-size:12px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Latin Modern Mono;-inkscape-font-specification:Latin Modern Mono"
+       style="font-size:12px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:'Latin Modern Roman';-inkscape-font-specification:'Latin Modern Roman, ';color:#000000;font-variant:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill-rule:nonzero;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;filter-blend-mode:normal;filter-gaussianBlur-deviation:0;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate;"
        x="200.2476"
        y="448.34418"
        id="text4907"
@@ -151,7 +151,7 @@
          id="tspan4913">image</tspan></text>
     <text
        xml:space="preserve"
-       style="font-size:12px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Latin Modern Mono;-inkscape-font-specification:Latin Modern Mono"
+       style="font-size:12px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:'Latin Modern Roman';-inkscape-font-specification:'Latin Modern Roman, ';color:#000000;font-variant:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill-rule:nonzero;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;filter-blend-mode:normal;filter-gaussianBlur-deviation:0;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate;"
        x="200.3076"
        y="554.04352"
        id="text4915"
@@ -189,7 +189,7 @@
        sodipodi:nodetypes="cc" />
     <text
        xml:space="preserve"
-       style="font-size:12px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Latin Modern Mono;-inkscape-font-specification:Latin Modern Mono"
+       style="font-size:12px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:'Latin Modern Roman';-inkscape-font-specification:'Latin Modern Roman, ';color:#000000;font-variant:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill-rule:nonzero;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;filter-blend-mode:normal;filter-gaussianBlur-deviation:0;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate;"
        x="323.12064"
        y="515.34296"
        id="text6541"
@@ -206,14 +206,14 @@
        sodipodi:nodetypes="cc" />
     <text
        xml:space="preserve"
-       style="font-size:12px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Latin Modern Mono;-inkscape-font-specification:Latin Modern Mono"
-       x="50.20705"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:12px;line-height:125%;font-family:'Latin Modern Roman';-inkscape-font-specification:'Latin Modern Roman, ';letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;"
+       x="59.762817"
        y="567.07489"
        id="text6575"
        sodipodi:linespacing="125%"><tspan
          sodipodi:role="line"
          id="tspan6577"
-         x="50.20705"
+         x="59.762817"
          y="567.07489">height / 2</tspan></text>
   </g>
 </svg>
diff --git a/doc/manual/screenshots/add-file.png b/doc/manual/screenshots/add-file.png
index 22234dc6f..53170e0e2 100644
--- a/doc/manual/screenshots/add-file.png
+++ b/doc/manual/screenshots/add-file.png
diff --git a/doc/manual/screenshots/audio-tab.png b/doc/manual/screenshots/audio-tab.png
index e12f23797..329127bf5 100644
--- a/doc/manual/screenshots/audio-tab.png
+++ b/doc/manual/screenshots/audio-tab.png
diff --git a/doc/manual/screenshots/colour-conversion.png b/doc/manual/screenshots/colour-conversion.png
index c5013ea6a..3d122598f 100644
--- a/doc/manual/screenshots/colour-conversion.png
+++ b/doc/manual/screenshots/colour-conversion.png
diff --git a/doc/manual/screenshots/examine-content.png b/doc/manual/screenshots/examine-content.png
index f3e98e189..fecc4b6bc 100644
--- a/doc/manual/screenshots/examine-content.png
+++ b/doc/manual/screenshots/examine-content.png
diff --git a/doc/manual/screenshots/file-new.png b/doc/manual/screenshots/file-new.png
index f3dae7e2e..e39bba689 100644
--- a/doc/manual/screenshots/file-new.png
+++ b/doc/manual/screenshots/file-new.png
diff --git a/doc/manual/screenshots/filters.png b/doc/manual/screenshots/filters.png
index 1a21c9d24..b7dae35d3 100644
--- a/doc/manual/screenshots/filters.png
+++ b/doc/manual/screenshots/filters.png
diff --git a/doc/manual/screenshots/making-dcp.png b/doc/manual/screenshots/making-dcp.png
index 29e1f5d33..0f52f1131 100644
--- a/doc/manual/screenshots/making-dcp.png
+++ b/doc/manual/screenshots/making-dcp.png
diff --git a/doc/manual/screenshots/still-new-film.png b/doc/manual/screenshots/still-new-film.png
index 80a736001..f745f1fd6 100644
--- a/doc/manual/screenshots/still-new-film.png
+++ b/doc/manual/screenshots/still-new-film.png
diff --git a/doc/manual/screenshots/still-select-content-file.png b/doc/manual/screenshots/still-select-content-file.png
index 310da0ec3..9b60347b1 100644
--- a/doc/manual/screenshots/still-select-content-file.png
+++ b/doc/manual/screenshots/still-select-content-file.png
diff --git a/doc/manual/screenshots/timing-tab.png b/doc/manual/screenshots/timing-tab.png
index 9b081e32e..6c2201513 100644
--- a/doc/manual/screenshots/timing-tab.png
+++ b/doc/manual/screenshots/timing-tab.png
diff --git a/doc/manual/screenshots/video-new-film.png b/doc/manual/screenshots/video-new-film.png
index 6d93e756a..e3f89111a 100644
--- a/doc/manual/screenshots/video-new-film.png
+++ b/doc/manual/screenshots/video-new-film.png
diff --git a/doc/manual/screenshots/video-select-content-file.png b/doc/manual/screenshots/video-select-content-file.png
index a422386de..7193be018 100644
--- a/doc/manual/screenshots/video-select-content-file.png
+++ b/doc/manual/screenshots/video-select-content-file.png
diff --git a/doc/manual/screenshots/video-tab.png b/doc/manual/screenshots/video-tab.png
index 80ae513f4..99bb4790a 100644
--- a/doc/manual/screenshots/video-tab.png
+++ b/doc/manual/screenshots/video-tab.png