X-Git-Url: http://www.privoxy.org/gitweb/?p=privoxy.git;a=blobdiff_plain;f=doc%2Fwebserver%2Fdeveloper-manual%2Fnewrelease.html;h=60995a2aff057212bef613eafe23b5a74b9c6271;hp=e4655feabb1d8d2a22f66edc8256471a9bca9285;hb=60cbbc5f5d7514135bc5afc02d24e77a231c47f4;hpb=900ef1d91632a70d1bbb4c3117e9027509b35d7e diff --git a/doc/webserver/developer-manual/newrelease.html b/doc/webserver/developer-manual/newrelease.html index e4655fea..60995a2a 100644 --- a/doc/webserver/developer-manual/newrelease.html +++ b/doc/webserver/developer-manual/newrelease.html @@ -3,9 +3,6 @@ - - Releasing a New Version @@ -14,23 +11,10 @@ - - +
@@ -124,9 +108,9 @@ body { being committed. Stable branches will then have their version reported as 0.0.0, during that period between releases when changes are being added. This is to denote - that this code is not for - release. Then as the release nears, the version is bumped - according: e.g. 3.0.1 -> 0.0.0 -> + that this code is not + for release. Then as the release nears, the version is + bumped according: e.g. 3.0.1 -> 0.0.0 -> 3.0.2.

@@ -143,15 +127,15 @@ body { -> 3.0.1 -> 3.0.2, etc are all stable releases from within the stable branch. 3.1.x is currently the main trunk, and where work on 3.2.x is taking place. If any questions, please post to the devel list - before committing to a stable - branch!

+ before committing + to a stable branch!

Developers should remember too that if they commit a bugfix to the stable branch, this will more than likely require a separate submission to the main trunk, since these are separate development trees within CVS. If you are working on both, then this would require at least two - separate check outs (i.e main trunk, and the stable release branch, which is + separate check outs (i.e main trunk, and the stable release branch, which is v_3_0_branch at the moment).

@@ -159,8 +143,8 @@ body {

6.2. Before the Release: Freeze

-

The following must be done by one - of the developers prior to each new release.

+

The following must be + done by one of the developers prior to each new release.