httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From pque...@apache.org
Subject svn commit: r351477 - in /httpd/site/trunk/xdocs: dev/devnotes.xml download.xml index.xml security/vulnerabilities_22.xml security_report.xml stylesheets/project.xml
Date Thu, 01 Dec 2005 21:34:03 GMT
Author: pquerna
Date: Thu Dec  1 13:33:59 2005
New Revision: 351477

URL: http://svn.apache.org/viewcvs?rev=351477&view=rev
Log:
Merge prep-for-2.2.0 branch to site/trunk

Added:
    httpd/site/trunk/xdocs/security/vulnerabilities_22.xml
      - copied unchanged from r351476, httpd/site/branches/prep-for-2.2.0/xdocs/security/vulnerabilities_22.xml
Modified:
    httpd/site/trunk/xdocs/dev/devnotes.xml
    httpd/site/trunk/xdocs/download.xml
    httpd/site/trunk/xdocs/index.xml
    httpd/site/trunk/xdocs/security_report.xml
    httpd/site/trunk/xdocs/stylesheets/project.xml

Modified: httpd/site/trunk/xdocs/dev/devnotes.xml
URL: http://svn.apache.org/viewcvs/httpd/site/trunk/xdocs/dev/devnotes.xml?rev=351477&r1=351476&r2=351477&view=diff
==============================================================================
--- httpd/site/trunk/xdocs/dev/devnotes.xml (original)
+++ httpd/site/trunk/xdocs/dev/devnotes.xml Thu Dec  1 13:33:59 2005
@@ -19,10 +19,10 @@
 <a href="http://subversion.tigris.org/">Subversion</a> for hosting its source
 code.</p>
 
-<p>To check out the 2.0.x branch:</p>
+<p>To check out the 2.2.x branch:</p>
 <blockquote>
 <code>
-svn checkout http://svn.apache.org/repos/asf/httpd/httpd/branches/2.0.x httpd-2.0.x
+svn checkout http://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x httpd-2.2.x
 </code>
 </blockquote>
 
@@ -34,7 +34,7 @@
 </code>
 </blockquote>
 
-<p>To check out the current development version (as of this writing, 2.1.x),
+<p>To check out the current development version (as of this writing, 2.3.x),
 use:</p>
 
 <blockquote>
@@ -49,7 +49,7 @@
 >the ASF version control FAQ</a>.</p>
 
 <p>The developers continue to seek to maintain module compatibility between
-2.0.42 and future 2.0 releases for administrators and end users, while
+2.2.0 and future 2.2 releases for administrators and end users, while
 continuing the forward progress that has made the 2.0 server faster and more
 scalable.</p>
 </section>
@@ -152,9 +152,20 @@
    httpd-2.0</source>
   </section>
 
-  <section><title>httpd-2.1</title>
+  <section><title>httpd-2.2</title>
+   <p>To create a directory tree containing the 2.2 sources,
+    and call it <samp>httpd-2.2</samp>, change your current directory
+    to the <em>parent</em> of the tree and then check the 2.2 sources
+    out as follows:</p>
+   <source>
+% cd /usr/local/apache
+% svn checkout http://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x
+   httpd-2.2</source>
+  </section>
+
+  <section><title>httpd-2.3</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), and call it
+     httpd-2.3 development tree (slated for a release 2.4), and call it
      <samp>httpd-trunk</samp>, checkout as follows:</p>
    <source>
 % cd /usr/local/apache

Modified: httpd/site/trunk/xdocs/download.xml
URL: http://svn.apache.org/viewcvs/httpd/site/trunk/xdocs/download.xml?rev=351477&r1=351476&r2=351477&view=diff
==============================================================================
--- httpd/site/trunk/xdocs/download.xml (original)
+++ httpd/site/trunk/xdocs/download.xml Thu Dec  1 13:33:59 2005
@@ -53,9 +53,40 @@
 </section>
 
 
+<section id="apache22"><title>Apache HTTP Server 2.2.0 
+is the best available version</title>
+
+<p>For details see the <a
+   href="http://www.apache.org/dist/httpd/Announcement2.2.html">Official
+   Announcement</a> and the <a
+   href="[preferred]/httpd/CHANGES_2.2">CHANGES_2.2</a> list.</p>
+
+<p>Apache 2.2 add-in modules are not compatible with Apache 2.0 or 1.3 modules.
+   If you are running third party add-in modules, you will need to obtain
+   new modules written for Apache 2.2 from that third party before you
+   attempt to upgrade from Apache 2.0.</p>
+
+<ul>
 
+<li>Unix Source: 
+<a href="[preferred]/httpd/httpd-2.2.0.tar.gz">httpd-2.2.0.tar.gz</a> 
+[<a href="http://www.apache.org/dist/httpd/httpd-2.2.0.tar.gz.asc">PGP</a>]
+[<a href="http://www.apache.org/dist/httpd/httpd-2.2.0.tar.gz.md5">MD5</a>]
+</li>
+
+<li>Unix Source: 
+<a href="[preferred]/httpd/httpd-2.2.0.tar.bz2">httpd-2.2.0.tar.bz2</a> 
+[<a href="http://www.apache.org/dist/httpd/httpd-2.2.0.tar.bz2.asc">PGP</a>]
+[<a href="http://www.apache.org/dist/httpd/httpd-2.2.0.tar.bz2.md5">MD5</a>]
+</li>
+
+<li><a href="[preferred]/httpd/">Other files</a></li>
+
+</ul>
+
+</section>
 <section id="apache20"><title>Apache HTTP Server 2.0.55 
-is the best available version</title>
+is also available</title>
 
 <p>For details see the <a
    href="http://www.apache.org/dist/httpd/Announcement2.0.html">Official
@@ -94,36 +125,6 @@
 [<a href="http://www.apache.org/dist/httpd/binaries/win32/apache_2.0.55-win32-x86-no_ssl.msi.asc">PGP</a>]
 [<a href="http://www.apache.org/dist/httpd/binaries/win32/apache_2.0.55-win32-x86-no_ssl.msi.md5">MD5</a>]
 </li>
-
-<li><a href="[preferred]/httpd/">Other files</a></li>
-
-</ul>
-
-</section>
-
-<section id="apache21"><title>Apache HTTP Server
-2.1.9-beta is also available</title>
-
-<p>For details see the <a
-   href="http://www.apache.org/dist/httpd/Announcement2.1-beta.html">Official
-   Announcement</a> and the <a
-   href="[preferred]/httpd/CHANGES_2.1">CHANGES_2.1</a> list.</p>
-
-<p>Apache 2.1 does not provide a stable binary API.  It is the development
-   branch, and contains many improvements, but may change drastically 
-   between releases.</p>
-
-<ul>
-
-<li>Unix Source: 
-<a href="[preferred]/httpd/httpd-2.1.9-beta.tar.gz">httpd-2.1.9-beta.tar.gz</a>

-[<a href="http://www.apache.org/dist/httpd/httpd-2.1.9-beta.tar.gz.asc">PGP</a>]
-[<a href="http://www.apache.org/dist/httpd/httpd-2.1.9-beta.tar.gz.md5">MD5</a>]</li>
-
-<li>Unix Source: 
-<a href="[preferred]/httpd/httpd-2.1.9-beta.tar.bz2">httpd-2.1.9-beta.tar.bz2</a>

-[<a href="http://www.apache.org/dist/httpd/httpd-2.1.9-beta.tar.bz2.asc">PGP</a>]
-[<a href="http://www.apache.org/dist/httpd/httpd-2.1.9-beta.tar.bz2.md5">MD5</a>]</li>
 
 <li><a href="[preferred]/httpd/">Other files</a></li>
 

Modified: httpd/site/trunk/xdocs/index.xml
URL: http://svn.apache.org/viewcvs/httpd/site/trunk/xdocs/index.xml?rev=351477&r1=351476&r2=351477&view=diff
==============================================================================
--- httpd/site/trunk/xdocs/index.xml (original)
+++ httpd/site/trunk/xdocs/index.xml Thu Dec  1 13:33:59 2005
@@ -34,6 +34,28 @@
 <p>Please make plans to join us in San Diego.</p>
 </section>
 
