You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by je...@apache.org on 2005/11/13 07:15:43 UTC

svn commit: r332904 - in /httpd/httpd/trunk/docs/manual: ./ style/lang/

Author: jerenkrantz
Date: Sat Nov 12 22:15:34 2005
New Revision: 332904

URL: http://svn.apache.org/viewcvs?rev=332904&view=rev
Log:
Upgrade trunk to refer to 2.3/2.4

Added:
    httpd/httpd/trunk/docs/manual/new_features_2_4.html
    httpd/httpd/trunk/docs/manual/new_features_2_4.html.en
    httpd/httpd/trunk/docs/manual/new_features_2_4.xml
      - copied, changed from r332902, httpd/httpd/trunk/docs/manual/new_features_2_2.xml
    httpd/httpd/trunk/docs/manual/new_features_2_4.xml.meta
Modified:
    httpd/httpd/trunk/docs/manual/glossary.xml
    httpd/httpd/trunk/docs/manual/index.xml
    httpd/httpd/trunk/docs/manual/sitemap.xml
    httpd/httpd/trunk/docs/manual/style/lang/de.xml
    httpd/httpd/trunk/docs/manual/style/lang/en.xml
    httpd/httpd/trunk/docs/manual/style/lang/es.xml
    httpd/httpd/trunk/docs/manual/style/lang/fr.xml
    httpd/httpd/trunk/docs/manual/style/lang/ja.xml
    httpd/httpd/trunk/docs/manual/style/lang/ko.xml
    httpd/httpd/trunk/docs/manual/style/lang/pt-br.xml
    httpd/httpd/trunk/docs/manual/style/lang/ru.xml
    httpd/httpd/trunk/docs/manual/upgrading.xml

Modified: httpd/httpd/trunk/docs/manual/glossary.xml
URL: http://svn.apache.org/viewcvs/httpd/httpd/trunk/docs/manual/glossary.xml?rev=332904&r1=332903&r2=332904&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/glossary.xml (original)
+++ httpd/httpd/trunk/docs/manual/glossary.xml Sat Nov 12 22:15:34 2005
@@ -443,8 +443,8 @@
     informal term for what is formally called a <glossary
       ref="uniformresourceidentifier">Uniform Resource Identifier</glossary>.
     URLs are usually made up of a scheme, like <code>http</code> or
-    <code>https</code>, a hostname, and a path.  A URL for this page is
-    <code>http://httpd.apache.org/docs-2.1/glossary.html</code>.
+    <code>https</code>, a hostname, and a path.  A URL for this page might
+    be <code>http://httpd.apache.org/docs-2.1/glossary.html</code>.
   </dd> 
 
   <dt><a name="uniformresourceidentifier"

Modified: httpd/httpd/trunk/docs/manual/index.xml
URL: http://svn.apache.org/viewcvs/httpd/httpd/trunk/docs/manual/index.xml?rev=332904&r1=332903&r2=332904&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/index.xml (original)
+++ httpd/httpd/trunk/docs/manual/index.xml Sat Nov 12 22:15:34 2005
@@ -23,12 +23,13 @@
 <indexpage metafile="index.xml.meta">
 <parentdocument href="http://httpd.apache.org/docs-project/" />
 
-<title>Apache HTTP Server Version 2.1 Documentation</title>
+<title>Apache HTTP Server Version 2.3 Documentation</title>
 
 <category id="release"><title>Release Notes</title>
+    <page href="new_features_2_4.html">New features with Apache 2.3/2.4</page>
     <page href="new_features_2_2.html">New features with Apache 2.1/2.2</page>
     <page href="new_features_2_0.html">New features with Apache 2.0</page>
-    <page href="upgrading.html">Upgrading to 2.2 from 2.0</page>
+    <page href="upgrading.html">Upgrading to 2.4 from 2.2</page>
     <page href="license.html">Apache License</page>
 </category>
 

Added: httpd/httpd/trunk/docs/manual/new_features_2_4.html
URL: http://svn.apache.org/viewcvs/httpd/httpd/trunk/docs/manual/new_features_2_4.html?rev=332904&view=auto
==============================================================================
--- httpd/httpd/trunk/docs/manual/new_features_2_4.html (added)
+++ httpd/httpd/trunk/docs/manual/new_features_2_4.html Sat Nov 12 22:15:34 2005
@@ -0,0 +1,3 @@
+URI: new_features_2_4.html.en
+Content-Language: en
+Content-type: text/html; charset=ISO-8859-1

