Update

diff --git a/docs/developers/version.tex b/docs/developers/version.tex
index 1f84c3417828c640765a257b18deae328882749d..641fda3b3193f5be82d5db5b750fa057b4937a13 100644 (file)
--- a/docs/developers/version.tex
+++ b/docs/developers/version.tex
@@ -1 +1 @@
-2.1.22 (25 June 2007)
+2.1.26 (12 July 2007)

diff --git a/docs/home-page/inc/header.php b/docs/home-page/inc/header.php
index 201580f3cf454075c3aa8353f52608c0d1012c53..88b27c13685be774f646b43c96a0b0d06cf1080a 100644 (file)
--- a/docs/home-page/inc/header.php
+++ b/docs/home-page/inc/header.php
@@ -160,11 +160,13 @@
         <div class="menuItem">
            <ul class="menuitem">
            <li class="menuItem"> <a href="<? echo $spath ?>/?page=projects"> Projects </a> </li>
+  <!--
            <li class="menuItem"> <a href="<? echo $spath ?>/?page=vote"> Project Vote </a> </li>
+  -->
            </ul>
         </div>
 
-        <!-- Donations -->
+  <!-- Donations
         <div class="menuHead"> Donations </div>
         <div class="menuItem">
            <ul class="menuitem">
@@ -173,6 +175,8 @@
            </ul>
         </div>
 
+  -->
+
         <div class="menuHead">
         <div class="icons">
            <a href="http://www.sectoor.de"><img src="http://www.sectoor.de/grafiken/button_klein2.png" alt="Sectoor Logo"></a>

diff --git a/docs/manual-de/version.tex b/docs/manual-de/version.tex
index 1f84c3417828c640765a257b18deae328882749d..641fda3b3193f5be82d5db5b750fa057b4937a13 100644 (file)
--- a/docs/manual-de/version.tex
+++ b/docs/manual-de/version.tex
@@ -1 +1 @@
-2.1.22 (25 June 2007)
+2.1.26 (12 July 2007)

diff --git a/docs/manual/dirdconf.tex b/docs/manual/dirdconf.tex
index 50cef84693643db023a68c515533c527a1cce8c6..eb038e2103b3e68a78af50af25e51212994fd90e 100644 (file)
--- a/docs/manual/dirdconf.tex
+++ b/docs/manual/dirdconf.tex
@@ -1515,12 +1515,9 @@ RunScript {
    run = "Nightly-backup level=%l since=\"%s\" storage=DDS-4"
 \end{verbatim}
 
-
    A cloned job will not start additional clones, so it is not
    possible to recurse.
 
-   
-
 \label{Priority}
 \item [Priority = \lt{}number\gt{}]
    \index[dir]{Priority}
@@ -2604,9 +2601,21 @@ The Pool Resource defined in the Director's configuration file
 \item [RecyclePool = \lt{}pool-resource-name\gt{}]
    \index[dir]{RecyclePool}
    \index[dir]{Directive!RecyclePool}
-
-   On versions 2.1.4 or greater, Bacula can recycle media in the pool of your
-   choice. The most useful setup is to use \ilink{Scratch}{TheScratchPool}.
+   On versions 2.1.4 or greater, this directive defines to which pool
+   the Volume will be placed (moved) when it is recycled. Without
+   this directive, a Volume will remain in the same pool when it is
+   recycled. With this directive, it can be moved automatically to any
+   existing pool during a recycle. This directive is probably most
+   useful when defined in the Scratch pool, so that volumes will
+   be recycled back into the Scratch pool. For more on the see the   
+   \ilink{Scratch Pool}{TheScratchPool} section of this manual.
+
+   Although this directive is called RecyclePool, the Volume in
+   question is actually moved from its current pool to the one
+   you specify on this directive when Bacula prunes the Volume and
+   discovers that there are no records left in the catalog and hence
+   marks it as {\bf Purged}.
+        
    
 \label{PoolRecycle}
 \item [Recycle = \lt{}yes|no\gt{}]

diff --git a/docs/manual/install.tex b/docs/manual/install.tex
index 02468b1fc9b5a3f12116498f46bfa243d7f69a8f..cdbc720e26e6baf276a294fe037492de924ad27f 100644 (file)
--- a/docs/manual/install.tex
+++ b/docs/manual/install.tex
@@ -648,7 +648,7 @@ customize your installation.
    Note, the main HTML and PDF Bacula documents are in a separate
    tar file that is not part of the source distribution.
 
-\item [ {-}{-}datadir=\lt{}path\gt{}]
+\item [ {-}{-}datadir=\lt{}path\gt{} ]
    \index[general]{{-}{-}datadir}
    If you translate Bacula or parts of Bacula into a different language
    you may specify the location of the po files using the {\bf
@@ -673,7 +673,30 @@ customize your installation.
    libqt4 and libqt4-devel libraries, and you want to use the
    Bacula Administration Tool (bat) GUI Console interface to Bacula, you
    must specify this option.  Doing so will build everything in the {\bf
-   src/qt-console} directory.
+   src/qt-console} directory.  In addition to the Qt4 libraries, bat
+   needs the qwt package installed on your system. Please see the
+   next configure item for the details.
+
+\item [ {-}{-}with-qwt=\lt{}path\gt{} ]
+  \index[general]{{-}{-}with-qwt}
+  To build bat, you need the qwt graphics package installed on
+  your system.  The qwt package is available for download from
+  the qwt project on Source Forge.  If you wish, you may build and 
+  install it on your system (by default in /usr/lib).  If you have
+  done so, you would specify:
+
+\begin{verbose}
+ --with-qwt=/usr/lib/qwt-5.0.2
+\end{verbose}
+
+  Alternatively, you can download the Bacula depkgs package (currently
+  version 11Jul07) and build it, then assuming that you have put it 
+  into a directory named bacula, you would specify:
+
+\begin{verbose}
+ --with-qwt=$HOME/bacula/depkgs/qwt
+\end{verbose}
+
 
 \item [ {-}{-}enable-batch-insert ]
    \index[general]{{-}{-}enable-batch-insert}
@@ -1168,6 +1191,7 @@ CFLAGS="-g -Wall" ./configure \
   --with-pid-dir=$HOME/bacula/bin/working \
   --with-subsys-dir=$HOME/bacula/bin/working \
   --enable-bat \
+  --with-qwt=$HOME/bacula/depkgs/qwt \
   --enable-conio
 \end{verbatim}
 \normalsize
@@ -1201,6 +1225,7 @@ CFLAGS="-g -Wall" ./configure \
   --with-scriptdir=/etc/bacula \
   --enable-smartalloc \
   --enable-bat \
+  --with-qwt=$HOME/bacula/depkgs/qwt \
   --with-mysql \
   --with-working-dir=/var/bacula \
   --with-pid-dir=/var/run \
@@ -1329,6 +1354,7 @@ CFLAGS="-g -Wall" \
     --enable-smartalloc \
     --enable-gnome \
     --enable-bat \
+    --with-qwt=$HOME/bacula/depkgs/qwt \
     --enable-bwx-console \
     --enable-tray-monitor \
     --with-pid-dir=$HOME/bacula/bin/working \

diff --git a/docs/manual/version.tex b/docs/manual/version.tex
index 1f84c3417828c640765a257b18deae328882749d..641fda3b3193f5be82d5db5b750fa057b4937a13 100644 (file)
--- a/docs/manual/version.tex
+++ b/docs/manual/version.tex
@@ -1 +1 @@
-2.1.22 (25 June 2007)
+2.1.26 (12 July 2007)