From: Kern Sibbald <kern@sibbald.com>
Date: Tue, 7 Feb 2017 14:10:30 +0000 (+0100)
Subject: Fix some out of date text
X-Git-Tag: Release-7.4.5~1
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=141457437624c55ea230413f11d0854df335aacb;p=bacula%2Fdocs

Fix some out of date text
---

diff --git a/docs/manuals/en/developers/git.tex b/docs/manuals/en/developers/git.tex
index 53702cc6..c433413f 100644
--- a/docs/manuals/en/developers/git.tex
+++ b/docs/manuals/en/developers/git.tex
@@ -47,34 +47,34 @@ single directory, because of the hash code nature of Git, you
 must take all or nothing.
 
 For developers, the most important thing to remember about Git and
-the Source Forge repository is not to "force" a {\bf push} to the
+the bacula.org repository is not to "force" a {\bf push} to the
 repository. Doing so, can possibly rewrite
 the Git repository history and cause a lot of problems for the 
 project.
 
-You can get a full copy of the Source Forge Bacula Git repository with the
+You can get a full copy of the Bacula Git repository with the
 following command:
 
 \begin{verbatim}
-git clone http://git.bacula.org/bacula trunk
+git clone http://git.bacula.org/bacula.git bacula
 \end{verbatim}
 
-This will put a read-only copy into the directory {\bf trunk} 
-in your current directory, and {\bf trunk} will contain
+This will put a read-only copy into the directory {\bf bacula} 
+in your current directory, and {\bf bacula} will contain
 the subdirectories: {\bf bacula}, {\bf gui}, and {\bf regress}.
-Obviously you can use any name an not just {\bf trunk}.  In fact,
-once you have the repository in say {\bf trunk}, you can copy the
+Obviously you can use any name an not just {\bf bacula}.  In fact,
+once you have the repository in say {\bf bacula}, you can copy the
 whole directory to another place and have a fully functional
 git repository.
 
 The above command needs to be done only once. Thereafter, you can:
 
 \begin{verbatim}
-cd trunk
+cd bacula
 git pull     # refresh my repo with the latest code
 \end{verbatim}
 
-As of August 2009, the size of the repository ({\bf trunk} in the above
+As of August 2009, the size of the repository ({\bf bacula} in the above
 example) will be approximately 55 Megabytes.  However, if you build
 from source in this directory and do a lot of updates and regression
 testing, the directory could become several hundred megabytes.
@@ -90,13 +90,13 @@ Some of the differences between Git and SVN are:
   and must commit. In fact, we suggest you commit frequently.
 \item When you commit, the commit goes into your local Git
   database.  You must use another command to write it to the
-  master Source Forge repository (see below).
+  master bacula.org repository (see below).
 \item The local Git database is kept in the directory {\bf .git} at the 
   top level of the directory.
 \item All the important Git configuration information is kept in the
   file {\bf .git/config} in ASCII format that is easy to manually edit.
 \item When you do a {\bf commit} the changes are put in {\bf .git}
-  rather but not in the main Source Forge repository.
+  rather but not in the main bacula.org repository.
 \item You can push your changes to the external repository using
   the command {\bf git push} providing you have write permission
   on the repository.
@@ -166,7 +166,7 @@ machine regardless of how many git repos you work with.
 
 \item Download the Source code:\\
 \begin{verbatim}
-git clone http://git.bacula.org/bacula trunk
+git clone http://git.bacula.org/bacula.git bacula
 \end{verbatim}
 
 \item Configure and Build Bacula:\\
@@ -177,7 +177,7 @@ make
 
 \item Create a branch to work on:
 \begin{verbatim}
-cd trunk/bacula
+cd bacula/bacula
 git checkout -b bugfix master
 \end{verbatim}
 
@@ -299,15 +299,15 @@ git format-patch -M master
 
 Normally, you will work by creating a branch of the master branch of your
 repository, make your modifications, then make sure it is up to date, and finally
-create format-patch patches or push it to the Source Forge repo. Assuming
-you call the Bacula repository {\bf trunk}, you might use the following
+create format-patch patches or push it to the bacula.org. Assuming
+you call the Bacula repository {\bf bacula}, you might use the following
 commands:
 
 \begin{verbatim}
-cd trunk
-git checkout master
+cd bacula
+git checkout bacula
 git pull 
-git checkout -b newbranch master
+git checkout -b newbranch bacula
 (edit, ...)
 git add <file-edited>
 git commit -m "<comment about commit>"
@@ -317,7 +317,7 @@ git commit -m "<comment about commit>"
 When you have completed working on your branch, you will do:
 
 \begin{verbatim}
-cd trunk
+cd bacula
 git checkout newbranch  # ensure I am on my branch
 git pull                # get latest source code
 git rebase master       # merge my code
diff --git a/docs/manuals/en/developers/regression.tex b/docs/manuals/en/developers/regression.tex
index 6c2ae868..937cd44d 100644
--- a/docs/manuals/en/developers/regression.tex
+++ b/docs/manuals/en/developers/regression.tex
@@ -39,7 +39,7 @@ are working in your home directory in a non-root account):
 
 \footnotesize
 \begin{verbatim}
-git clone http://git.bacula.org/bacula bacula
+git clone http://git.bacula.org/bacula.git bacula
 \end{verbatim}
 \normalsize
 
diff --git a/docs/manuals/en/utility/progs.tex b/docs/manuals/en/utility/progs.tex
index 9dd507fa..435cebf7 100644
--- a/docs/manuals/en/utility/progs.tex
+++ b/docs/manuals/en/utility/progs.tex
@@ -12,7 +12,7 @@ developers in dealing with Volumes external to Bacula.
 \section{Specifying the Configuration File}
 \index[general]{Specifying the Configuration File}
 
-Starting with version 1.27, each of the following programs requires a valid
+Each of the following programs requires a valid
 Storage daemon configuration file (actually, the only part of the
 configuration file that these programs need is the {\bf Device} resource
 definitions). This permits the programs to find the configuration parameters
@@ -619,12 +619,14 @@ backup.
 \index[general]{Catalog!Using bscan to Compare a Volume to an existing}
 \index[general]{Using bscan to Compare a Volume to an existing Catalog}
 
-If you wish to compare the contents of a Volume to an existing catalog without
-changing the catalog, you can safely do so if and only if you do {\bf not}
-specify either the {\bf -m} or the {\bf -s} options. However, at this time
-(Bacula version 1.26), the comparison routines are not as good or as thorough
-as they should be, so we don't particularly recommend this mode other than for
-testing. 
+If you wish to compare the contents of a Volume to an existing catalog
+without changing the catalog, you can safely do so if and only if you do
+{\bf not} specify either the {\bf -m} or the {\bf -s} options in order to
+avoid modifying the catalog.  However, not every record that is stored in
+the catalog is stored on the volumes, so we don't particularly
+recommend using {\bf bscan} other than for testing.  Probably the best
+way to compare what is on a Volume to what is in the Catalog is to use
+one of the Verify Job options.
 
 \subsection{Using bscan to Recreate a Catalog from a Volume}
 \index[general]{Volume!Using bscan to Recreate a Catalog from a Volume}