Added: httpd/httpd/trunk/docs/manual/new_features_2_4.html.en
URL: http://svn.apache.org/viewcvs/httpd/httpd/trunk/docs/manual/new_features_2_4.html.en?rev=332904&view=auto
==============================================================================
--- httpd/httpd/trunk/docs/manual/new_features_2_4.html.en (added)
+++ httpd/httpd/trunk/docs/manual/new_features_2_4.html.en Sat Nov 12 22:15:34 2005
@@ -0,0 +1,66 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en"><head><!--
+        XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
+              This file is generated from xml source: DO NOT EDIT
+        XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
+      -->
+<title>Overview of new features in Apache 2.4 - Apache HTTP Server</title>
+<link href="./style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" />
+<link href="./style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" />
+<link href="./style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" />
+<link href="./images/favicon.ico" rel="shortcut icon" /></head>
+<body id="manual-page"><div id="page-header">
+<p class="menu"><a href="./mod/">Modules</a> | <a href="./mod/directives.html">Directives</a> | <a href="./faq/">FAQ</a> | <a href="./glossary.html">Glossary</a> | <a href="./sitemap.html">Sitemap</a></p>
+<p class="apache">Apache HTTP Server Version 2.3</p>
+<img alt="" src="./images/feather.gif" /></div>
+<div class="up"><a href="./"><img title="&lt;-" alt="&lt;-" src="./images/left.gif" /></a></div>
+<div id="path">
+<a href="http://www.apache.org/">Apache</a> &gt; <a href="http://httpd.apache.org/">HTTP Server</a> &gt; <a href="http://httpd.apache.org/docs-project/">Documentation</a> &gt; <a href="./">Version 2.3</a></div><div id="page-content"><div id="preamble"><h1>Overview of new features in Apache 2.4</h1>
+<div class="toplang">
+<p><span>Available Languages: </span><a href="./en/new_features_2_4.html" title="English">&nbsp;en&nbsp;</a></p>
+</div>
+
+  <p>This document describes some of the major changes between the
+     2.2 and 2.4 versions of the Apache HTTP Server. For new features since
+     version 2.0, see the <a href="new_features_2_2.html">2.2 new features</a>
+     document.</p>
+</div>
+<div id="quickview"><ul id="toc"><li><img alt="" src="./images/down.gif" /> <a href="#core">Core Enhancements</a></li>
+<li><img alt="" src="./images/down.gif" /> <a href="#module">Module Enhancements</a></li>
+<li><img alt="" src="./images/down.gif" /> <a href="#programs">Program Enhancements</a></li>
+<li><img alt="" src="./images/down.gif" /> <a href="#developer">Module Developer Changes</a></li>
+</ul></div>
+<div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="core" id="core">Core Enhancements</a></h2>
+    
+    <dl>
+
+    </dl>
+  </div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="module" id="module">Module Enhancements</a></h2>
+    
+    <dl>
+    </dl>
+
+  </div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="programs" id="programs">Program Enhancements</a></h2>
+    
+    <dl>
+    </dl>
+  </div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="developer" id="developer">Module Developer Changes</a></h2>
+    
+    <dl>
+    </dl>
+  </div></div>
+<div class="bottomlang">
+<p><span>Available Languages: </span><a href="./en/new_features_2_4.html" title="English">&nbsp;en&nbsp;</a></p>
+</div><div id="footer">
+<p class="apache">Copyright 1995-2005 The Apache Software Foundation or its licensors, as applicable.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
+<p class="menu"><a href="./mod/">Modules</a> | <a href="./mod/directives.html">Directives</a> | <a href="./faq/">FAQ</a> | <a href="./glossary.html">Glossary</a> | <a href="./sitemap.html">Sitemap</a></p></div>
+</body></html>
\ No newline at end of file

Copied: httpd/httpd/trunk/docs/manual/new_features_2_4.xml (from r332902, httpd/httpd/trunk/docs/manual/new_features_2_2.xml)
URL: http://svn.apache.org/viewcvs/httpd/httpd/trunk/docs/manual/new_features_2_4.xml?p2=httpd/httpd/trunk/docs/manual/new_features_2_4.xml&p1=httpd/httpd/trunk/docs/manual/new_features_2_2.xml&r1=332902&r2=332904&rev=332904&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/new_features_2_2.xml (original)
+++ httpd/httpd/trunk/docs/manual/new_features_2_4.xml Sat Nov 12 22:15:34 2005
@@ -20,14 +20,14 @@
  limitations under the License.
 -->
 
