From: Carl Hetherington Date: Wed, 17 Jul 2013 13:42:29 +0000 (+0100) Subject: Tidy up manual changes. X-Git-Tag: v2.0.48~1337^2~208 X-Git-Url: https://git.carlh.net/gitweb/?p=dcpomatic.git;a=commitdiff_plain;h=8dbee9a861f00d72a995a2b2369385651f2ec734 Tidy up manual changes. --- diff --git a/.gitignore b/.gitignore index 70738a18f..0fd802092 100644 --- a/.gitignore +++ b/.gitignore @@ -18,6 +18,8 @@ doc/manual/extensions.ent doc/design/*.pdf doc/design/*.log doc/design/*.aux +doc/manual/diagrams/*.pdf +doc/manual/diagrams/*.png .be/id-cache *.pyc GPATH diff --git a/doc/manual/Makefile b/doc/manual/Makefile index 115d7c3c8..f0cef4832 100644 --- a/doc/manual/Makefile +++ b/doc/manual/Makefile @@ -2,7 +2,7 @@ all: html pdf -DIAGRAMS := +DIAGRAMS := file-structure.svg SCREENSHOTS := file-new.png video-new-film.png still-new-film.png click-content-selector.png video-select-content-file.png \ still-select-content-file.png examine-thumbs.png \ @@ -83,8 +83,9 @@ html: $(XML) dcpomatic-html.xsl extensions-html.ent dcpomatic.css \ xmlto html -m dcpomatic-html.xsl dcpomatic.xml --skip-validation -o html # Copy graphics and CSS in -# mkdir -p html/diagrams html/graphics -# cp diagrams/*.png html/diagrams + mkdir -p html/diagrams +# mkdir -p html/graphics + cp diagrams/*.png html/diagrams # cp graphics/*.png html/graphics cp dcpomatic.css html diff --git a/doc/manual/dcpomatic.xml b/doc/manual/dcpomatic.xml index 05e8ff4aa..e8ee67995 100644 --- a/doc/manual/dcpomatic.xml +++ b/doc/manual/dcpomatic.xml @@ -50,6 +50,14 @@ DCP-o-matic is licensed under the Tango Desktop Project, with thanks. + + + @@ -60,7 +68,7 @@ DCP-o-matic is licensed under the http://carlh.net +http://dcpomatic.com and double-click it. Click through the installer wizard, and DCP-o-matic will be installed onto your machine. @@ -81,10 +89,10 @@ version. You can install DCP-o-matic on Ubuntu 12.04 (‘Precise -Pangolin’) or 12.10 (‘Quantal Quetzal’) using -.deb packages: download the appropriate package from -http://carlh.net and +Pangolin’), 12.10 (‘Quantal Quetzal’) or 13.04 +(‘Raring Ringtail’) using .deb packages: +download the appropriate package from http://dcpomatic.com and double-click it. Ubuntu will install the necessary bits and pieces and set DCP-o-matic up for you. @@ -942,7 +950,7 @@ after you have created a DCP for a film called ‘DCP Test’. Creating a new film - + diff --git a/doc/manual/diagrams/file-structure.svg b/doc/manual/diagrams/file-structure.svg new file mode 100644 index 000000000..732e295a5 --- /dev/null +++ b/doc/manual/diagrams/file-structure.svg @@ -0,0 +1,5778 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + DCP Test + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + metadata + log + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + info + + + + + + + + + + + + + + + + + + + + + + + + + + + + + analysis + DCP-TEST_EN-XX_UK-U_51_2K_CSY_20130218_CSY_OV + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + video + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 17318961-7a15-434c-b4a3-3126784bae8d_pkl.xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 7ae68dd6-8347-43f4-91ca-331341378efb_cpl.xml + + + ASSETMAP.xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + dcp_test_audio.mxf + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + dcp_test_video.mxf + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + VOLINDEX.xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + DVD-o-matic'sworkingfiles + + DCP + +