diff options
| author | Carl Hetherington <cth@carlh.net> | 2014-04-27 23:41:26 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2014-04-27 23:41:26 +0100 |
| commit | 7f2e74604a51b984e4c8cbb5d5f4bb642677ec00 (patch) | |
| tree | be2da9736a298d9367c8c8f1aa231c43251ccaab /doc | |
| parent | 243dff6782db2783648c9efc0e6cd17b1c6cdaae (diff) | |
| parent | ab43240870523c96c68493d107b8bc8c5294629b (diff) | |
Merge master.
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/manual/Makefile | 2 | ||||
| -rw-r--r-- | doc/manual/dcpomatic.xml | 15 |
2 files changed, 12 insertions, 5 deletions
diff --git a/doc/manual/Makefile b/doc/manual/Makefile index 2b2d709c9..baf8bddc8 100644 --- a/doc/manual/Makefile +++ b/doc/manual/Makefile @@ -6,7 +6,7 @@ DIAGRAMS := file-structure.svg 3d-left-right.svg 3d-top-bottom.svg SCREENSHOTS := file-new.png video-new-film.png still-new-film.png video-select-content-file.png \ still-select-content-file.png examine-thumbs.png examine-content.png timing-tab.png \ - calculate-audio-gain.png \ + calculate-audio-gain.png add-file.png dcp-tab.png \ prefs-kdm-email.png prefs-colour-conversions.png prefs-metadata.png prefs-misc.png prefs-tms.png \ making-dcp.png filters.png video-tab.png audio-tab.png subtitles-tab.png \ audio-plot.png audio-map-eg1.png audio-map-eg2.png audio-map-eg3.png kdm.png diff --git a/doc/manual/dcpomatic.xml b/doc/manual/dcpomatic.xml index dafa67962..a346c69c7 100644 --- a/doc/manual/dcpomatic.xml +++ b/doc/manual/dcpomatic.xml @@ -108,9 +108,8 @@ like to install it. <para> You can install DCP-o-matic on Ubuntu 12.04 (‘Precise -Pangolin’), 12.10 (‘Quantal Quetzal’), 13.04 -(‘Raring Ringtail’) or 13.10 (‘Saucy -Salamander’) using <code>.deb</code> packages: download the +Pangolin’), 12.10 (‘Quantal Quetzal’), 13.10 (‘Saucy +Salamander’) or 14.04 (‘Trusty Tahr’) 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 @@ -122,7 +121,15 @@ and set DCP-o-matic up for you. <section> <title>Debian Linux</title> <para> -Packages are also available for Debian 7 (squeeze) from <ulink +Packages are available for Debian 7 (squeeze) from <ulink +url="http://dcpomatic.com/">http://dcpomatic.com/</ulink>. +</para> +</section> + +<section> +<title>Centos Linux</title> +<para> +Packages are available for Centos 6.5 from <ulink url="http://dcpomatic.com/">http://dcpomatic.com/</ulink>. </para> </section> |