X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=doc%2Fmanual%2Fdcpomatic.xml;h=11376f876728e9c266f1f48a2cec177d2b750f9a;hb=b1609afac2e2e495838e4cbf591898b7c7814404;hp=a74a99fde33f70d50b5e7527c8f3a1cc844d85bf;hpb=95fc64295a860814ddee477c46e2028ea1a1f15c;p=dcpomatic.git

diff --git a/doc/manual/dcpomatic.xml b/doc/manual/dcpomatic.xml
index a74a99fde..11376f876 100644
--- a/doc/manual/dcpomatic.xml
+++ b/doc/manual/dcpomatic.xml
@@ -112,17 +112,13 @@ version.
 <title>macOS</title>
 
 <para>
-DCP-o-matic will run on macOS version 10.6 (Snow Leopard) and
+DCP-o-matic will run on macOS version 10.10 (Yosemite) and
 higher.  DCP-o-matic is split into seven separate applications, each of
 which can be installed by downloading the <code>.dmg</code>,
 double-clicking to open and then dragging the icon to your
 <guilabel>Applications</guilabel> folder.
 </para>
 
-<para>
-Make sure you choose the correct download, depending on whether you are running macOS 10.9 (Mavericks) (or higher) or something older.
-</para>
-
 <para>
 If you don't know which parts of DCP-o-matic to install, start
 with the first (main) part.
@@ -140,7 +136,7 @@ with the first (main) part.
 
 <itemizedlist>
   <listitem>Debian 9 (&lsquo;squeeze&rsquo;), 10 (&lsquo;buster&rsquo;) and unstable (&lsquo;sid&rsquo;)</listitem>
-  <listitem>Ubuntu 16.04 (&lsquo;Xenial Xerus&rsquo;), 18.04 (&lsquo;Bionic Beaver&rsquo;), 19.10 (&lsquo;Eoan Ermine&rsquo;) and 20.04 (&lsquo;Focal Fossa&rsquo;)</listitem>
+  <listitem>Ubuntu 16.04, 18.04, 20.04 and 20.10</listitem>
   <listitem>Mint 18 and 19</listitem>
 </itemizedlist>
 
@@ -158,7 +154,7 @@ pieces and set DCP-o-matic up for you.
 <section>
   <title>Fedora, Centos and Mageia Linux</title>
 
-  <para>There are <code>.rpm</code> packages for Fedora 30, 31 and 32, Centos 7 and 8 and Mageia 7 on
+  <para>There are <code>.rpm</code> packages for Fedora 31, 32 and 33, Centos 7 and 8 and Mageia 7 on
   <ulink url="https://dcpomatic.com/">https://dcpomatic.com/</ulink>
   </para>
 </section>
@@ -240,33 +236,6 @@ in a shell.
 </para>
 </section>
 
-<!-- ============================================================== -->
-<section>
-<title>&lsquo;Simple&rsquo; and &lsquo;Full&rsquo; modes</title>
-
-<para>When you start DCP-o-matic for the first time it will ask you if
-you want to use &lsquo;simple&rsquo; or &lsquo;full&rsquo; mode.
-</para>
-
-<para>The difference between these two is that some of DCP-o-matic's
-more complex or less-used controls are hidden from view in
-&lsquo;Simple&rsquo; mode.  This makes the interface simpler to
-navigate.  You may wish to choose this mode if you do not have much
-experience with DCP or video processing.
-</para>
-
-<para>Even if you choose &lsquo;Simple&rsquo; mode you can always go
-back to &lsquo;Full&rsquo; mode by changing the <guilabel>Interface
-complexity</guilabel> setting in the <guilabel>General</guilabel> tab
-of <guilabel>Preferences</guilabel>.
-</para>
-
-<para>
-All the screenshots in this manual are from a copy of DCP-o-matic in &lsquo;Full&rsquo; mode.
-</para>
-
-</section>
-
 </chapter>
 
 
@@ -308,7 +277,7 @@ shown in <xref linkend="fig-file-new"/>.
   <title>Creating a new film</title>
   <mediaobject>
     <imageobject>
-      <imagedata scale="250" fileref="screenshots/file-new&scs;"/>
+      <imagedata fileref="screenshots/file-new&scs;"/>
     </imageobject>
   </mediaobject>
 </figure>
@@ -322,7 +291,7 @@ linkend="fig-video-new-film"/>.
   <title>Dialogue box for creating a new film</title>
   <mediaobject>
     <imageobject>
-      <imagedata fileref="screenshots/video-new-film&scs;"/>
+      <imagedata fileref="screenshots/new-film&scs;"/>
     </imageobject>
   </mediaobject>
 </figure>
@@ -424,7 +393,7 @@ linkend="fig-making-dcp"/>.
   <title>Making the DCP</title>
   <mediaobject>
     <imageobject>
-      <imagedata scale="250" fileref="screenshots/making-dcp&scs;"/>
+      <imagedata fileref="screenshots/making-dcp&scs;"/>
     </imageobject>
   </mediaobject>
 </figure>
@@ -439,8 +408,7 @@ linkend="ch-files"/> for details about the files that DCP-o-matic creates.
 <para>
 Alternatively, DCP-o-matic can upload your DCP directly to a projector
 or Theatre Management System (TMS) that is accessible via SCP or FTP
-across your network.  See the <xref linkend="sec-prefs-tms"
-endterm="sec-prefs-tms-short"/> in <xref linkend="sec-prefs-tms"/>.
+across your network.  See <xref linkend="sec-prefs-tms"/>.
 </para>
 
 </section>
@@ -468,7 +436,7 @@ shown in <xref linkend="fig-still-new-film"/>.
   <title>Dialogue box for creating a new film</title>
   <mediaobject>
     <imageobject>
-      <imagedata fileref="screenshots/still-new-film&scs;"/>
+      <imagedata fileref="screenshots/new-film&scs;"/>
     </imageobject>
   </mediaobject>
 </figure>
@@ -2199,7 +2167,7 @@ methods to understand it.
 
 <para>
 We suppose that we are trying to send a DCP to
-Alice's cinema without a troublemaker called Mallory being able to
+Alice's cinema without an attacker called Mallory being able to
 watch it himself.
 </para>
 
@@ -2741,7 +2709,9 @@ like to live on the bleeding edge!
 
 <para>
 With these controls you can set the issuer and creator strings that
-will be put into the DCPs which you create.
+will be put into the DCPs which you create.  The issuer is typically your name
+(or your organisation's name) and the creator is typically the name of the tool
+used to make the DCP (e.g. DCP-o-matic).
 </para>
 </section>