From: Kern Sibbald <kern@sibbald.com>
Date: Thu, 8 Feb 2007 11:42:17 +0000 (+0000)
Subject: Update devel guide for SVN + add presentations
X-Git-Tag: Release-2.2.0~1072
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=9c685714d25002ccc3aec13a670b409b779b12ab;p=bacula%2Fdocs

Update devel guide for SVN + add presentations
---

diff --git a/docs/developers/generaldevel.tex b/docs/developers/generaldevel.tex
index 824dde78..6f50e221 100644
--- a/docs/developers/generaldevel.tex
+++ b/docs/developers/generaldevel.tex
@@ -309,14 +309,52 @@ trunk/
   rescue/
 \end{verbatim}
 
-If you only want the current source code, you could use:
+Note, you should NEVER commit code to any checkout that you have
+done of a tag.  All tags (e.g. Release-1.1, ... Release-2.0.2) 
+should be considered read-only.
+
+You may commit code to the most recent item in
+branches (in the above the most recent one is Branch-2.0).  If
+you want to commit code to an older branch, then please contact
+Kern first.
+
+You may create your own tags and/or branches, but they should
+have a name clearly distinctive from Branch-, Release-, or Beta-,
+which are official names used by the project.  If you create a
+tag, then you should NEVER commit code to it, for the same 
+reason noted above -- it should serve as a marker for something
+you released.  If you create a branch, then you are free to
+commit to it as you wish.
+
+You may, of course, commit to the trunk.
+
+In summary:
 
 \begin{verbatim}
-svn checkout https://bacula.svn.sourceforge.net/svnroot/bacula/trunk/bacula bacula
+branches
+  Branch-nnn
+tags
+  Release-nnn
+  Beta-nnn
 \end{verbatim}
 
+are reserved names to be created only by the project manager (or
+with his OK), where the nnn is any sequence of numbers and
+periods (e.g. 2.0, 2.0.1, ...).  
+
+In addition all tags even those that you create are read-only
+forever. Typically tags represent release points either in the
+trunc or in a branch.
+
+
+Coming back to getting source code. 
+If you only want the current Bacula source code, you could use:
+
+\begin{verbatim}
+svn checkout https://bacula.svn.sourceforge.net/svnroot/bacula/trunk/bacula bacula
+\end{verbatim}
 
-To view what is in the svn, point your browser at the following URL:
+To view what is in the SVN, point your browser at the following URL:
 http://bacula.svn.sourceforge.net/viewvc/bacula/  
 
 Many of the Subversion (svn) commands are almost identical to those that
diff --git a/docs/developers/imagename_translations b/docs/developers/imagename_translations
index 8cfd734f..186c14f0 100644
--- a/docs/developers/imagename_translations
+++ b/docs/developers/imagename_translations
@@ -1,2 +1,2 @@
-img1.png
./bacula-logo.eps
 img2.png
./smartall.eps
+img1.png
./bacula-logo.eps
diff --git a/docs/home-page/presentations/Bacula-FOSDEM-talk-25Feb07.pdf b/docs/home-page/presentations/Bacula-FOSDEM-talk-25Feb07.pdf
index 025d6066..e042f3f3 100644
Binary files a/docs/home-page/presentations/Bacula-FOSDEM-talk-25Feb07.pdf and b/docs/home-page/presentations/Bacula-FOSDEM-talk-25Feb07.pdf differ
diff --git a/docs/presentations/Bacula-FOSDEM-talk-25Feb07.odp b/docs/presentations/Bacula-FOSDEM-talk-25Feb07.odp
new file mode 100644
index 00000000..38896143
Binary files /dev/null and b/docs/presentations/Bacula-FOSDEM-talk-25Feb07.odp differ
diff --git a/docs/presentations/Bacula-Paris-talk-12May05-English.odp b/docs/presentations/Bacula-Paris-talk-12May05-English.odp
new file mode 100644
index 00000000..00252521
Binary files /dev/null and b/docs/presentations/Bacula-Paris-talk-12May05-English.odp differ