From daa99cae45b9d0f7be52f2e5edc7b352a350c582 Mon Sep 17 00:00:00 2001
From: Kern Sibbald <kern@sibbald.com>
Date: Fri, 1 Mar 2013 10:14:56 +0100
Subject: [PATCH] Fix cover page and copyright

---
 docs/manuals/en/console/console.tex          | 1 -
 docs/manuals/en/developers/developers.tex    | 1 -
 docs/manuals/en/main/main.tex                | 4 ----
 docs/manuals/en/misc/misc.tex                | 4 ----
 docs/manuals/en/{main.tex => one-manual.tex} | 0
 docs/manuals/en/problems/problems.tex        | 1 -
 docs/manuals/en/utility/utility.tex          | 1 -
 docs/manuals/licences/coverpage.tex          | 8 ++------
 docs/upload                                  | 8 ++++----
 9 files changed, 6 insertions(+), 22 deletions(-)
 rename docs/manuals/en/{main.tex => one-manual.tex} (100%)

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/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/main.tex b/docs/manuals/en/one-manual.tex
similarity index 100%
rename from docs/manuals/en/main.tex
rename to docs/manuals/en/one-manual.tex
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"
-- 
2.39.5