From: Fabian Keil <fk@fabiankeil.de>
Date: Tue, 20 Mar 2012 13:04:03 +0000 (+0000)
Subject: Comment out references to multiple branches
X-Git-Tag: v_3_0_20~365
X-Git-Url: http://www.privoxy.org/gitweb/%22https:/faq/developer-manual/@default-cgi@/toggle?a=commitdiff_plain;h=d8024e835e3e1efcaaf2bd118172d44b2b5c17ca;p=privoxy.git
Comment out references to multiple branches
We currently don't use any.
---
diff --git a/doc/source/developer-manual.sgml b/doc/source/developer-manual.sgml
index 3250f770..d7a3d8d5 100644
--- a/doc/source/developer-manual.sgml
+++ b/doc/source/developer-manual.sgml
@@ -24,7 +24,7 @@
This file belongs into
ijbswa.sourceforge.net:/home/groups/i/ij/ijbswa/htdocs/
- $Id: developer-manual.sgml,v 2.41 2012/03/19 12:56:08 fabiankeil Exp $
+ $Id: developer-manual.sgml,v 2.42 2012/03/20 13:03:05 fabiankeil Exp $
Copyright (C) 2001-2012 Privoxy Developers http://www.privoxy.org/
See LICENSE.
@@ -51,7 +51,7 @@
</pubdate>
- <pubdate>$Id: developer-manual.sgml,v 2.41 2012/03/19 12:56:08 fabiankeil Exp $</pubdate>
+ <pubdate>$Id: developer-manual.sgml,v 2.42 2012/03/20 13:03:05 fabiankeil Exp $</pubdate>
<!--
@@ -190,6 +190,7 @@ Hal.
url="http://ijbswa.cvs.sourceforge.net/ijbswa/">http://ijbswa.cvs.sourceforge.net/ijbswa/</ulink>,
which might help with visualizing how these pieces fit together.
</para>
+ <!--
<para>
Branches are used to fork a sub-development path from the main trunk.
Within the <literal>current</literal> module where the sources are, there
@@ -204,6 +205,7 @@ Hal.
linkend="versionnumbers">Version Numbers</link> below for details on
versioning.)
</para>
+ -->
<para>
At one time there were two distinct branches: stable and unstable. The
more drastic changes were to be in the unstable branch. These branches
@@ -227,8 +229,8 @@ Hal.
<para>
The source tree is the heart of every software project. Every effort must
be made to ensure that it is readable, compilable and consistent at all
- times. There are differing guidelines for the stable branch and the
- main development trunk, and we ask anyone with CVS access to strictly
+ times. <!-- There are differing guidelines for the stable branch and the
+ main development trunk, and --> We expect anyone with CVS access to strictly
adhere to the following guidelines:
</para>
@@ -3064,6 +3066,9 @@ at sourceforge. Three simple steps:
Temple Place - Suite 330, Boston, MA 02111-1307, USA.
$Log: developer-manual.sgml,v $
+ Revision 2.42 2012/03/20 13:03:05 fabiankeil
+ Bump copyright date
+
Revision 2.41 2012/03/19 12:56:08 fabiankeil
Untabify