-<manualpage metafile="new_features_2_2.xml.meta">
+<manualpage metafile="new_features_2_4.xml.meta">
 
-<title>Overview of new features in Apache 2.2</title>
+<title>Overview of new features in Apache 2.4</title>
 
 <summary>
   <p>This document describes some of the major changes between the
-     2.0 and 2.2 versions of the Apache HTTP Server. For new features since
-     version 1.3, see the <a href="new_features_2_0.html">2.0 new features</a>
+     2.2 and 2.4 versions of the Apache HTTP Server. For new features since
+     version 2.0, see the <a href="new_features_2_2.html">2.2 new features</a>
      document.</p>
 </summary>
 
@@ -35,118 +35,12 @@
     <title>Core Enhancements</title>
     <dl>
 
-      <dt>Authn/Authz</dt>
-      <dd>The bundled authentication and authorization modules have
-          been refactored.  The new <module>mod_authn_alias</module> module
-          can greatly simplify certain authentication configurations.
-          See <a href="#module">module name changes</a>, and
-          <a href="#developer">the developer changes</a> for more
-          information about how these changes affects users and module
-          writers.</dd>
-
-      <dt>Caching</dt>
-      <dd><module>mod_cache</module>, <module>mod_disk_cache</module>, and
-          <module>mod_mem_cache</module> have undergone a lot of changes, and
-          are now considered production-quality. <program>htcacheclean</program>
-          has been introduced to clean up <module>mod_disk_cache</module>
-          setups.</dd>
-
-      <dt>Configuration</dt>
-      <dd>The default configuration layout has been simplified and
-          modularised. Configuration snippets which can be used to 
-          enable commonly-used features are now bundled with Apache, and 
-          can be easily added to the main server config.</dd>
-
-      <dt>Graceful stop</dt>
-      <dd>The <module>prefork</module>, <module>worker</module> and 
-          <module>event</module>  MPMs now allow <program>httpd</program> 
-          to be shutdown gracefully via the
-          <a href="stopping.html#gracefulstop"><code>graceful-stop</code></a> 
-          signal. The <directive 
-          module="mpm_common">GracefulShutdownTimeout</directive> directive
-          has been added to specify an optional timeout, after which
-          <program>httpd</program> will terminate regardless of the status
-          of any requests being served.</dd>
-
-      <dt>Proxying</dt>
-      <dd>The new <module>mod_proxy_balancer</module> module provides 
-          load balancing services for <module>mod_proxy</module>.
-          The new <module>mod_proxy_ajp</module> module adds support for the
-          <code>Apache JServ Protocol version 1.3</code> used by 
-          <a href="http://jakarta.apache.org/tomcat/">Apache Tomcat</a>.</dd>
-
-      <dt>Regular Expression Library Updated</dt>
-      <dd>Version 5.0 of the 
-          <a href="http://www.pcre.org/">Perl Compatible Regular Expression
-          Library</a> (PCRE) is now included.  <program>httpd</program> can be
-          configured to use a system installation of PCRE by passing the
-          <code>--with-pcre</code> flag to configure.</dd>
-
-      <dt>Smart Filtering</dt>
-      <dd><module>mod_filter</module> introduces dynamic configuration
-          to the output filter chain.  It enables filters to be conditionally
-          inserted, based on any Request or Response header or environment
-          variable, and dispenses with the more problematic dependencies and
-          ordering problems in the 2.0 architecture.</dd>
-
-      <dt>Large File Support</dt>
-
-      <dd>httpd is now built with support for files larger than 2GB on
-          modern 32-bit Unix systems.  Support for handling &gt;2GB request
-          bodies has also been added.</dd>
-
-      <dt>Event MPM</dt>
-      <dd>The <module>event</module> MPM uses a seperate thread to handle
-          Keep Alive requests and accepting connections.  Keep Alive requests
-          have traditionally required httpd to dedicate a worker to handle it.
-          This dedicated worker could not be used again until the Keep Alive 
-          timeout was reached.</dd>
-
-      <dt>SQL Database Support</dt>
-      <dd><module>mod_dbd</module>, together with the apr_dbd framework,
-          brings direct SQL support to modules that need it.  Supports
-          connection pooling in threaded MPMs.</dd>
-
     </dl>
   </section>
 
   <section id="module">
     <title>Module Enhancements</title>
     <dl>
