From 652cbe32867fda26aace6bbdb5f08ef69ce4d8b2 Mon Sep 17 00:00:00 2001
From: Kern Sibbald <kern@sibbald.com>
Date: Sat, 31 Oct 2009 17:12:15 +0100
Subject: [PATCH] Update

---
 docs/.gitignore                               | 40 +++++--------------
 docs/home-page/en/pages/documentation.php     | 11 +++--
 docs/manuals/en/catalog/catalog.kilepr        |  9 -----
 docs/manuals/en/catalog/catalog.tex           |  1 -
 .../en/{catalog => misc}/internaldb.tex       |  0
 docs/manuals/en/misc/misc.kilepr              |  9 +++++
 docs/manuals/en/misc/misc.tex                 |  1 +
 docs/send                                     |  2 +-
 8 files changed, 28 insertions(+), 45 deletions(-)
 rename docs/manuals/en/{catalog => misc}/internaldb.tex (100%)

diff --git a/docs/.gitignore b/docs/.gitignore
index c4019574..79ffb058 100644
--- a/docs/.gitignore
+++ b/docs/.gitignore
@@ -47,42 +47,20 @@ manuals/en/*/*.eps
 *.snd
 *.toc
 manuals/en/*.sty
-manuals/*/install/installi-console.tex
-manuals/*/install/installi-dir.tex
-manuals/*/install/installi-fd.tex
-manuals/*/install/installi-general.tex
-manuals/*/install/installi-sd.tex
-manuals/*/catalog/catalogi-console.tex
-manuals/*/catalog/catalogi-dir.tex
-manuals/*/catalog/catalogi-fd.tex
-manuals/*/catalog/catalogi-general.tex
-manuals/*/catalog/catalogi-sd.tex
+manuals/*/install/installi-*.tex
+manuals/*/catalog/catalogi-*.tex
 manuals/*/concepts/concepts.pdf
-manuals/*/concepts/conceptsi-console.tex
-manuals/*/concepts/conceptsi-dir.tex
-manuals/*/concepts/conceptsi-fd.tex
-manuals/*/concepts/conceptsi-general.tex
-manuals/*/concepts/conceptsi-sd.tex
+manuals/*/concepts/conceptsi-*.tex
 manuals/*/console/console.pdf
-manuals/*/console/consolei-console.tex
-manuals/*/console/consolei-dir.tex
-manuals/*/console/consolei-fd.tex
-manuals/*/console/consolei-general.tex
-manuals/*/console/consolei-sd.tex
-manuals/*/developers/developersi-general.tex
+manuals/*/console/consolei-*.tex
+manuals/*/developers/developersi-*.tex
 manuals/*/developers/developers.pdf
