From: Colm MacCarthaigh Date: Sun, 2 Oct 2005 20:39:15 +0000 (+0000) Subject: Merge r290162 from trunk. No policy changes, just update to pointing at X-Git-Tag: 2.1.9~78 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3b0c8f7f31f850b8a5be03cc9d5af2a44d40aee2;p=thirdparty%2Fapache%2Fhttpd.git Merge r290162 from trunk. No policy changes, just update to pointing at subversion. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@293162 13f79535-47bb-0310-9956-ffa450edef68 --- diff --git a/VERSIONING b/VERSIONING index 3bfea278b1b..613f19ca7d7 100644 --- a/VERSIONING +++ b/VERSIONING @@ -1,6 +1,6 @@ APACHE 2.x VERSIONING ===================== -Last modified at [$Date$] +[$LastChangedDate$] INTRODUCTION @@ -67,11 +67,11 @@ keeping the stable tree as safe as possible: to the 2.4-stable release if they cannot be incorporated in the current stable release due to API change requirements. - * The stable CVS tree should not remain unstable at any time. Atomic commits - aught be used to introduce code from the development version to the stable - tree. At any given time a security release may be in preparation, + * The stable subversion tree should not remain unstable at any time. Atomic + commits aught be used to introduce code from the development version to the + stable tree. At any given time a security release may be in preparation, unbeknownst to other contributors. At any given time, testers may be - checking out CVS head to confirm that a bug has been corrected. And as + checking out SVN trunk to confirm that a bug has been corrected. And as all code was well-tested in development prior to committing to the stable tree, there is really no reason for this tree to be broken for more than a few minutes during a lengthy commit.