Put techdocs in right place

diff --git a/docs/batch_insert_documentation.odt b/docs/batch_insert_documentation.odt
deleted file mode 100644 (file)
index e15ce18..0000000
Binary files a/docs/batch_insert_documentation.odt and /dev/null differ

diff --git a/docs/manual/dataencryption.tex b/docs/manual/dataencryption.tex
index d9a294af6796293f8bc60d50b9f36a31512f52c9..d181015ce93225d3d62fa5c73173ab9bc9426eeb 100644 (file)
--- a/docs/manual/dataencryption.tex
+++ b/docs/manual/dataencryption.tex
@@ -133,6 +133,18 @@ Generate  a File Daemon Key Pair for each FD:
 \end{verbatim}
 \normalsize
 
+Note, there seems to be a lot of confusion around the file extensions given
+to these keys.  For example, a .pem file can contain all the following:
+private keys (RSA and DSA), public keys (RSA and DSA) and (x509) certificates. 
+It is the default format for OpenSSL. It stores data Base64 encoded DER format,
+surrounded by ASCII headers, so is suitable for text mode transfers between
+systems. A .pem file may contain any number of keys either public or
+private. We use it in cases where there is both a public and a private
+key.
+
+Typically, above we have used the .cert extension to refer to X509
+certificate encoding that contains only a single public key.
+
 
 \section{Example Data Encryption Configuration}
 \index[general]{Example!File Daemon Configuration File}

diff --git a/docs/manual/dirdconf.tex b/docs/manual/dirdconf.tex
index 9960056f1d42407e352613ff0fcce8f7434973e9..7f636ea67e64b8457440662abcb01a9d579ddab5 100644 (file)
--- a/docs/manual/dirdconf.tex
+++ b/docs/manual/dirdconf.tex
@@ -1756,16 +1756,23 @@ precedes the first ISO week (i.e. has the first few days of the year if any
 occur before Thursday). w00 is not defined by the ISO specification. A week
 starts with Monday and ends with Sunday. 
 
+According to the NIST (US National Institute of Standards and Technology),
+12am and 12pm are ambiguous and can be defined to anything.  However,
+12:01am is the same as 00:01 and 12:01pm is the same as 12:01, so Bacula
+defines 12am as 00:00 (midnight) and 12pm as 12:00 (noon).  You can avoid
+this abiguity (confusion) by using 24 hour time specifications (i.e.  no
+am/pm). This is the definition in Bacula version 2.0.3 and later.
+
 An example schedule resource that is named {\bf WeeklyCycle} and runs a job
-with level full each Sunday at 1:05am and an incremental job Monday through
-Saturday at 1:05am is: 
+with level full each Sunday at 2:05am and an incremental job Monday through
+Saturday at 2:05am is: 
 
 \footnotesize
 \begin{verbatim}
 Schedule {
   Name = "WeeklyCycle"
-  Run = Level=Full sun at 1:05
-  Run = Level=Incremental mon-sat at 1:05
+  Run = Level=Full sun at 2:05
+  Run = Level=Incremental mon-sat at 2:05
 }
 \end{verbatim}
 \normalsize
@@ -1776,9 +1783,9 @@ An example of a possible monthly cycle is as follows:
 \begin{verbatim}
 Schedule {
   Name = "MonthlyCycle"
-  Run = Level=Full Pool=Monthly 1st sun at 1:05
-  Run = Level=Differential 2nd-5th sun at 1:05
-  Run = Level=Incremental Pool=Daily mon-sat at 1:05
+  Run = Level=Full Pool=Monthly 1st sun at 2:05
+  Run = Level=Differential 2nd-5th sun at 2:05
+  Run = Level=Incremental Pool=Daily mon-sat at 2:05
 }
 \end{verbatim}
 \normalsize
@@ -1789,8 +1796,8 @@ The first of every month:
 \begin{verbatim}
 Schedule {
   Name = "First"
-  Run = Level=Full on 1 at 1:05
-  Run = Level=Incremental on 2-31 at 1:05
+  Run = Level=Full on 1 at 2:05
+  Run = Level=Incremental on 2-31 at 2:05
 }
 \end{verbatim}
 \normalsize
@@ -3112,8 +3119,8 @@ FileSet {
 # When to do the backups
 Schedule {
   Name = "WeeklyCycle"
-  Run = level=Full sun at 1:05
-  Run = level=Incremental mon-sat at 1:05
+  Run = level=Full sun at 2:05
+  Run = level=Incremental mon-sat at 2:05
 }
 # Client (File Services) to backup
 Client {

diff --git a/docs/manual/migration.tex b/docs/manual/migration.tex
index 5ccf899e3b22c69702b402d00e978a4a4da94fb8..b0d49df20e83244de5a810d8fb8682353d330036 100644 (file)
--- a/docs/manual/migration.tex
+++ b/docs/manual/migration.tex
@@ -313,6 +313,9 @@ are used to define a Migration job.
 \item Only migration of Selection Types of Job and Volume have 
      been carefully tested. All the other migration methods (time,
      occupancy, smallest, oldest, ...) need additional testing.
+
+\item Migration is only implemented for a single Storage daemon.  You
+     cannot read on one Storage daemon and write on another.
 \end{itemize}
 
 

diff --git a/docs/techlogs/batch_insert_documentation.odt b/docs/techlogs/batch_insert_documentation.odt
new file mode 100644 (file)
index 0000000..c6dcf32
Binary files /dev/null and b/docs/techlogs/batch_insert_documentation.odt differ

diff --git a/docs/techlogs/wx-console-interface.sxw b/docs/techlogs/wx-console-interface.sxw
new file mode 100644 (file)
index 0000000..5f871cc
Binary files /dev/null and b/docs/techlogs/wx-console-interface.sxw differ

diff --git a/docs/wx-console-interface.sxw b/docs/wx-console-interface.sxw
deleted file mode 100644 (file)
index 5f871cc..0000000
Binary files a/docs/wx-console-interface.sxw and /dev/null differ