Manual tweaks.

[dcpomatic.git] / doc / manual / dcpomatic.xml

diff --git a/doc/manual/dcpomatic.xml b/doc/manual/dcpomatic.xml
index 32007d1c2834297cac870fb9d118f46f02503969..1c3ca9dcb25763df0e320b5994c30b4cd524477b 100644 (file)
--- a/doc/manual/dcpomatic.xml
+++ b/doc/manual/dcpomatic.xml
@@ -32,9 +32,9 @@ Hello, and welcome to DCP-o-matic!
   <listitem>Create <ulink
   url="https://en.wikipedia.org/wiki/Digital_Cinema_Package">Digital
   Cinema Packages</ulink> (DCPs) from video, audio, subtitle and closed-caption files.</listitem>
-  <listitem>Play and verify DCPs.</listitem>
-  <listitem>Create KDMs for DCPs.</listitem>
-  <listitem>Write cinema-format drives containing DCPs.</listitem>
+  <listitem>Play and verify DCPs (see <xref linkend="ch-player"/> and <xref linkend="ch-verifier"/>).</listitem>
+  <listitem>Create KDMs for DCPs (see <xref linkend="ch-encryption"/>).</listitem>
+  <listitem>Write cinema-format drives containing DCPs (see <xref linkend="ch-writer"/>).</listitem>
 </itemizedlist>
 
 </section>
@@ -1874,7 +1874,7 @@ unused channel will be filled with silence.
 
 <para>
 The <guilabel>Processor</guilabel> control allows you to select a
-process to apply to the audio before it goes into the DCP.  Three processes are currently provided:
+process to apply to the audio before it goes into the DCP.  One process is currently provided:
 </para>
 
 <itemizedlist>
@@ -1884,31 +1884,7 @@ stereo input and extract the common part (corresponding to the
 The remaining L/R parts will be kept in the L/R channels of the DCP.
 This may be useful to make near-field L/R mixes more compatible with
 cinema audio systems.</listitem>
-<listitem>Stereo to 5.1 up-mixer A &mdash; this will take a stereo input and up-mix it to &lsquo;fake&rsquo; 5.1.  The input L/R are treated as follows:
-<itemizedlist>
-<listitem>DCP L is input L bandpass-filtered between 1.9kHz and 4.8kHz.</listitem>
-<listitem>DCP R is input R bandpass-filtered between 1.9kHz and 4.8kHz.</listitem>
-<listitem>DCP C is input L mixed with input R, taken down by 3dB and then bandpass-filtered between 150Hz and 1.9kHz.</listitem>
-<listitem>DCP Lfe is input L mixed with input R, taken down by 3dB and then bandpass-filtered between 20Hz and 150Hz.</listitem>
-<listitem>DCP Ls is input L bandpass-filtered between 4.8kHz and 20kHz.</listitem>
-<listitem>DCP Rs is input R bandpass-filtered between 4.8kHz and 20kHz.</listitem>
 </itemizedlist>
-<para>
-This upmixing algorithm is due to Gérald Maruccia.
-</para>
-</listitem>
-<listitem>Stereo to 5.1 up-mixer B &mdash; this uses a different approach:
-<itemizedlist>
-  <listitem>DCP L is input L.</listitem>
-  <listitem>DCP R is input R.</listitem>
-  <listitem>DCP C is input L + input R taken down by 3dB.</listitem>
-  <listitem>DCP Lfe is DCP C bandpass filtered between 20Hz and 150Hz.</listitem>
-  <listitem>DCP Ls and Rs are input L - input R with a 20ms delay.</listitem>
-</itemizedlist>
-</listitem>
-</itemizedlist>
-
-The up-mixers are not particularly advanced and should be used with care.  You are strongly advised to check how the DCPs sound in a cinema if you have used one of DCP-o-matic's upmixers.
 
 <!-- ============================================================== -->
 <section xml:id="sec-reels">
@@ -1937,7 +1913,7 @@ into reels:
 The picture, sound and subtitle data of the DCP will be
 split up into more smaller files on disk, rather than fewer larger
 files.  This can be useful if the DCP is to be transferred on storage
-that have file size limits.  The FAT32 filesystem, for example, can
+that has a file size limit.  The FAT32 filesystem, for example, can
 only hold files smaller than 4Gb.  A 6Gb DCP with a single reel could
 not be transferred using a FAT32-formatted disk.  If that DCP were
 split up into two 3Gb reels it could be transferred.
@@ -3326,7 +3302,7 @@ There are two options for the encoding server;
 <code>dcpomatic_server_cli</code>, which runs on the command line, and
 <code>dcpomatic_server</code>, which has a simple GUI.  The command line
 version is well-suited to headless servers, especially on Linux, and
-the GUI version works best on Windows where it will put an icon in the
+the GUI version works best on Windows and macOS where it will put an icon in the
 system tray.
 </para>
 
@@ -3794,7 +3770,7 @@ The full details of OV and VF files are discussed in <xref linkend="sec-overlay"
   <title>Verifying DCPs</title>
 
   <para>
-    The player also offers a DCP verifier.  To check a DCP,
+    The DCP-o-matic Player (see <xref linkend="ch-player"/>) also offers a DCP verifier.  To check a DCP,
     open it and then select <guilabel>Verify DCP</guilabel> from the
     <guilabel>Tools</guilabel> menu.
   </para>