-      <dt>Authn/Authz</dt>
-      <dd>Modules in the aaa directory have been renamed and offer
-          better support for digest authentication.  For example, mod_auth
-          is now split into <module>mod_auth_basic</module> and
-          <module>mod_auth_file</module>; mod_auth_dbm is now called
-          <module>mod_authn_dbm</module>; mod_access has been renamed
-          <module>mod_authz_host</module>.  There is also a new
-          <module>mod_authn_alias</module> module for simplifying
-          certain authentication configurations.
-      </dd>
-
-      <dt><module>mod_authnz_ldap</module></dt>
-      <dd>This module is a port of the 2.0 
-          <code>mod_auth_ldap</code> module to the 2.2 <code>Authn/Authz</code> 
-          framework.  New features include using LDAP attribute values and 
-          complicated search filters in the 
-          <directive module="core">Require</directive> directive.</dd>
-
-      <dt><module>mod_info</module></dt>
-      <dd>Added a new <code>?config</code> argument which will show
-          the configuration directives as parsed by Apache, including
-          their file name and line number.  The module also 
-          shows the order of all request hooks and additional
-          build information, similar to <code>httpd -V</code>.</dd>
-
-      <dt><module>mod_ssl</module></dt>
-      <!-- Need Info on SSLEngine Support? -->
-      <dd>Added a support for 
-         <a href="http://www.ietf.org/rfc/rfc2817.txt">RFC 2817</a>, which 
-         allows connections to upgrade from clear text to TLS encryption.</dd>
-
-      <dt><module>mod_imagemap</module></dt>
-      <dd>mod_imap has been renamed to <module>mod_imagemap</module> to avoid
-          user confusion.</dd>
     </dl>
 
   </section>
@@ -154,93 +48,12 @@
   <section id="programs">
     <title>Program Enhancements</title>
     <dl>
-      <dt><program>httpd</program></dt>
-      <dd>A new command line option <code>-M</code> has been added that
-      lists all modules that are loaded based on the current
-      configuration. Unlike the <code>-l</code> option, this list
-      includes DSOs loaded via <module>mod_so</module>.</dd>
     </dl>
   </section>
 
   <section id="developer">
     <title>Module Developer Changes</title>
     <dl>
-      <dt><glossary>APR</glossary> 1.0 API</dt>
-
-      <dd>Apache 2.2 uses the APR 1.0 API.  All deprecated functions and 
-          symbols have been removed from <code>APR</code> and 
-          <code>APR-Util</code>. For details, see the 
-          <a href="http://apr.apache.org/">APR Website</a>.</dd>
-
-      <dt>Authn/Authz</dt>
-      <dd>The bundled authentication and authorization modules have
-          been renamed along the following lines:
-          <ul>
-          <li>mod_auth_*  -> Modules that implement an HTTP authentication mechanism</li>
-          <li>mod_authn_* -> Modules that provide a backend authentication provider</li>
-          <li>mod_authz_* -> Modules that implement authorization (or access)</li>
-          <li>mod_authnz_*-> Module that implements both authentication &amp; authorization</li>
-          </ul>
-          There is a new authentication backend provider
-          scheme which greatly eases the construction of new authentication
-          backends.</dd>
-
-      <dt>Connection Error Logging</dt>
-
-      <dd>A new function, <code>ap_log_cerror</code> has been added to log
-          errors that occure with the client's connection.  When logged, 
-          the message includes the client IP address.</dd>
-
-      <dt>Test Configuration Hook Added</dt>
-
-      <dd>A new hook, <code>test_config</code> has been added to aid
-          modules that want to execute special code only when the user passes
-          <code>-t</code> to <program>httpd</program>.</dd>
-
-      <dt>Set Threaded MPM's Stacksize</dt>
-
-      <dd>A new directive, <code>ThreadStackSize</code> has been added to 
-          set the stack size on all threaded MPMs.  This is required
-          for some third-party modules on platforms with small default
-          thread stack size.</dd>
-
-      <dt>Protocol handling for output filters</dt>
-
-      <dd>In the past, every filter has been responsible for ensuring 
-          that it generates the correct response headers where it affects
-          them.  Filters can now delegate common protocol management to
-          <module>mod_filter</module>, using the
-          <code>ap_register_output_filter_protocol</code> or
-          <code>ap_filter_protocol</code> calls.</dd>
-
-      <dt>Monitor hook added</dt>
-      <dd>Monitor hook enables modules to run regular/scheduled jobs
-          in the parent (root) process.</dd>
-          
-      <dt>Regular expression API changes</dt>
-
-      <dd>The <code>pcreposix.h</code> header is no longer available;
-      it is replaced by the new <code>ap_regex.h</code> header.  The
-      POSIX.2 <code>regex.h</code> implementation exposed by the old
-      header is now available under the <code>ap_</code> namespace
-      from <code>ap_regex.h</code>.  Calls to <code>regcomp</code>, 
-      <code>regexec</code> and so on can be replaced by calls to
-      <code>ap_regcomp</code>, <code>ap_regcomp</code>.</dd>
-
-      <dt>DBD Framework (SQL Database API)</dt>
-
-      <dd><p>With Apache 1.x and 2.0, modules requiring an SQL backend
-      had to take responsibility for managing it themselves.  Apart
-      from reinventing the wheel, this can be very inefficient, for
-      example when several modules each maintain their own connections.</p>
-      <p>Apache 2.1 and up provides the <code>ap_dbd</code> API for
-      managing database connections (including optimised strategies
-      for threaded and unthreaded MPMs), while APR 1.2 and up provides
-      the <code>apr_dbd</code> API for interacting with the database.</p>
-      <p>New modules SHOULD now use these APIs for all SQL database
-      operations.  Existing applications SHOULD be upgraded to use it
-      where feasible, either transparently or as a recommended option
-      to their users.</p></dd>
     </dl>
   </section>
 </manualpage>

