You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by fi...@apache.org on 2001/11/22 01:55:16 UTC
cvs commit: httpd-site/xdocs/dev devnotes.xml
fielding 01/11/21 16:55:16
Modified: docs/dev binaries.html how-to-release.html patches.html
docs/dev/dist HEADER.html
xdocs/dev devnotes.xml
Log:
Minimal changes necessary to update old stuff and build site.
Revision Changes Path
1.2 +1 -1 httpd-site/docs/dev/binaries.html
Index: binaries.html
===================================================================
RCS file: /home/cvs/httpd-site/docs/dev/binaries.html,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- binaries.html 2001/11/21 07:31:46 1.1
+++ binaries.html 2001/11/22 00:55:16 1.2
@@ -103,7 +103,7 @@
a core developer, you can upload the archive and README to the Apache
site. An easy way to do this is with 'ssh'.
<blockquote><code>
-scp apache_1.3.x-<i>platform</i>.* www.apache.org:/www/apache.org/dist/binaries/<i>platform</i>
+scp apache_1.3.x-<i>platform</i>.* www.apache.org:/www/www.apache.org/dist/httpd/binaries/<i>platform</i>
</code></blockquote>
Typically this should only be done after the web site has been update (see step
30 in the <a href="how-to-release.html">release notes</a>) and if possible
1.2 +42 -41 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.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- how-to-release.html 2001/11/21 07:31:46 1.1
+++ how-to-release.html 2001/11/22 00:55:16 1.2
@@ -42,7 +42,7 @@
<H2><A NAME="tarball">How to build an Apache Unix release</A></H2>
<P><FONT COLOR="red">Note:</FONT> The below assumes that you are
-using <CODE>ssh</CODE> to login to your <CODE>dev.apache.org</CODE>
+using <CODE>ssh</CODE> to login to your <CODE>httpd.apache.org</CODE>
account. If you are "rolling the tarball" remotely, the differences
will be noted.
@@ -88,7 +88,7 @@
<code><b>$ cvs commit Announcement</b></code><br>
<p>
<b>Note:</b> This document is also present in the
- <code>apache-site/dist/</code> directory, both in HTML and plain
+ <code>httpd-dist</code> cvs module, both in HTML and plain
text form. You may want to create one version out of the other.
</ul>
<HR>
@@ -262,19 +262,20 @@
<CODE><B>$ rm -fr apache_<EM>Z.X.Y</EM></B></CODE>
<P>
<LI> Make the tarball available for testing purposes
- (in <A HREF="http://dev.apache.org/dist/">http://dev.apache.org/dist/</A>):<BR>
+ (in <A HREF="http://httpd.apache.org/dev/dist/">http://httpd.apache.org/dev/dist/</A>):<BR>
<CODE><B>$ chmod 664 CHANGES_<EM>Z.X</EM> apache_<EM>Z.X.Y</EM>.tar.*</B></CODE><BR>
- <CODE><B>$ cp -pv apache_<EM>Z.X.Y</EM>.tar.gz /www/dev.apache.org/dist/</B></CODE><BR>
- <CODE><B>$ cp -pv apache_<EM>Z.X.Y</EM>.tar.gz.asc /www/dev.apache.org/dist/</B></CODE><BR>
- <CODE><B>$ cp -pv apache_<EM>Z.X.Y</EM>.tar.Z /www/dev.apache.org/dist/</B></CODE><BR>
- <CODE><B>$ cp -pv apache_<EM>Z.X.Y</EM>.tar.Z.asc /www/dev.apache.org/dist/</B></CODE><BR>
- <CODE><B>$ chmod g+w /www/dev.apache.org/dist/apache_<EM>Z.X.Y</EM>.tar.*</B></CODE><BR>
+ <CODE><B>$ cp -pv apache_<EM>Z.X.Y</EM>.tar.gz /www/httpd.apache.org/dev/dist/</B></CODE><BR>
+ <CODE><B>$ cp -pv apache_<EM>Z.X.Y</EM>.tar.gz.asc /www/httpd.apache.org/dev/dist/</B></CODE><BR>
+ <CODE><B>$ cp -pv apache_<EM>Z.X.Y</EM>.tar.Z /www/httpd.apache.org/dev/dist/</B></CODE><BR>
+ <CODE><B>$ cp -pv apache_<EM>Z.X.Y</EM>.tar.Z.asc /www/httpd.apache.org/dev/dist/</B></CODE><BR>
+ <CODE><B>$ chmod g+w /www/httpd.apache.org/dev/dist/apache_<EM>Z.X.Y</EM>.tar.*</B></CODE><BR>
<UL>
<LI><FONT COLOR="red">Note:</FONT> If rolling the tarball
remotely, you should use <CODE>scp</CODE> to place them
- in <CODE>dev.apache.org</CODE> in the <CODE>/www/dev.apache.org/dist</CODE>
+ in <CODE>httpd.apache.org</CODE> in the
+ <CODE>/www/httpd.apache.org/dev/dist/</CODE>
directory.
</UL>
@@ -345,41 +346,43 @@
<P>
<LI> Make the distribution available
- (in <A HREF="http://www.apache.org/dist/">http://www.apache.org/dist/</A>)
+ (in <A HREF="http://www.apache.org/dist/httpd/">http://www.apache.org/dist/httpd/</A>)
Z is either 1 or 2:<BR>
- <CODE><B>$ cp CHANGES_<EM>Z.X</EM> /www/www.apache.org/dist/CHANGES_<EM>Z.X</EM></B></CODE><BR>
- <CODE><B>$ cp apache_<EM>Z.X.Y</EM>.tar.gz /www/www.apache.org/dist</B></CODE><BR>
- <CODE><B>$ cp apache_<EM>Z.X.Y</EM>.tar.gz.asc /www/www.apache.org/dist</B></CODE><BR>
- <CODE><B>$ cp apache_<EM>Z.X.Y</EM>.tar.Z /www/www.apache.org/dist</B></CODE><BR>
- <CODE><B>$ cp apache_<EM>Z.X.Y</EM>.tar.Z.asc /www/www.apache.org/dist</B></CODE><BR>
+ <CODE><B>$ cp CHANGES_<EM>Z.X</EM> /www/www.apache.org/dist/httpd/CHANGES_<EM>Z.X</EM></B></CODE><BR>
+ <CODE><B>$ cp apache_<EM>Z.X.Y</EM>.tar.gz /www/www.apache.org/dist/httpd/</B></CODE><BR>
+ <CODE><B>$ cp apache_<EM>Z.X.Y</EM>.tar.gz.asc /www/www.apache.org/dist/httpd/</B></CODE><BR>
+ <CODE><B>$ cp apache_<EM>Z.X.Y</EM>.tar.Z /www/www.apache.org/dist/httpd/</B></CODE><BR>
+ <CODE><B>$ cp apache_<EM>Z.X.Y</EM>.tar.Z.asc /www/www.apache.org/dist/httpd/</B></CODE><BR>
<UL>
<LI><FONT COLOR="red">Note:</FONT> If rolling the tarball
remotely, you should use <CODE>scp</CODE> to place them
- in <CODE>dev.apache.org</CODE> in the <CODE>/www/apache.org/dist/</CODE>
- directory.
+ in <CODE>www.apache.org</CODE> in the
+ <CODE>/www/www.apache.org/dist/httpd/</CODE> directory.
</UL>
If the Win32 binary is already built and tested at this point,
you can add it to the dist directory as well as to the
<CODE>binaries/win32/</CODE> directory.
<P>
- <LI> Checkout the <A HREF="http://www.apache.org/">Apache site</A> if needed into a scratch directory:<BR>
- <CODE><B>$ cvs checkout apache-site</B></CODE>
+ <LI> Checkout the
+ <A HREF="http://www.apache.org/dist/httpd/">httpd-dist site</A>,
+ if needed, into a scratch directory:<BR>
+ <CODE><B>$ cvs -d cvs.apache.org:/home/cvs checkout -P httpd-dist</B></CODE>
<P>
- <LI> cd into the <CODE>apache-site</CODE> CVS tree.<BR>
- <CODE><B>$ cd apache-site/dist/</B></CODE>
+ <LI> Change directory into <CODE>httpd-dist</CODE><BR>
+ <CODE><B>$ cd httpd-dist/</B></CODE>
<P>
<LI> Edit the files
- <A HREF="http://www.apache.org/dist/README.html"><CODE>README.html</CODE></A> and <A HREF="http://www.apache.org/dist/HEADER.html"><CODE>HEADER.html</CODE></A> as well as
- <A HREF="http://www.apache.org/dist/Announcement.html"><CODE>Announcement.html</CODE></A> and its plaintext equivalent
- <A HREF="http://www.apache.org/dist/Announcement.txt"><CODE>Announcement.txt</CODE></A> plus the
- <A HREF="http://www.apache.org/dist/.htaccess"><CODE>.htaccess</CODE></A> file (which defines the
+ <A HREF="http://www.apache.org/dist/httpd/README.html"><CODE>README.html</CODE></A> and <A HREF="http://www.apache.org/dist/httpd/HEADER.html"><CODE>HEADER.html</CODE></A> as well as
+ <A HREF="http://www.apache.org/dist/httpd/Announcement.html"><CODE>Announcement.html</CODE></A> and its plaintext equivalent
+ <A HREF="http://www.apache.org/dist/httpd/Announcement.txt"><CODE>Announcement.txt</CODE></A> plus the
+ <A HREF="http://www.apache.org/dist/httpd/.htaccess"><CODE>.htaccess</CODE></A> file (which defines the
<CODE>AddDescription</CODE> comments)
from the <CODE>apache-site</CODE> CVS tree
as required (all in the
- <A HREF="http://www.apache.org/dist/"><CODE>./dist</CODE></A>
+ <A HREF="http://www.apache.org/dist/httpd/"><CODE>./dist</CODE></A>
subdirectory). The <CODE>Announcement.*</CODE> files should be based on the <CODE>Announcement</CODE> file in the tagged CVS tree. For Apache 2.0,
<CODE>Announcement</CODE> should be replaced with <CODE>Announcement2</CODE>:<BR>
@@ -398,36 +401,34 @@
<CODE><B>$ cd ../..</B></CODE>
<P>
<LI> Checkout the <A HREF="http://httpd.apache.org/">httpd site</A> if needed into a scratch directory:<BR>
- <CODE><B>$ cvs checkout httpd-site</B></CODE>
+ <CODE><B>$ cvs -d cvs.apache.org:/home/cvs checkout httpd-site</B></CODE>
<P>
- <LI> cd into the <CODE>httpd-site</CODE> CVS tree.<BR>
- <CODE><B>$ cd httpd-site/</B></CODE>
+ <LI> cd into the <CODE>httpd-site</CODE> xdocs tree.<BR>
+ <CODE><B>$ cd httpd-site/xdocs/</B></CODE>
<P>
- <LI> Edit the <A HREF="http://httpd.apache.org/"><CODE>index.html</CODE></A>
+ <LI> Edit the <A HREF="http://httpd.apache.org/"><CODE>index.xml</CODE></A>
page from the <CODE>httpd-site</CODE> CVS tree as required:<BR>
- <CODE><B>$ vi index.html</B></CODE><BR>
+ <CODE><B>$ vi index.xml</B></CODE><BR>
<P>
<LI> Commit the changes:<BR>
- <CODE><B>$ cvs commit index.html</B></CODE><BR>
+ <CODE><B>$ cd ..<BR>
+ <CODE><B>$ ./build.sh # Check result before continuing<BR>
+ <CODE><B>$ cvs commit</B></CODE><BR>
<P>
- <LI> Update the checked-out versions of the <CODE>apache-site</CODE> documents
+ <LI> Update the checked-out versions of the <CODE>httpd-dist</CODE> documents
for the web server:<BR>
<CODE><B>$ umask 002</B></CODE><BR>
- <CODE><B>$ cd /www/www.apache.org/dist/</B></CODE><BR>
- <CODE><B>$ cvs update README.html \<BR>
- HEADER.html \<br>
- Announcement.html \<BR>
- Announcement.txt \<BR>
- .htaccess</B></CODE>
+ <CODE><B>$ cd /www/www.apache.org/dist/httpd/</B></CODE><BR>
+ <CODE><B>$ cvs update -dP</B></CODE>
<P>
<LI> Create an empty directory for future patches:<BR>
- <CODE><B>$ mkdir dist/patches/apply_to_1.<EM>X.Y</EM></B></CODE>
+ <CODE><B>$ mkdir patches/apply_to_1.<EM>X.Y</EM></B></CODE>
<P>
<LI> Update the checked-out version of the <CODE>httpd-site index.html</CODE>
page for the web server:<BR>
<CODE><B>$ umask 002</B></CODE><BR>
<CODE><B>$ cd /www/httpd.apache.org/</B></CODE><BR>
- <CODE><B>$ cvs update index.html</B></CODE>
+ <CODE><B>$ cvs update -dP</B></CODE>
<P>
<LI>At this point, the web-sites reflect the existance of the new release.
<p>
1.3 +2 -2 httpd-site/docs/dev/patches.html
Index: patches.html
===================================================================
RCS file: /home/cvs/httpd-site/docs/dev/patches.html,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- patches.html 2001/11/21 07:56:53 1.2
+++ patches.html 2001/11/22 00:55:16 1.3
@@ -142,8 +142,8 @@
bugs in the code in preparation for a release.</p>
<p>If your patch doesn't make it into the core, but you're still
willing to let the core distribute your work, then your patch might
-make it to the <a href="http://httpd.apache.org/dist/contrib/">contributed area on
-apache.org</a>.</p>
+make it to the <a href="http://www.apache.org/dist/httpd/contrib/">contributed area on
+www.apache.org</a>.</p>
</blockquote>
</td></tr>
</table>
1.2 +1 -1 httpd-site/docs/dev/dist/HEADER.html
Index: HEADER.html
===================================================================
RCS file: /home/cvs/httpd-site/docs/dev/dist/HEADER.html,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- HEADER.html 2001/11/21 07:31:46 1.1
+++ HEADER.html 2001/11/22 00:55:16 1.2
@@ -5,4 +5,4 @@
<P>Please do not use them unless you are prepared for the consequences</P>
<P>If you are looking for the most recently released distributions, go to
- <A HREF="http://httpd.apache.org/dist/">http://httpd.apache.org/dist/</A></P>
+ <A HREF="http://www.apache.org/dist/httpd/">http://www.apache.org/dist/httpd/</A></P>
1.2 +56 -84 httpd-site/xdocs/dev/devnotes.xml
Index: devnotes.xml
===================================================================
RCS file: /home/cvs/httpd-site/xdocs/dev/devnotes.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- devnotes.xml 2001/11/21 07:14:17 1.1
+++ devnotes.xml 2001/11/22 00:55:16 1.2
@@ -77,84 +77,46 @@
<section>
<title>CVS Modules</title>
<p>There are several different modules in the Apache CVS repository:</p>
- <dl compact="compact">
- <dt><samp>apache-1.2</samp>
- </dt>
- <dd>
- To create a directory tree containing the 1.2.<em>x</em> sources,
- and call it <samp>apache-1.2</samp>, change your current directory
- to the <em>parent</em> of the tree and then check the 1.2 sources
- out as follows:
- </p>
- <p>
- <dl>
- <dd><samp>% cd /usr/local/apache
- <BR>
- % cvs checkout apache-1.2</samp>
- </dd>
- </dl>
- </p>
- </dd>
- <dt><samp>apache-1.3</samp>
- </dt>
- <dd>
- To create a directory tree containing the 1.3 sources,
- and call it <samp>apache-1.3</samp>, change your current directory
- to the <em>parent</em> of the tree and then check the 1.3 sources
- out as follows:
- </p>
- <p>
- <dl>
- <dd><samp>% cd /usr/local/apache
- <BR>
- % cvs checkout apache-1.3</samp>
- </dd>
- </dl>
- </p>
- </dd>
- <dt><samp>httpd-2.0</samp>
- </dt>
- <dd>
- To create a directory tree containing the 2.0 sources,
- and call it <samp>httpd-2.0</samp>, change your current directory
- to the <em>parent</em> of the tree and then check the 2.0 sources
- out as follows:
- </p>
- <p>
- <dl>
- <dd><samp>% cd /usr/local/apache
- <BR>
- % cvs checkout httpd-2.0
- <BR>
- % cd httpd-2.0/srclib
- <BR>
- % cvs checkout apr apr-util</samp>
- </dd>
- </dl>
- </p>
- The httpd-2.0 repository takes advantage of APR and APR-util from the
- Apache portable run-time, so those must be checked out separately.
- Because not all httpd contributors have access to APR, you may need to
- use anonymous CVS to get those repositories. We are looking in to
- solving this problem.
- </p>
- </dd>
- <dt><samp>apache-site</samp>
- </dt>
- <dd>This module contains the files that live at
- <samp>http://www.apache.org/</samp>. The directory on the host that
- maps to that URL is actually a set of checked-out working copies of
- the CVS files.
- <BLOCKQUOTE>
- <P ALIGN="CENTER">
- <strong>Note</strong>
- </p>
+
+ <section><title>apache-1.3</title>
+ <p>To create a directory tree containing the 1.3 sources,
+ and call it <samp>apache-1.3</samp>, change your current directory
+ to the <em>parent</em> of the tree and then check the 1.3 sources
+ out as follows:</p>
+ <source>
+% cd /usr/local/apache
+% cvs checkout apache-1.3</source>
+ </section>
+
+ <section><title>httpd-2.0</title>
+ <p>To create a directory tree containing the 2.0 sources,
+ and call it <samp>httpd-2.0</samp>, change your current directory
+ to the <em>parent</em> of the tree and then check the 2.0 sources
+ out as follows:</p>
+ <source>
+% cd /usr/local/apache
+% cvs checkout 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
+ Apache portable run-time, so those must be checked out separately.
+ Because not all httpd contributors have access to APR, you may need to
+ use anonymous CVS to get those repositories. We are looking in to
+ solving this problem.</p>
+ </section>
+
+ <section><title>site</title>
+ <p>This module contains the files that live at
+ <samp>http://www.apache.org/</samp>. The directory on the host that
+ maps to that URL is actually a set of checked-out working copies of
+ the CVS files.</p>
+ <make_note>
It is important that the files on the Web host not be modified
directly. If you want or need to change one, check it out into a
private working copy, modify <strong>that</strong>, commit the
- change into CVS, and then perform a <samp>cvs update</samp> to
+ change into CVS, and then perform a <samp>cvs update -dP</samp> to
bring the host directory into sync with the CVS sources.
- </BLOCKQUOTE>
+ </make_note>
<p>
The Web site directories are <em>not</em> maintained in synch with
the CVS files automatically. They are manually updated from CVS by
@@ -162,17 +124,27 @@
issue, unless a group of files are being updated according to an
ongoing group discussion.
</p>
- </dd>
- <dt><samp>apache-devsite</samp>
- </dt>
- <dd>Like the <samp>apache-site</samp> module, this one is used ot
- maintain the files that comprise a Webs site - in this case,
- <samp>http://dev.apache.org/</samp>. Also like the previous module,
+ </section>
+
+ <section><title>httpd-site</title>
+ <p>Like the <samp>site</samp> module, this one is used ot
+ maintain the files that comprise a website - in this case,
+ <samp>http://httpd.apache.org/</samp>. Also like the previous module,
the directory on the server is a checked-out working copy of this
- module.
- </dd>
- </dl>
- <HR>
+ module.</p>
+ </section>
+
+ <section><title>httpd-dist</title>
+ <p>Like the <samp>site</samp> module, this one is used ot
+ maintain the files that comprise a website - in this case,
+ <samp>http://www.apache.org/dist/httpd/</samp>. Also like the
+ previous module, the directory on the server is a checked-out
+ working copy of this module. However, since this is a distribution
+ directory, we only have the surrounding documentation and control
+ files checked into this module -- the actual tarballs are simply
+ copied to www.apache.org.</p>
+ </section>
+</section>
<section>
<title>Setting Up Remote CVS</title>