From: Carl Hetherington Date: Mon, 31 Aug 2015 20:18:49 +0000 (+0100) Subject: Manual updates. X-Git-Tag: v2.1.49~8 X-Git-Url: https://git.carlh.net/gitweb/?p=dcpomatic.git;a=commitdiff_plain;h=15a22a16c999a936f945d8620d2c64eb5248a505 Manual updates. --- diff --git a/doc/manual/dcpomatic.xml b/doc/manual/dcpomatic.xml index 664b05438..3df603a85 100644 --- a/doc/manual/dcpomatic.xml +++ b/doc/manual/dcpomatic.xml @@ -1061,8 +1061,15 @@ burnt into the image. -Select the With Subtitles check-box to enable -subtitles. +Select the Use Subtitles check-box to enable +these subtitles. + + + +Select the Burn subtitles into image check-box to +burn these subtitles into the image; if this is not ticked the +subtitles will be included separately in the DCP to be rendered by the +projector. @@ -1404,13 +1411,6 @@ to what DCP-o-matic thinks is the best given the content that you have added. - -Burn subtitles into image should be selected if -you want DCP-o-matic to overlay the subtitles onto the video frame -before encoding. Leave this un-ticked to include the subtitles -separately in the DCP. - - The 3D button will set your DCP to 3D mode if it is checked. A 3D DCP will then be created, and any 2D content will be @@ -1841,6 +1841,16 @@ like to live on the bleeding edge! + +
+Issuer and creator + + +With these controls you can set the issuer and creator strings that +will be put into the DCPs which you create. + +
+ @@ -1921,9 +1931,9 @@ creation. At the top of the tab is the chain of certificates that will be used to sign DCPs and KDMs. DCP-o-matic creates a random chain when you -first run it, so if you are happy to use a randomly-generated chain -you can ignore the preferences. Otherwise, you can add or remove -certificates from the chain using the Add... and +first run it and if you are happy to use this chain you can ignore the +preferences. Otherwise, you can add or remove certificates from the +chain using the Add... and Remove buttons. @@ -1943,13 +1953,22 @@ corresponds to the public key held in the leaf certificate. -The bottom of the tab specifies the certificate and private key that -is used to decrypt DCPs if they are imported as sources to -DCP-o-matic. If you want to import an encrypted DCP you will need to -give the decryption certificate to the distributor of the DCP so that -they can generate a DKDM for you. As with the certificate chain, -DCP-o-matic will create a certificate and private key for you. You -can also choose to load your own certificate and key. +Underneath the details of the certificate chain and private key for +signing of DCPs and KDMs is a second chain and key which is used by +DCP-o-matic when you import an encrypted DCP as a piece of content. +The leaf certificate of this chain contains the public key that should +be used when targeting a KDM at DCP-o-matic. + + + +If you want to import an encrypted DCP you will need to give the +decryption certificate to the distributor of the DCP so that they can +generate a DKDM for you. You can save this certificate to disk by +clicking Export DCP decryption certificate. As +with the signing chain, DCP-o-matic will create a certificate chain +and private key for you. You can also choose to load your own +certificates and key or re-make the chain and key with new, random +values. @@ -1962,8 +1981,8 @@ can also choose to load your own certificate and key. The TMS tab (shown in ) gives some options for specifying details about your theatre management system -(TMS). If you do this, and your TMS accepts SSH connections, you can -upload DCPs directly from DCP-o-matic to the TMS using the +(TMS). If you do this, and your TMS accepts SSH or FTP connections, +you can upload DCPs directly from DCP-o-matic to the TMS using the Send DCP to TMS option in the Jobs menu. @@ -1977,12 +1996,20 @@ upload DCPs directly from DCP-o-matic to the TMS using the + +Protocol should be set to SCP or FTP as +appropriate for your TMS. We know that the Arts Alliance Media (AAM) +and the Doremi ranges uses SCP connections, and that Dolby's TMSs use +FTP. Do let us know if you use any other type of TMS with the +Send DCP to TMS feature. + + TMS IP address should be set to the IP address of your TMS, TMS target path to the place that DCPs should be uploaded to (which will be relative to the home directory of -the SSH user). Finally, the user name and password are the -credentials required to log into the TMS via SSH. +the SSH or FTP user). Finally, the user name and password are the +credentials required to log into the TMS via SSH or FTP. @@ -2080,6 +2107,12 @@ useful for experimentation. Again, you are strongly advised to leave this unticked for normal use. + +Only servers encode makes DCP-o-matic encode +JPEG2000 data only on encoding servers and not on the host. We +suggest you leave this un-ticked unless you have a good reason to do otherwise. + + The four checkboxes labelled Log control what sort of messages DCP-o-matic writes to its log file when creating a diff --git a/doc/manual/screenshots/dcp-tab.png b/doc/manual/screenshots/dcp-tab.png index 18df48afb..b5d22330f 100644 Binary files a/doc/manual/screenshots/dcp-tab.png and b/doc/manual/screenshots/dcp-tab.png differ diff --git a/doc/manual/screenshots/prefs-advanced.png b/doc/manual/screenshots/prefs-advanced.png index 273eeb818..54eb670db 100644 Binary files a/doc/manual/screenshots/prefs-advanced.png and b/doc/manual/screenshots/prefs-advanced.png differ diff --git a/doc/manual/screenshots/prefs-defaults.png b/doc/manual/screenshots/prefs-defaults.png index 60ba6c530..53b9589be 100644 Binary files a/doc/manual/screenshots/prefs-defaults.png and b/doc/manual/screenshots/prefs-defaults.png differ diff --git a/doc/manual/screenshots/prefs-general.png b/doc/manual/screenshots/prefs-general.png index 23b00ee78..bea1be76d 100644 Binary files a/doc/manual/screenshots/prefs-general.png and b/doc/manual/screenshots/prefs-general.png differ diff --git a/doc/manual/screenshots/prefs-kdm-email.png b/doc/manual/screenshots/prefs-kdm-email.png index af1576cec..15281cff5 100644 Binary files a/doc/manual/screenshots/prefs-kdm-email.png and b/doc/manual/screenshots/prefs-kdm-email.png differ diff --git a/doc/manual/screenshots/prefs-keys.png b/doc/manual/screenshots/prefs-keys.png index 703220616..6c5524294 100644 Binary files a/doc/manual/screenshots/prefs-keys.png and b/doc/manual/screenshots/prefs-keys.png differ diff --git a/doc/manual/screenshots/prefs-tms.png b/doc/manual/screenshots/prefs-tms.png index 490474142..7e5bf38d7 100644 Binary files a/doc/manual/screenshots/prefs-tms.png and b/doc/manual/screenshots/prefs-tms.png differ diff --git a/doc/manual/screenshots/subtitles-tab.png b/doc/manual/screenshots/subtitles-tab.png index 8f9a7e3cf..4d912f651 100644 Binary files a/doc/manual/screenshots/subtitles-tab.png and b/doc/manual/screenshots/subtitles-tab.png differ