-manuals/*/developers/developersi-console.tex
-manuals/*/developers/developersi-dir.tex
-manuals/*/developers/developersi-fd.tex
-manuals/*/developers/developersi-general.tex
-manuals/*/developers/developersi-sd.tex
+manuals/*/misc/misci-*.tex
+manuals/*/misc/misc.pdf
+manuals/*/misc/misc/
 manuals/*/install/install.pdf
 manuals/*/problems/problems.pdf
 manuals/*/problems/problems/
 manuals/*/utility/utility.pdf
 manuals/*/utility/utility/
-manuals/*/utility/utilityi-console.tex
-manuals/*/utility/utilityi-dir.tex
-manuals/*/utility/utilityi-fd.tex
-manuals/*/utility/utilityi-general.tex
-manuals/*/utility/utilityi-sd.tex
+manuals/*/utility/utilityi-*.tex
diff --git a/docs/home-page/en/pages/documentation.php b/docs/home-page/en/pages/documentation.php
index 3352f45a..fe3821a7 100644
--- a/docs/home-page/en/pages/documentation.php
+++ b/docs/home-page/en/pages/documentation.php
@@ -84,15 +84,20 @@
       <li>Catalog Database Guide
          <a href="/3.1.x-manuals/en/catalog/catalog.pdf"> PDF</a>
          <a href="/3.1.x-manuals/en/catalog/catalog/index.html">/HTML </a>
-      </li>
+         </li>
       <li>Utility Programs
          <a href="/3.1.x-manuals/en/utility/utility.pdf"> PDF</a>
          <a href="/3.1.x-manuals/en/utility/utility/index.html">/HTML </a>
-      </li>
+         </li>
       <li>Developers' Guide
          <a href="/3.1.x-manuals/en/developers/developers.pdf"> PDF</a>
          <a href="/3.1.x-manuals/en/developers/developers/index.html">/HTML </a>
-      </li><br>
+         </li>
+      <li>Miscellaneous Guide
+         <a href="/3.1.x-manuals/en/misc/misc.pdf"> PDF</a>
+         <a href="/3.1.x-manuals/en/misc/misc/index.html">/HTML </a>
+         </li>
+      <br>
       <li> Free Software Foundation Europe FLA
          <a href="FLA-bacula.en.pdf">PDF</a>
        -- (Developer's Fiduciary License Agreement)</li>
diff --git a/docs/manuals/en/catalog/catalog.kilepr b/docs/manuals/en/catalog/catalog.kilepr
index c823db91..29949fad 100644
--- a/docs/manuals/en/catalog/catalog.kilepr
+++ b/docs/manuals/en/catalog/catalog.kilepr
@@ -42,15 +42,6 @@ line=0
 open=false
 order=-1
 
-[item:internaldb.tex]
-archive=true
-column=0
-encoding=
-highlight=
-line=0
-open=false
-order=-1
-
 [item:mysql.tex]
 archive=true
 column=0
diff --git a/docs/manuals/en/catalog/catalog.tex b/docs/manuals/en/catalog/catalog.tex
index 0e5723de..02d1e1c3 100644
--- a/docs/manuals/en/catalog/catalog.tex
+++ b/docs/manuals/en/catalog/catalog.tex
@@ -70,7 +70,6 @@
 \include{mysql}
 \include{postgresql}
 \include{sqlite}
-\include{internaldb}
 \include{fdl}
 
 
diff --git a/docs/manuals/en/catalog/internaldb.tex b/docs/manuals/en/misc/internaldb.tex
similarity index 100%
rename from docs/manuals/en/catalog/internaldb.tex
rename to docs/manuals/en/misc/internaldb.tex
diff --git a/docs/manuals/en/misc/misc.kilepr b/docs/manuals/en/misc/misc.kilepr
index 11c12315..9dc8bfa5 100644
--- a/docs/manuals/en/misc/misc.kilepr
+++ b/docs/manuals/en/misc/misc.kilepr
@@ -51,6 +51,15 @@ line=0
 open=false
 order=-1
 
+[item:internaldb.tex]
+archive=true
+column=25
+encoding=
+highlight=
+line=0
+open=false
+order=-1
+
 [item:lesser.tex]
 archive=true
 column=0
diff --git a/docs/manuals/en/misc/misc.tex b/docs/manuals/en/misc/misc.tex
index 86fe4a0c..59351e52 100644
--- a/docs/manuals/en/misc/misc.tex
+++ b/docs/manuals/en/misc/misc.tex
@@ -50,6 +50,7 @@
 \include{stunnel}
 \include{dvd}
 \include{projects}
+\include{internaldb}
 \include{license}
 \include{fdl}
 \include{gpl}
diff --git a/docs/send b/docs/send
index 820fe79e..f4c5d295 100755
--- a/docs/send
+++ b/docs/send
@@ -7,7 +7,7 @@ fi
 cwd=`pwd`
 echo $cwd
 lang=$1
-for i in catalog concepts console developers install problems utility; do \
+for i in catalog concepts console developers install misc problems utility; do \
   cd $cwd/manuals/${lang}/$i; \
   scp -r -P 2020 $i/ bacula.org:/var/www/bacula/3.1.x-manuals/${lang}/$i/; \
   scp -P 2020 $i.pdf bacula.org:/var/www/bacula/3.1.x-manuals/${lang}/$i/; \
-- 
2.39.2