Olaf changes + a couple of rewordings

[goodguy/cin-manual-latex.git] / CinelerraGG_Manual.tex

diff --git a/CinelerraGG_Manual.tex b/CinelerraGG_Manual.tex
index aae08534dfe4135d84a01351d50153d57d53c346..e709db36bacbf4f6941afc505a603d77815cd032 100644 (file)
--- a/CinelerraGG_Manual.tex
+++ b/CinelerraGG_Manual.tex
@@ -1,20 +1,22 @@
-%
 \documentclass[
-letter,
-14pt,
-twoside,
-openright,
-svgnames
+a4paper,
+12pt,
+oneside,
+svgnames,
+%draft
 ]{memoir}                       % paper size, font size and other options for document
 \input{common/packages.tex}     % common packages
 
+\input{common/settings.tex}
+
 \begin{document}
+
 \input{common/title.tex}        % create and use custom title page
 
 \thispagestyle{empty}           % no page numbers
 
 \newpage
-
+\parskip=14pt
 \frontmatter
 
 \include{parts/Introduction}     % Introduction 
@@ -25,19 +27,39 @@ svgnames
 
 \mainmatter
 
-\include{parts/Instalation}
+\include{parts/Installation}
 \include{parts/Windows}
 \include{parts/Attributes}
 \include{parts/Loadandsave}
 \include{parts/Editing}
 \include{parts/Rendering}
 \include{parts/Keyframes}
-<<<<<<< HEAD
-=======
+\include{parts/FFmpeg}
+\include{parts/Plugins}
+\include{parts/Transition}
+\include{parts/Overlays}
+\include{parts/Recording}
+\include{parts/DVD}
+\include{parts/Multi5s}
+\include{parts/Shortcuts}
+\include{parts/Configuration}
+\include{parts/Stuff}
+\include{parts/Trouble}
+\include{parts/Tips}
+\include{parts/Translations}
+\include{parts/Licenses}
 
+\chapter*{Appendices}
+\addappheadtotoc
+\begin{appendices}
+\include{parts/Quickstart}
+\include{parts/Developer}
+\include{parts/AuxilaryPrograms}
+\end{appendices}
 
+\include{parts/Glossary}
 \printnomenclature      % print glossary
-\nomenclature{t}{test}  % remove this after adding actual glosssary item
+
 \newpage
 
 \listoftables
@@ -46,7 +68,11 @@ svgnames
 \listoffigures
 \newpage
 
-\listoftodos
->>>>>>> einhander
+% \listoftodos
 
 \end{document}
+
+%%% Local Variables:
+%%% mode: latex
+%%% TeX-master: t
+%%% End: