Update

diff --git a/docs/.gitignore b/docs/.gitignore
index c40195746fd57f4acc6e214d100f0f91166c70a7..79ffb0587d55ad28c573b372431b3da4e4b4e6c1 100644 (file)
--- 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 3352f45a228ed7c1eefce184b8e2e49e5cfaa20c..fe3821a790726a584af8098ff4b8cc0edc9a2ad0 100644 (file)
--- 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 c823db919b92393df0a44845ac82a7c9edc3625b..29949fadbf4c6942608f8a5c2f5aabfd8770d1ef 100644 (file)
--- 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 0e5723deb1f763f3ffab05e27be1d6cfc6545799..02d1e1c3a2606402ad59a96bcb704ae159c6c211 100644 (file)
--- 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/catalog/internaldb.tex
deleted file mode 100644 (file)
index 65cd0ea..0000000
--- a/docs/manuals/en/catalog/internaldb.tex
+++ /dev/null
@@ -1,76 +0,0 @@
-%%
-%%
-
-\chapter{The internal database is not supported, please do not
-use it.}
-\label{InternalDbChapter}
-\index[general]{Use it!The internal database is not supported please
-do not }
-\index[general]{The internal database is not supported, please do not
-use it. }
-
-\section{Internal Bacula Database}
-\index[general]{Internal Bacula Database }
-\index[general]{Database!Internal Bacula }
-
-Previously it was intended to be used primarily by Bacula developers for
-testing; although SQLite is also a good choice for this. We do not recommend
-its use in general. 
-
-This database is simplistic in that it consists entirely of Bacula's internal
-structures appended sequentially to a file. Consequently, it is in most cases
-inappropriate for sites with many clients or systems with large numbers of
-files, or long-term production environments. 
-
-Below, you will find a table comparing the features available with SQLite and
-MySQL and with the internal Bacula database. At the current time, you cannot
-dynamically switch from one to the other, but must rebuild the Bacula source
-code. If you wish to experiment with both, it is possible to build both
-versions of Bacula and install them into separate directories. 
-
-\addcontentsline{lot}{table}{SQLite vs MySQL Database Comparison}
-\begin{longtable}{|l|l|l|}
- \hline 
-\multicolumn{1}{|c| }{\bf Feature } & \multicolumn{1}{c| }{\bf SQLite or MySQL
- } & \multicolumn{1}{c| }{\bf Bacula  } \\
- \hline 
-{Job Record  } & {Yes  } & {Yes  } \\
- \hline 
-{Media Record  } & {Yes  } & {Yes  } \\
- \hline 
-{FileName Record  } & {Yes  } & {No  } \\
- \hline 
-{File Record  } & {Yes  } & {No  } \\
- \hline 
-{FileSet Record  } & {Yes  } & {Yes  } \\
- \hline 
-{Pool Record  } & {Yes  } & {Yes  } \\
- \hline 
-{Client Record  } & {Yes  } & {Yes  } \\
- \hline 
-{JobMedia Record  } & {Yes  } & {Yes  } \\
- \hline 
-{List Job Records  } & {Yes  } & {Yes  } \\
- \hline 
-{List Media Records  } & {Yes  } & {Yes  } \\
- \hline 
-{List Pool Records  } & {Yes  } & {Yes  } \\
- \hline 
-{List JobMedia Records } & {Yes  } & {Yes  } \\
- \hline 
-{Delete Pool Record  } & {Yes  } & {Yes  } \\
- \hline 
-{Delete Media Record  } & {Yes  } & {Yes  } \\
- \hline 
-{Update Pool Record  } & {Yes  } & {Yes  } \\
- \hline 
-{Implement Verify  } & {Yes  } & {No  } \\
- \hline 
-{MD5 Signatures  } & {Yes  } & {No }
-\\ \hline 
-
-\end{longtable}
-
-In addition, since there is no SQL available, the Console commands: {\bf
-sqlquery}, {\bf query}, {\bf retention}, and any other command that directly
-uses SQL are not available with the Internal database. 

diff --git a/docs/manuals/en/misc/internaldb.tex b/docs/manuals/en/misc/internaldb.tex
new file mode 100644 (file)
index 0000000..65cd0ea
--- /dev/null
+++ b/docs/manuals/en/misc/internaldb.tex
@@ -0,0 +1,76 @@
+%%
+%%
+
+\chapter{The internal database is not supported, please do not
+use it.}
+\label{InternalDbChapter}
+\index[general]{Use it!The internal database is not supported please
+do not }
+\index[general]{The internal database is not supported, please do not
+use it. }
+
+\section{Internal Bacula Database}
+\index[general]{Internal Bacula Database }
+\index[general]{Database!Internal Bacula }
+
+Previously it was intended to be used primarily by Bacula developers for
+testing; although SQLite is also a good choice for this. We do not recommend
+its use in general. 
+
+This database is simplistic in that it consists entirely of Bacula's internal
+structures appended sequentially to a file. Consequently, it is in most cases
+inappropriate for sites with many clients or systems with large numbers of
+files, or long-term production environments. 
+
+Below, you will find a table comparing the features available with SQLite and
+MySQL and with the internal Bacula database. At the current time, you cannot
+dynamically switch from one to the other, but must rebuild the Bacula source
+code. If you wish to experiment with both, it is possible to build both
+versions of Bacula and install them into separate directories. 
+
+\addcontentsline{lot}{table}{SQLite vs MySQL Database Comparison}
+\begin{longtable}{|l|l|l|}
+ \hline 
+\multicolumn{1}{|c| }{\bf Feature } & \multicolumn{1}{c| }{\bf SQLite or MySQL
+ } & \multicolumn{1}{c| }{\bf Bacula  } \\
+ \hline 
+{Job Record  } & {Yes  } & {Yes  } \\
+ \hline 
+{Media Record  } & {Yes  } & {Yes  } \\
+ \hline 
+{FileName Record  } & {Yes  } & {No  } \\
+ \hline 
+{File Record  } & {Yes  } & {No  } \\
+ \hline 
+{FileSet Record  } & {Yes  } & {Yes  } \\
+ \hline 
+{Pool Record  } & {Yes  } & {Yes  } \\
+ \hline 
+{Client Record  } & {Yes  } & {Yes  } \\
+ \hline 
+{JobMedia Record  } & {Yes  } & {Yes  } \\
+ \hline 
+{List Job Records  } & {Yes  } & {Yes  } \\
+ \hline 
+{List Media Records  } & {Yes  } & {Yes  } \\
+ \hline 
+{List Pool Records  } & {Yes  } & {Yes  } \\
+ \hline 
+{List JobMedia Records } & {Yes  } & {Yes  } \\
+ \hline 
+{Delete Pool Record  } & {Yes  } & {Yes  } \\
+ \hline 
+{Delete Media Record  } & {Yes  } & {Yes  } \\
+ \hline 
+{Update Pool Record  } & {Yes  } & {Yes  } \\
+ \hline 
+{Implement Verify  } & {Yes  } & {No  } \\
+ \hline 
+{MD5 Signatures  } & {Yes  } & {No }
+\\ \hline 
+
+\end{longtable}
+
+In addition, since there is no SQL available, the Console commands: {\bf
+sqlquery}, {\bf query}, {\bf retention}, and any other command that directly
+uses SQL are not available with the Internal database. 

diff --git a/docs/manuals/en/misc/misc.kilepr b/docs/manuals/en/misc/misc.kilepr
index 11c12315a073f55ea990dea25b5eabc887f61dcc..9dc8bfa5a531c06bcfa87a068622631ff0837ba2 100644 (file)
--- 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 86fe4a0c3270cefb8af13822802e228cac2e3396..59351e525fc4a26ae226f2a19a3fe2783df29a34 100644 (file)
--- 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 820fe79e26332d2870677e1b79dd1c89e3b40230..f4c5d295411d536e6a766c1c3ca6b89205111a52 100755 (executable)
--- 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/; \