Added: httpd/httpd/trunk/docs/manual/new_features_2_4.xml.meta
URL: http://svn.apache.org/viewcvs/httpd/httpd/trunk/docs/manual/new_features_2_4.xml.meta?rev=332904&view=auto
==============================================================================
--- httpd/httpd/trunk/docs/manual/new_features_2_4.xml.meta (added)
+++ httpd/httpd/trunk/docs/manual/new_features_2_4.xml.meta Sat Nov 12 22:15:34 2005
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+
+<metafile>
+  <basename>new_features_2_4</basename>
+  <path>/</path>
+  <relpath>.</relpath>
+
+  <variants>
+    <variant>en</variant>
+  </variants>
+</metafile>

Modified: httpd/httpd/trunk/docs/manual/sitemap.xml
URL: http://svn.apache.org/viewcvs/httpd/httpd/trunk/docs/manual/sitemap.xml?rev=332904&r1=332903&r2=332904&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/sitemap.xml (original)
+++ httpd/httpd/trunk/docs/manual/sitemap.xml Sat Nov 12 22:15:34 2005
@@ -26,12 +26,14 @@
 
 <summary>
 <p>This page lists the currently available documents of the
-<a href="./">Apache HTTP Server Version 2.1 Documentation</a>.</p>
+<a href="./">Apache HTTP Server Version 2.3 Documentation</a>.</p>
 </summary>
 
 <category id="release">
 <title>Release Notes</title>
-<page href="upgrading.html">Upgrading to 2.0 from 1.3</page>
+<page href="upgrading.html">Upgrading to 2.2 from 2.0</page>
+<page href="new_features_2_4.html">New features with Apache 2.4</page>
+<page href="new_features_2_2.html">New features with Apache 2.2</page>
 <page href="new_features_2_0.html">New features with Apache 2.0</page>
 <page href="license.html">Apache License</page>
 </category>

Modified: httpd/httpd/trunk/docs/manual/style/lang/de.xml
URL: http://svn.apache.org/viewcvs/httpd/httpd/trunk/docs/manual/style/lang/de.xml?rev=332904&r1=332903&r2=332904&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/style/lang/de.xml (original)
+++ httpd/httpd/trunk/docs/manual/style/lang/de.xml Sat Nov 12 22:15:34 2005
@@ -100,7 +100,7 @@
         <!-- Used in headers and footers -->
         <message id="apachetitle">- Apache HTTP Server</message>
         <message id="apachehttpserver">Apache HTTP Server Version
-            2.1</message>
+            2.3</message>
         <message id="apachedocalt">[APACHE DOCUMENTATION]</message>
         <message id="search">Google-Suche</message> <!-- search button -->
         <message id="index">Index</message> <!-- deprecated -->
@@ -110,7 +110,7 @@
         <message id="apache">Apache</message>
         <message id="http-server">HTTP-Server</message>
         <message id="documentation">Dokumentation</message>
-        <message id="version">Version 2.1</message>
+        <message id="version">Version 2.3</message>
 
         <!-- super menu -->
         <message id="modules">Module</message>

Modified: httpd/httpd/trunk/docs/manual/style/lang/en.xml
URL: http://svn.apache.org/viewcvs/httpd/httpd/trunk/docs/manual/style/lang/en.xml?rev=332904&r1=332903&r2=332904&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/style/lang/en.xml (original)
+++ httpd/httpd/trunk/docs/manual/style/lang/en.xml Sat Nov 12 22:15:34 2005
@@ -100,7 +100,7 @@
 
         <!-- Used in headers and footers -->
         <message id="apachetitle">- Apache HTTP Server</message>
-        <message id="apachehttpserver">Apache HTTP Server Version 2.1</message>
+        <message id="apachehttpserver">Apache HTTP Server Version 2.3</message>
         <message id="apachedocalt">[APACHE DOCUMENTATION]</message>
         <message id="search">Google Search</message> <!-- search button -->
         <message id="index">Index</message> <!-- deprecated -->
@@ -110,7 +110,7 @@
         <message id="apache">Apache</message>
         <message id="http-server">HTTP Server</message>
         <message id="documentation">Documentation</message>
-        <message id="version">Version 2.1</message>
+        <message id="version">Version 2.3</message>
 
         <!-- super menu -->
         <message id="modules">Modules</message>

Modified: httpd/httpd/trunk/docs/manual/style/lang/es.xml
URL: http://svn.apache.org/viewcvs/httpd/httpd/trunk/docs/manual/style/lang/es.xml?rev=332904&r1=332903&r2=332904&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/style/lang/es.xml (original)
+++ httpd/httpd/trunk/docs/manual/style/lang/es.xml Sat Nov 12 22:15:34 2005
@@ -98,7 +98,7 @@
 
         <!-- Used in headers and footers -->
         <message id="apachetitle">- Servidor HTTP Apache</message>
-        <message id="apachehttpserver">Versi&#243;n 2.1 del Servidor HTTP
+        <message id="apachehttpserver">Versi&#243;n 2.3 del Servidor HTTP
             Apache</message>
         <message id="apachedocalt">[APACHE DOCUMENTATION]</message>
         <message id="search">Buscar en Google</message> <!-- search button -->
@@ -109,7 +109,7 @@
         <message id="apache">Apache</message>
         <message id="http-server">Servidor HTTP</message>
         <message id="documentation">Documentaci&#243;n</message>
-        <message id="version">Versi&#243;n 2.1</message>
+        <message id="version">Versi&#243;n 2.3</message>
 
         <!-- super menu -->
         <message id="modules">M&#243;dulos</message>

Modified: httpd/httpd/trunk/docs/manual/style/lang/fr.xml
URL: http://svn.apache.org/viewcvs/httpd/httpd/trunk/docs/manual/style/lang/fr.xml?rev=332904&r1=332903&r2=332904&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/style/lang/fr.xml (original)
+++ httpd/httpd/trunk/docs/manual/style/lang/fr.xml Sat Nov 12 22:15:34 2005
@@ -101,7 +101,7 @@
 
         <!-- Used in headers and footers -->
         <message id="apachetitle">- Serveur Apache HTTP</message>
-        <message id="apachehttpserver">Serveur Apache HTTP Version 2.1</message>
+        <message id="apachehttpserver">Serveur Apache HTTP Version 2.3</message>
         <message id="apachedocalt">[DOCUMENTATION APACHE]</message>
         <message id="search">Recherche Google</message> <!-- search button -->
         <message id="index">Index</message> <!-- deprecated -->
@@ -111,7 +111,7 @@
         <message id="apache">Apache</message>
         <message id="http-server">Serveur HTTP</message>
         <message id="documentation">Documentation</message>
-        <message id="version">Version 2.1</message>
+        <message id="version">Version 2.3</message>
 
         <!-- super menu -->
         <message id="modules">Modules</message>