+
+<section id="2.2.0">
+<title>Apache 2.2.0 Released</title>
+
+<p>The Apache HTTP Server Project is proud to <a
+href="http://www.apache.org/dist/httpd/Announcement2.2.html">announce</a>
+the release of version 2.2.0 of the Apache HTTP Server ("Apache").</p>
+
+<p>This version of Apache is a major release and the start of a new stable
+   branch. <a href="docs/2.2/new_features_2_2.html">New features</a> include
+   Smart Filtering, Improved Caching, AJP Proxy, Proxy Load Balancing, 
+   Graceful Shutdown support, Large File Support, the Event MPM, and refactored 
+   Authentication/Authorization.</p>
+
+<p align="center">
+<a href="download.cgi">Download</a> | 
+<a href="docs/2.2/new_features_2_2.html">New Features in Apache 2.2</a> |
+<a href="http://www.apache.org/dist/httpd/CHANGES_2.2">ChangeLog for 2.2</a>
+</p>
+
+</section>
+
 <section id="2.0.55">
 <title>Apache 2.0.55 Released</title>
 
@@ -55,27 +77,6 @@
   >ChangeLog for 2.0.55</a> |
 <a href="http://www.apache.org/dist/httpd/CHANGES_2.0"
   >Complete ChangeLog for 2.0</a>
-</p>
-
-</section>
-
-<section id="2.1.9-beta">
-<title>Apache 2.1.9-beta Released</title>
-
-<p>The Apache HTTP Server Project is proud to <a
-href="http://www.apache.org/dist/httpd/Announcement2.1-beta.html">announce</a>
-the release of version 2.1.9-beta of the Apache HTTP Server ("Apache").</p>
-
-<p>This version of Apache is a Beta release of the unstable development
-   branch. <a href="docs/2.1/new_features_2_2.html">New features</a> include
-   Smart Filtering, Improved Caching, AJP Proxy, Proxy Load Balancing, 
-   Graceful Shutdown support, Large File Support, the Event MPM, and refactored 
-   Authentication/Authorization.</p>
-
-<p align="center">
-<a href="download.cgi">Download</a> | 
-<a href="docs/2.1/new_features_2_2.html">New Features in Apache 2.1/2.2</a> |
-<a href="http://www.apache.org/dist/httpd/CHANGES_2.1">ChangeLog for 2.1</a>
 </p>
 
 </section>

Modified: httpd/site/trunk/xdocs/security_report.xml
URL: http://svn.apache.org/viewcvs/httpd/site/trunk/xdocs/security_report.xml?rev=351477&r1=351476&r2=351477&view=diff
==============================================================================
--- httpd/site/trunk/xdocs/security_report.xml (original)
+++ httpd/site/trunk/xdocs/security_report.xml Thu Dec  1 13:33:59 2005
@@ -11,9 +11,11 @@
 <p>Lists of security problems fixed in released versions of the Apache HTTP
 Server are available:</p>
 <ul>
-  <li><a href="/security/vulnerabilities_13.html">Apache 1.3
+  <li><a href="/security/vulnerabilities_22.html">Apache 2.2
 Security Vulnerabilities</a></li>
   <li><a href="/security/vulnerabilities_20.html">Apache 2.0
+Security Vulnerabilities</a></li>
+  <li><a href="/security/vulnerabilities_13.html">Apache 1.3
 Security Vulnerabilities</a></li>
 </ul>
 

Modified: httpd/site/trunk/xdocs/stylesheets/project.xml
URL: http://svn.apache.org/viewcvs/httpd/site/trunk/xdocs/stylesheets/project.xml?rev=351477&r1=351476&r2=351477&view=diff
==============================================================================
--- httpd/site/trunk/xdocs/stylesheets/project.xml (original)
+++ httpd/site/trunk/xdocs/stylesheets/project.xml Thu Dec  1 13:33:59 2005
@@ -15,9 +15,9 @@
 </menu>
 
 <menu><title href="/docs-project/">Documentation</title>
-  <li><a href="/docs/1.3/">Apache 1.3</a></li>
+  <li><a href="/docs/2.2/">Apache 2.2</a></li>
   <li><a href="/docs/2.0/">Apache 2.0</a></li>
-  <li><a href="/docs/2.1/">Apache 2.1</a> (beta)</li>
+  <li><a href="/docs/1.3/">Apache 1.3</a></li>
   <li><a href="/docs/trunk/">Trunk</a> (dev)</li>
 </menu>
 



Mime
View raw message