From: Kern Sibbald Date: Fri, 1 Mar 2013 09:14:56 +0000 (+0100) Subject: Fix cover page and copyright X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=daa99cae45b9d0f7be52f2e5edc7b352a350c582;p=bacula%2Fdocs Fix cover page and copyright --- diff --git a/docs/manuals/en/console/console.tex b/docs/manuals/en/console/console.tex index eb7a271b..98f58f99 100644 --- a/docs/manuals/en/console/console.tex +++ b/docs/manuals/en/console/console.tex @@ -63,7 +63,6 @@ \begin{appendices} \begin{small} -\include{fdl} \end{small} \end{appendices} diff --git a/docs/manuals/en/developers/developers.tex b/docs/manuals/en/developers/developers.tex index 38c5e686..0a08abfa 100644 --- a/docs/manuals/en/developers/developers.tex +++ b/docs/manuals/en/developers/developers.tex @@ -86,7 +86,6 @@ % pull in the index \begin{appendices} \begin{small} -\include{fdl} \end{small} \end{appendices} \printindex diff --git a/docs/manuals/en/main.tex b/docs/manuals/en/main.tex deleted file mode 100644 index 7791f5f8..00000000 --- a/docs/manuals/en/main.tex +++ /dev/null @@ -1,175 +0,0 @@ -%% -%% -%% The following characters must be preceded by a backslash -%% to be entered as printable characters: -%% -%% # $ % & ~ _ ^ \ { } -%% - -\documentclass[10pt,a4paper]{book} - -\topmargin -0.5in -\oddsidemargin 0.0in -\evensidemargin 0.0in -\textheight 10in -\textwidth 6.5in - - -\usepackage{html} -\usepackage{float} -\usepackage{graphicx} -\usepackage{bacula} -\usepackage{longtable} -\usepackage{makeidx} -\usepackage{index} -\usepackage{setspace} -\usepackage{hyperref} -% \usepackage[linkcolor=black,colorlinks=true]{hyperref} -\usepackage{url} - -\makeindex -\newindex{dir}{ddx}{dnd}{Director Index} -\newindex{fd}{fdx}{fnd}{File Daemon Index} -\newindex{sd}{sdx}{snd}{Storage Daemon Index} -\newindex{console}{cdx}{cnd}{Console Index} -\newindex{general}{idx}{ind}{General Index} - -\sloppy - -\begin{document} -\sloppy - -\newfont{\bighead}{cmr17 at 36pt} -\parskip 10pt -\parindent 0pt - -\title{\includegraphics{\idir bacula-logo.eps} \\ \bigskip - \Huge{Bacula}$^{\normalsize \textregistered}$ \Huge{Concepts and Overview Guide} - \begin{center} - \large{It comes in the night and sucks - the essence from your computers. } - \end{center} -} - - -\author{Kern Sibbald} -\date{\vspace{1.0in}\today \\ - This manual documents Bacula version \fullversion \\ - \vspace{0.2in} - Copyright {\copyright} 1999-2009, Free Software Foundation Europe - e.V. \\ - Bacula {\textregistered} is a registered trademark of Kern Sibbald.\\ - \vspace{0.2in} - Permission is granted to copy, distribute and/or modify this document under the terms of the - GNU Free Documentation License, Version 1.2 published by the Free Software Foundation; - with no Invariant Sections, no Front-Cover Texts, and no Back-Cover Texts. - A copy of the license is included in the section entitled "GNU Free Documentation License". -} - -\maketitle - -\clearpage -\pagenumbering{roman} -\tableofcontents -\clearpage - -\pagestyle{myheadings} -\markboth{Bacula Version \version}{Bacula Version \version} -\pagenumbering{arabic} - -\part{Bacula Main Reference} -\include{main/general} -\include{main/newfeatures} -\include{main/state} -\include{main/requirements} -\include{main/supportedoses} -\include{main/supporteddrives} -\include{main/quickstart} -\include{main/install} -\include{main/critical} -\include{main/tutorial} -\include{main/configure} -\include{main/dirdconf} -\include{main/filedconf} -\include{main/storedconf} -\include{main/messagesres} -\include{main/consoleconf} -\include{main/monitorconf} -\include{main/restore} -\include{main/recycling} -\include{main/disk} -\include{main/pools} -\include{main/migration} -\include{main/strategies} -\include{main/autochangers} -\include{main/supportedchangers} -\include{main/spooling} -\include{main/statistics} -\include{main/ansi-labels} -\include{main/win32} -\include{main/rescue} -\include{main/tls} -\include{main/dataencryption} -\include{main/verify} -\include{main/mysql} -\include{main/postgresql} -\include{main/sqlite} -\include{main/catmaintenance} -\include{main/tapetesting} -\include{main/security} -\include{main/bootstrap} - -\part{Console and Operators} -\setcounter{chapter}{0} -\include{console/bconsole} -\include{console/gui} - -\part{Catalog Database} -\setcounter{chapter}{0} -\include{catalog/catmaintenance} -\include{catalog/mysql} -\include{catalog/postgresql} -\include{catalog/sqlite} - -\part{Problem and Resolution} -\setcounter{chapter}{0} -\include{problems/faq} -\include{problems/tips} -\include{problems/tapetesting} -\include{problems/firewalls} -\include{problems/kaboom} - -\part{Utility Programs} -\setcounter{chapter}{0} -\include{utility/progs} -\include{utility/bimagemgr-chapter} -\include{utility/rpm-faq} - -\part{Miscellaneous} -\setcounter{chapter}{0} -\include{misc/python} -\include{misc/vars} -\include{misc/stunnel} -\include{misc/dvd} -\include{misc/internaldb} - -\part{Annexes} -\setcounter{chapter}{0} -\include{main/license} -\include{main/fdl} -\include{main/gpl} -\include{main/lesser} -\include{main/projects} -\include{main/thanks} -\include{main/bugs} - - -% pull in the index -\clearpage -\printindex[general] -\printindex[dir] -\printindex[fd] -\printindex[sd] -\printindex[console] - -\end{document} diff --git a/docs/manuals/en/main/main.tex b/docs/manuals/en/main/main.tex index 3bc665fa..3148b050 100644 --- a/docs/manuals/en/main/main.tex +++ b/docs/manuals/en/main/main.tex @@ -128,10 +128,6 @@ lscape,pdfpages,ifthen,setspace,colortbl,diagbox} %\appendix \begin{appendices} \begin{small} -\include{license} -\include{fdl} -\include{gpl} -\include{lesser} \include{projects} \include{thanks} \include{bugs} diff --git a/docs/manuals/en/misc/misc.tex b/docs/manuals/en/misc/misc.tex index 27e61d4e..670b7591 100644 --- a/docs/manuals/en/misc/misc.tex +++ b/docs/manuals/en/misc/misc.tex @@ -63,10 +63,6 @@ \include{internaldb} \begin{appendices} \begin{small} -\include{license} -\include{fdl} -\include{gpl} -\include{lesser} \end{small} \end{appendices} diff --git a/docs/manuals/en/one-manual.tex b/docs/manuals/en/one-manual.tex new file mode 100644 index 00000000..7791f5f8 --- /dev/null +++ b/docs/manuals/en/one-manual.tex @@ -0,0 +1,175 @@ +%% +%% +%% The following characters must be preceded by a backslash +%% to be entered as printable characters: +%% +%% # $ % & ~ _ ^ \ { } +%% + +\documentclass[10pt,a4paper]{book} + +\topmargin -0.5in +\oddsidemargin 0.0in +\evensidemargin 0.0in +\textheight 10in +\textwidth 6.5in + + +\usepackage{html} +\usepackage{float} +\usepackage{graphicx} +\usepackage{bacula} +\usepackage{longtable} +\usepackage{makeidx} +\usepackage{index} +\usepackage{setspace} +\usepackage{hyperref} +% \usepackage[linkcolor=black,colorlinks=true]{hyperref} +\usepackage{url} + +\makeindex +\newindex{dir}{ddx}{dnd}{Director Index} +\newindex{fd}{fdx}{fnd}{File Daemon Index} +\newindex{sd}{sdx}{snd}{Storage Daemon Index} +\newindex{console}{cdx}{cnd}{Console Index} +\newindex{general}{idx}{ind}{General Index} + +\sloppy + +\begin{document} +\sloppy + +\newfont{\bighead}{cmr17 at 36pt} +\parskip 10pt +\parindent 0pt + +\title{\includegraphics{\idir bacula-logo.eps} \\ \bigskip + \Huge{Bacula}$^{\normalsize \textregistered}$ \Huge{Concepts and Overview Guide} + \begin{center} + \large{It comes in the night and sucks + the essence from your computers. } + \end{center} +} + + +\author{Kern Sibbald} +\date{\vspace{1.0in}\today \\ + This manual documents Bacula version \fullversion \\ + \vspace{0.2in} + Copyright {\copyright} 1999-2009, Free Software Foundation Europe + e.V. \\ + Bacula {\textregistered} is a registered trademark of Kern Sibbald.\\ + \vspace{0.2in} + Permission is granted to copy, distribute and/or modify this document under the terms of the + GNU Free Documentation License, Version 1.2 published by the Free Software Foundation; + with no Invariant Sections, no Front-Cover Texts, and no Back-Cover Texts. + A copy of the license is included in the section entitled "GNU Free Documentation License". +} + +\maketitle + +\clearpage +\pagenumbering{roman} +\tableofcontents +\clearpage + +\pagestyle{myheadings} +\markboth{Bacula Version \version}{Bacula Version \version} +\pagenumbering{arabic} + +\part{Bacula Main Reference} +\include{main/general} +\include{main/newfeatures} +\include{main/state} +\include{main/requirements} +\include{main/supportedoses} +\include{main/supporteddrives} +\include{main/quickstart} +\include{main/install} +\include{main/critical} +\include{main/tutorial} +\include{main/configure} +\include{main/dirdconf} +\include{main/filedconf} +\include{main/storedconf} +\include{main/messagesres} +\include{main/consoleconf} +\include{main/monitorconf} +\include{main/restore} +\include{main/recycling} +\include{main/disk} +\include{main/pools} +\include{main/migration} +\include{main/strategies} +\include{main/autochangers} +\include{main/supportedchangers} +\include{main/spooling} +\include{main/statistics} +\include{main/ansi-labels} +\include{main/win32} +\include{main/rescue} +\include{main/tls} +\include{main/dataencryption} +\include{main/verify} +\include{main/mysql} +\include{main/postgresql} +\include{main/sqlite} +\include{main/catmaintenance} +\include{main/tapetesting} +\include{main/security} +\include{main/bootstrap} + +\part{Console and Operators} +\setcounter{chapter}{0} +\include{console/bconsole} +\include{console/gui} + +\part{Catalog Database} +\setcounter{chapter}{0} +\include{catalog/catmaintenance} +\include{catalog/mysql} +\include{catalog/postgresql} +\include{catalog/sqlite} + +\part{Problem and Resolution} +\setcounter{chapter}{0} +\include{problems/faq} +\include{problems/tips} +\include{problems/tapetesting} +\include{problems/firewalls} +\include{problems/kaboom} + +\part{Utility Programs} +\setcounter{chapter}{0} +\include{utility/progs} +\include{utility/bimagemgr-chapter} +\include{utility/rpm-faq} + +\part{Miscellaneous} +\setcounter{chapter}{0} +\include{misc/python} +\include{misc/vars} +\include{misc/stunnel} +\include{misc/dvd} +\include{misc/internaldb} + +\part{Annexes} +\setcounter{chapter}{0} +\include{main/license} +\include{main/fdl} +\include{main/gpl} +\include{main/lesser} +\include{main/projects} +\include{main/thanks} +\include{main/bugs} + + +% pull in the index +\clearpage +\printindex[general] +\printindex[dir] +\printindex[fd] +\printindex[sd] +\printindex[console] + +\end{document} diff --git a/docs/manuals/en/problems/problems.tex b/docs/manuals/en/problems/problems.tex index 0f2852a5..12c44a74 100644 --- a/docs/manuals/en/problems/problems.tex +++ b/docs/manuals/en/problems/problems.tex @@ -62,7 +62,6 @@ \include{kaboom} \begin{appendices} \begin{small} -\include{fdl} \end{small} \end{appendices} diff --git a/docs/manuals/en/utility/utility.tex b/docs/manuals/en/utility/utility.tex index f8971c71..86404cb2 100644 --- a/docs/manuals/en/utility/utility.tex +++ b/docs/manuals/en/utility/utility.tex @@ -59,7 +59,6 @@ \include{rpm-faq} \begin{appendices} \begin{small} -\include{fdl} \end{small} \end{appendices} diff --git a/docs/manuals/licences/coverpage.tex b/docs/manuals/licences/coverpage.tex index 0d627a21..9694970d 100644 --- a/docs/manuals/licences/coverpage.tex +++ b/docs/manuals/licences/coverpage.tex @@ -11,14 +11,10 @@ \date{\begin{small}\today \\ This manual documents Bacula version \input{version} \\ \vspace{0.2in} - Copyright {\copyright} 1999-\the\year, Free Software Foundation Europe - e.V. \\ + Copyright {\copyright} 1999-\the\year, Bacula Systems SA \\ + All Rights Reserved. \\ Bacula\raisebox{0.1ex}{\textsuperscript\textregistered} is a registered trademark of Kern Sibbald.\\ \vspace{0.2in} - Permission is granted to copy, distribute and/or modify this document under the terms of the - GNU Free Documentation License, Version 1.2 published by the Free Software Foundation; - with no Invariant Sections, no Front-Cover Texts, and no Back-Cover Texts. - A copy of the license is included in the section entitled ``GNU Free Documentation License''. \end{small} } \input{header-footer} diff --git a/docs/upload b/docs/upload index fa666dc7..c80b70b6 100755 --- a/docs/upload +++ b/docs/upload @@ -19,14 +19,14 @@ sendit() echo " " echo "Sending: $1/$i" echo "To: $2/$i" - rsync -avz --delete --progress $1/$i/ $2/$i/ + rsync -avz --delete --progress $1/$i/$i/ $2/$i/$i/ rsync -avz --delete --progress $1/$i/$i.pdf $2/$i/ done } -dest=bacula:/var/www/bacula/6.2.x-manuals/${lang} -echo "Sending to $dest" -sendit $src $dest +#dest=bacula:/var/www/bacula/6.2.x-manuals/${lang} +#echo "Sending to $dest" +#sendit $src $dest dest=bsweb:/var/www/docs/6.2.x-manuals/${lang} echo "Sending to $dest"