httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From wr...@apache.org
Subject cvs commit: httpd-site/xdocs/dev anoncvs.txt devnotes.xml how-to-release.xml index.xml
Date Mon, 25 Nov 2002 05:17:40 GMT
wrowe       2002/11/24 21:17:40

  Modified:    xdocs/dev anoncvs.txt devnotes.xml how-to-release.xml
                        index.xml
  Log:
    Update the xdocs/dev source to reflect the recent docs/dev changes.
  
  Revision  Changes    Path
  1.2       +9 -2      httpd-site/xdocs/dev/anoncvs.txt
  
  Index: anoncvs.txt
  ===================================================================
  RCS file: /home/cvs/httpd-site/xdocs/dev/anoncvs.txt,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- anoncvs.txt	21 Nov 2001 07:14:17 -0000	1.1
  +++ anoncvs.txt	25 Nov 2002 05:17:40 -0000	1.2
  @@ -60,9 +60,9 @@
   The password is "anoncvs" (without the quotation marks) for
   both servers.
   
  -To check out the current development tree:
  +To check out the stable Apache 2.0 release tree:
   
  -  user@host:~$ cvs checkout httpd-2.0
  +  user@host:~$ cvs checkout -d httpd-2.0 -r APACHE_2_0_BRANCH httpd-2.0
     cvs server: Updating httpd-2.0
     U httpd-2.0/ABOUT_APACHE
     U httpd-2.0/Announcement
  @@ -98,6 +98,13 @@
     U apr-util/test/.cvsignore
     U apr-util/test/Makefile.in
     U apr-util/test/testdbm.c
  +
  +
  +To check out the current Apache 2.1 development tree, use the following 
  +command for the base checkout, and then proceed with the apr and apr-util 
  +checkout commands as shown above:
  +
  +  user@host:~$ cvs checkout -d httpd-2.1 httpd-2.0
   
   
   To checkout the stable release tree (version 1.3):
  
  
  
  1.4       +10 -1     httpd-site/xdocs/dev/devnotes.xml
  
  Index: devnotes.xml
  ===================================================================
  RCS file: /home/cvs/httpd-site/xdocs/dev/devnotes.xml,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- devnotes.xml	24 Nov 2001 07:14:17 -0000	1.3
  +++ devnotes.xml	25 Nov 2002 05:17:40 -0000	1.4
  @@ -95,7 +95,7 @@
     out as follows:</p>
     <source>
   % cd /usr/local/apache
  -% cvs checkout httpd-2.0
  +% cvs checkout -d httpd-2.0 -r APACHE_2_0_BRANCH httpd-2.0
   % cd httpd-2.0/srclib
   % cvs checkout apr apr-util</source>
     <p>The httpd-2.0 repository takes advantage of APR and APR-util from the
  @@ -104,6 +104,15 @@
     use anonymous CVS to get those repositories.  We are looking in to 
     solving this problem.</p>
     </section>
  +
  +  <section><title>httpd-2.1</title>
  +<p>If you want to check out the bleeding edge of development, the httpd-2.1
  +  development tree (slated for a release 2.2), use cvs HEAD as follows:</p>
  +  <source>
  +% cd /usr/local/apache
  +% cvs checkout -d httpd-2.1 httpd-2.0
  +% cd httpd-2.1/srclib
  +% cvs checkout apr apr-util</source>
   
     <section><title>site</title>
     <p>This module contains the files that live at
  
  
  
  1.8       +5 -2      httpd-site/xdocs/dev/how-to-release.xml
  
  Index: how-to-release.xml
  ===================================================================
  RCS file: /home/cvs/httpd-site/xdocs/dev/how-to-release.xml,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- how-to-release.xml	6 Apr 2002 14:28:01 -0000	1.7
  +++ how-to-release.xml	25 Nov 2002 05:17:40 -0000	1.8
  @@ -53,9 +53,12 @@
        <code><b>/home/cvs/CVSROOT/modules</b></code> do that for
you).
     <p>
        For Apache 2.<em>X</em>:<br />
  -     <code><b>$ cvs checkout -P httpd-2.<em>X</em></b></code><br
/>
  +     <code><b>$ cvs checkout -r APACHE_2_<em>X</em>_BRANCH -Pd
httpd-2.<em>X</em></b> httpd-2.0</code><br />
        <code><b>$ cd httpd-2.<i>X</i>/srclib</b></code><br
/>
  -     <code><b>$ cvs checkout apr apr-util</b></code>
  +     <code><b>$ cvs checkout apr apr-util</b></code><br />
  +     Omit the -r APACHE_2_<em>X</em>_BRANCH flag for the current development
  +     branch (e.g. 2.1-dev.)  The current development branch always sits at
  +     cvs HEAD.
     </p>
    </li>
    <li>cd into the <code>apache</code> CVS tree.<br />
  
  
  
  1.6       +22 -0     httpd-site/xdocs/dev/index.xml
  
  Index: index.xml
  ===================================================================
  RCS file: /home/cvs/httpd-site/xdocs/dev/index.xml,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- index.xml	20 Aug 2002 07:14:39 -0000	1.5
  +++ index.xml	25 Nov 2002 05:17:40 -0000	1.6
  @@ -16,6 +16,28 @@
   </section>
   
   <section>
  +<title>Developer News</title>
  +
  +<blockquote>
  +The Apache HTTP Server Project has begun development of the 2.1-dev branch!
  +The developers seek to maintain module compatibility between 2.0.42 and 
  +future 2.0 releases for administrators and end users, while continuing the 
  +forward progress that has made the 2.0 server faster and more scalable.
  +</blockquote>
  +<blockquote>
  +Developers who have active CVS trees may want to cvs up -r APACHE_2_0_BRANCH
  +to continue to work with the current httpd-2.0 cvs sources.  Developers who
  +want to work in the 2.1-dev sandbox should continue to use cvs HEAD.
  +</blockquote>
  +<blockquote>
  +The simplest way for committers to work with this change is to commit new
  +work to the 2.1-dev sources (cvs HEAD), obtain appropriate feedback, and 
  +finally commit back to the APACHE_2_0_BRANCH those stable and well tested
  +changes that don't break compatibility with the most recent 2.0 release.
  +</blockquote>
  +</section>
  +
  +<section>
   <title>Feedback and contributions</title>
     <ul type="square">
       <li>Contributing <a href="/bug_report.html">bug reports</a>
  
  
  

Mime
View raw message