Modified: httpd/httpd/trunk/docs/manual/style/lang/ja.xml
URL: http://svn.apache.org/viewcvs/httpd/httpd/trunk/docs/manual/style/lang/ja.xml?rev=332904&r1=332903&r2=332904&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/style/lang/ja.xml (original)
+++ httpd/httpd/trunk/docs/manual/style/lang/ja.xml Sat Nov 12 22:15:34 2005
@@ -97,7 +97,7 @@
 
         <!-- Used in headers and footers -->
         <message id="apachetitle">- Apache HTTP $B%5!<%P(B</message>
-        <message id="apachehttpserver">Apache HTTP $B%5!<%P(B $B%P!<%8%g%s(B 2.1</message>
+        <message id="apachehttpserver">Apache HTTP $B%5!<%P(B $B%P!<%8%g%s(B 2.3</message>
         <message id="apachedocalt">[APACHE DOCUMENTATION]</message>
         <message id="search">Google Search</message> <!-- search button -->
         <message id="index">$B:w0z(B</message> <!-- deprecated -->
@@ -107,7 +107,7 @@
         <message id="apache">Apache</message>
         <message id="http-server">HTTP $B%5!<%P(B</message>
         <message id="documentation">$B%I%-%e%a%s%F!<%7%g%s(B</message>
-        <message id="version">$B%P!<%8%g%s(B 2.1</message>
+        <message id="version">$B%P!<%8%g%s(B 2.3</message>
 
         <!-- super menu -->
         <message id="modules">$B%b%8%e!<%k(B</message>

Modified: httpd/httpd/trunk/docs/manual/style/lang/ko.xml
URL: http://svn.apache.org/viewcvs/httpd/httpd/trunk/docs/manual/style/lang/ko.xml?rev=332904&r1=332903&r2=332904&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/style/lang/ko.xml (original)
+++ httpd/httpd/trunk/docs/manual/style/lang/ko.xml Sat Nov 12 22:15:34 2005
@@ -103,7 +103,7 @@
 
         <!-- Used in headers and footers -->
         <message id="apachetitle">- Apache HTTP Server</message>
-        <message id="apachehttpserver">Apache HTTP Server Version 2.1</message>
+        <message id="apachehttpserver">Apache HTTP Server Version 2.3</message>
         <message id="apachedocalt">[APACHE DOCUMENTATION]</message>
         <message id="search">Google °Ë»ö</message> <!-- search button -->
         <message id="index">Index</message> <!-- deprecated -->
@@ -113,7 +113,7 @@
         <message id="apache">Apache</message>
         <message id="http-server">HTTP Server</message>
         <message id="documentation">Documentation</message>
-        <message id="version">Version 2.1</message>
+        <message id="version">Version 2.3</message>
 
         <!-- super menu -->
         <message id="modules">¸ðµâ</message>

Modified: httpd/httpd/trunk/docs/manual/style/lang/pt-br.xml
URL: http://svn.apache.org/viewcvs/httpd/httpd/trunk/docs/manual/style/lang/pt-br.xml?rev=332904&r1=332903&r2=332904&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/style/lang/pt-br.xml (original)
+++ httpd/httpd/trunk/docs/manual/style/lang/pt-br.xml Sat Nov 12 22:15:34 2005
@@ -102,7 +102,7 @@
 
         <!-- Used in headers and footers -->
         <message id="apachetitle">- Servidor HTTP Apache</message>
-        <message id="apachehttpserver">Servidor HTTP Apache Vers&#227;o 2.1</message>
+        <message id="apachehttpserver">Servidor HTTP Apache Vers&#227;o 2.3</message>
         <message id="apachedocalt">[DOCUMENTA&#199;&#195;O APACHE]</message>
         <message id="search">Busca Google</message> <!-- search button -->
         <message id="index">&#205;ndice</message> <!-- deprecated -->
@@ -112,7 +112,7 @@
         <message id="apache">Apache</message>
         <message id="http-server">Servidor HTTP</message>
         <message id="documentation">Documenta&#231;&#227;o</message>
-        <message id="version">Vers&#227;o 2.1</message>
+        <message id="version">Vers&#227;o 2.3</message>
 
         <!-- super menu -->
         <message id="modules">M&#243;dulos</message>

Modified: httpd/httpd/trunk/docs/manual/style/lang/ru.xml
URL: http://svn.apache.org/viewcvs/httpd/httpd/trunk/docs/manual/style/lang/ru.xml?rev=332904&r1=332903&r2=332904&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/style/lang/ru.xml (original)
+++ httpd/httpd/trunk/docs/manual/style/lang/ru.xml Sat Nov 12 22:15:34 2005
@@ -87,7 +87,7 @@
 
         <!-- Used in headers and footers -->
         <message id="apachetitle">- HTTP ÓÅÒ×ÅÒ Apache</message>
-        <message id="apachehttpserver">HTTP ÓÅÒ×ÅÒ Apache ÷ÅÒÓÉÑ 2.1</message>
+        <message id="apachehttpserver">HTTP ÓÅÒ×ÅÒ Apache ÷ÅÒÓÉÑ 2.3</message>
         <message id="apachedocalt">[äïëõíåîôáãéñ APACHE]</message>
         <message id="search">Google Search</message> <!-- search button -->
         <message id="index">ïÇÌÁ×ÌÅÎÉÅ</message> <!-- deprecated -->
@@ -97,7 +97,7 @@
         <message id="apache">Apache</message>
         <message id="http-server">HTTP ÓÅÒ×ÅÒ</message>
         <message id="documentation">äÏËÕÍÅÎÔÁÃÉÑ</message>
-        <message id="version">÷ÅÒÓÉÑ 2.1</message>
+        <message id="version">÷ÅÒÓÉÑ 2.3</message>
 
         <!-- super menu -->
         <message id="modules">íÏÄÕÌÉ</message>

Modified: httpd/httpd/trunk/docs/manual/upgrading.xml
URL: http://svn.apache.org/viewcvs/httpd/httpd/trunk/docs/manual/upgrading.xml?rev=332904&r1=332903&r2=332904&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/upgrading.xml (original)
+++ httpd/httpd/trunk/docs/manual/upgrading.xml Sat Nov 12 22:15:34 2005
@@ -22,35 +22,28 @@
 
 <manualpage metafile="upgrading.xml.meta">
 
-<title>Upgrading to 2.1 from 2.0</title>
+<title>Upgrading to 2.4 from 2.2</title>
 
 <summary>
   <p>In order to assist folks upgrading, we maintain a document
   describing information critical to existing Apache users. These
   are intended to be brief notes, and you should be able to find
   more information in either the <a
-  href="new_features_2_2.html">New Features</a> document, or in
+  href="new_features_2_4.html">New Features</a> document, or in
   the <code>src/CHANGES</code> file.</p>
 
-  <p>This document describes only the changes from 2.0 to 2.2.  If you
-  are upgrading from version 1.3, you should also consult the <a
-  href="http://httpd.apache.org/docs-2.0/upgrading.html">1.3 to 2.0
+  <p>This document describes only the changes from 2.2 to 2.4.  If you
+  are upgrading from version 2.0, you should also consult the <a
+  href="http://httpd.apache.org/docs-2.1/upgrading.html">2.0 to 2.2
   upgrading document.</a></p>
 
 </summary>
-<seealso><a href="new_features_2_2.html">Overview of new features in
-  Apache 2.2</a></seealso>
+<seealso><a href="new_features_2_4.html">Overview of new features in
+  Apache 2.4</a></seealso>
 
   <section id="compile-time">
     <title>Compile-Time Configuration Changes</title>
     <ul>
-      <li>Upgraded to require the APR 1.0 API.</li>
-      <li>Updated bundled PCRE version to 5.0</li>
-      <li>mod_imap has been renamed to <module>mod_imagemap</module></li>
-      <li>mod_auth has been split up into <module>mod_auth_basic</module>
-          and <module>mod_authn_file</module></li>
-      <li>mod_access has been renamed to <module>mod_authz_host</module></li>
-      <li>mod_auth_ldap has been renamed to <module>mod_authnz_ldap</module></li>
     </ul>
 
   </section>
@@ -59,34 +52,6 @@
     <title>Run-Time Configuration Changes</title>
 
     <ul>
-      <li>The config file <code>httpd.conf</code> distributed with the
-      Apache HTTP Server has been greatly simplified by removing all
-      but the most essential configuration settings.  A set of example
-      configuration settings for more advanced features is present in
-      the <code>conf/extra/</code> directory of the installed
-      server.</li>
-
-      <li>The <program>apachectl</program> option
-      <code>startssl</code> is no longer available.  To enable ssl
-      support, you should edit <code>httpd.conf</code> to include the
-      relevant <module>mod_ssl</module> directives and then use
-      <code>apachectl start</code> to start the server.  An example
-      configuration to activate <module>mod_ssl</module> has been included
-      in <code>conf/extra/httpd-ssl.conf</code>.</li>
-
-      <li>The default setting of <directive
-      module="core">UseCanonicalName</directive> is now
-      <code>Off</code>.  If you did not have this directive in your
-      config file, you can add <code>UseCanonicalName On</code> to
-      retain the old behavior.</li>
-
-      <li>The module <module>mod_userdir</module> will no longer act
-      on requests unless a <directive
-      module="mod_userdir">UserDir</directive> directive specifying a
-      directory name is present in the config file.  To restore the
-      old default behavior, place the directive <code>UserDir
-      public_html</code> in your config file.</li>
-
     </ul>
   </section>