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/docs/dev anoncvs.txt devnotes.html how-to-release.html index.html
Date Sun, 24 Nov 2002 19:57:24 GMT
wrowe       2002/11/24 11:57:24

  Modified:    docs/dev anoncvs.txt devnotes.html how-to-release.html
                        index.html
  Log:
    Based on the reversion of the httpd module rename, correct the /dev/
    documentation to match.
  
  Revision  Changes    Path
  1.4       +6 -5      httpd-site/docs/dev/anoncvs.txt
  
  Index: anoncvs.txt
  ===================================================================
  RCS file: /home/cvs/httpd-site/docs/dev/anoncvs.txt,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- anoncvs.txt	23 Nov 2002 20:00:06 -0000	1.3
  +++ anoncvs.txt	24 Nov 2002 19:57:24 -0000	1.4
  @@ -62,8 +62,8 @@
   
   To check out the stable Apache 2.0 release tree:
   
  -  user@host:~$ cvs checkout -d httpd-2.0 -r APACHE_2_0_BRANCH httpd
  -  cvs server: Updating httpd
  +  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
     U httpd-2.0/Apache.dsp
  @@ -100,10 +100,11 @@
     U apr-util/test/testdbm.c
   
   
  -To check out the current Apache 2.1 development tree, use the same
  -commands as above, but use the following command for initial checkout:
  +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
  +  user@host:~$ cvs checkout -d httpd-2.1 httpd-2.0
   
   
   To checkout the stable release tree (version 1.3):
  
  
  
  1.18      +2 -2      httpd-site/docs/dev/devnotes.html
  
  Index: devnotes.html
  ===================================================================
  RCS file: /home/cvs/httpd-site/docs/dev/devnotes.html,v
  retrieving revision 1.17
  retrieving revision 1.18
  diff -u -r1.17 -r1.18
  --- devnotes.html	23 Nov 2002 20:00:06 -0000	1.17
  +++ devnotes.html	24 Nov 2002 19:57:24 -0000	1.18
  @@ -202,7 +202,7 @@
         <td bgcolor="#023264" width="1"><img src="/images/void.gif" width="1" height="1"
vspace="0" hspace="0" border="0"/></td>
         <td bgcolor="#ffffff"><pre>
   % cd /usr/local/apache
  -% cvs checkout -d httpd-2.0 -r APACHE_2_0_BRANCH httpd
  +% cvs checkout -d httpd-2.0 -r APACHE_2_0_BRANCH httpd-2.0
   % cd httpd-2.0/srclib
   % cvs checkout apr apr-util</pre></td>
         <td bgcolor="#023264" width="1"><img src="/images/void.gif" width="1" height="1"
vspace="0" hspace="0" border="0"/></td>
  @@ -232,7 +232,7 @@
         <td bgcolor="#023264" width="1"><img src="/images/void.gif" width="1" height="1"
vspace="0" hspace="0" border="0"/></td>
         <td bgcolor="#ffffff"><pre>
   % cd /usr/local/apache
  -% cvs checkout -d httpd-2.1 httpd
  +% cvs checkout -d httpd-2.1 httpd-2.0
   % cd httpd-2.1/srclib
   % cvs checkout apr apr-util</pre></td>
         <td bgcolor="#023264" width="1"><img src="/images/void.gif" width="1" height="1"
vspace="0" hspace="0" border="0"/></td>
  
  
  
  1.23      +5 -2      httpd-site/docs/dev/how-to-release.html
  
  Index: how-to-release.html
  ===================================================================
  RCS file: /home/cvs/httpd-site/docs/dev/how-to-release.html,v
  retrieving revision 1.22
  retrieving revision 1.23
  diff -u -r1.22 -r1.23
  --- how-to-release.html	23 Nov 2002 20:00:06 -0000	1.22
  +++ how-to-release.html	24 Nov 2002 19:57:24 -0000	1.23
  @@ -110,9 +110,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 -r APACHE_2_0_BRANCH -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.23      +4 -11     httpd-site/docs/dev/index.html
  
  Index: index.html
  ===================================================================
  RCS file: /home/cvs/httpd-site/docs/dev/index.html,v
  retrieving revision 1.22
  retrieving revision 1.23
  diff -u -r1.22 -r1.23
  --- index.html	23 Nov 2002 20:00:06 -0000	1.22
  +++ index.html	24 Nov 2002 19:57:24 -0000	1.23
  @@ -91,17 +91,10 @@
   want to work in the 2.1-dev sandbox should continue to use cvs HEAD.
   </blockquote>
   <blockquote>
  -To clear up the ambiguity the repository is now named httpd.  httpd-2.0 now
  -points to httpd, so that older name will work.  We encourage you to use the
  -new cvs repository name.
  -</blockquote>
  -<blockquote>
  -The APACHE_2_0_BRANCH is now operating under R-T-C (review, then commit)
  -guidelines, requiring review of all new patches.  The 2.1-dev cvs HEAD
  -branch continues to operate under C-T-R policy.  The simplest way to work 
  -with these procedures is to commit to 2.1-dev, obtain the required feedback
  -(3 +1 votes), and finally commit back to 2.0 those changes that don't break 
  -compatibility.
  +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>
     </blockquote>
    </td></tr>
  
  
  

Mime
View raw message