From 6589f760d1584935c19014802922d4666d0064f9 Mon Sep 17 00:00:00 2001 From: Justin Erenkrantz Date: Sun, 13 Nov 2005 06:15:34 +0000 Subject: [PATCH] Upgrade trunk to refer to 2.3/2.4 git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@332904 13f79535-47bb-0310-9956-ffa450edef68 --- docs/manual/glossary.xml | 4 +- docs/manual/index.xml | 5 +- docs/manual/new_features_2_4.html | 3 ++ docs/manual/new_features_2_4.html.en | 66 +++++++++++++++++++++++++++ docs/manual/new_features_2_4.xml | 59 ++++++++++++++++++++++++ docs/manual/new_features_2_4.xml.meta | 11 +++++ docs/manual/sitemap.xml | 6 ++- docs/manual/style/lang/de.xml | 4 +- docs/manual/style/lang/en.xml | 4 +- docs/manual/style/lang/es.xml | 4 +- docs/manual/style/lang/fr.xml | 4 +- docs/manual/style/lang/ja.xml | 4 +- docs/manual/style/lang/ko.xml | 4 +- docs/manual/style/lang/pt-br.xml | 4 +- docs/manual/style/lang/ru.xml | 4 +- docs/manual/upgrading.xml | 49 +++----------------- 16 files changed, 171 insertions(+), 64 deletions(-) create mode 100644 docs/manual/new_features_2_4.html create mode 100644 docs/manual/new_features_2_4.html.en create mode 100644 docs/manual/new_features_2_4.xml create mode 100644 docs/manual/new_features_2_4.xml.meta diff --git a/docs/manual/glossary.xml b/docs/manual/glossary.xml index 9cdff443a81..eb862063003 100644 --- a/docs/manual/glossary.xml +++ b/docs/manual/glossary.xml @@ -443,8 +443,8 @@ informal term for what is formally called a Uniform Resource Identifier. URLs are usually made up of a scheme, like http or - https, a hostname, and a path. A URL for this page is - http://httpd.apache.org/docs-2.1/glossary.html. + https, a hostname, and a path. A URL for this page might + be http://httpd.apache.org/docs-2.1/glossary.html.

-Apache HTTP Server Version 2.1 Documentation +Apache HTTP Server Version 2.3 Documentation Release Notes + New features with Apache 2.3/2.4 New features with Apache 2.1/2.2 New features with Apache 2.0 - Upgrading to 2.2 from 2.0 + Upgrading to 2.4 from 2.2 Apache License diff --git a/docs/manual/new_features_2_4.html b/docs/manual/new_features_2_4.html new file mode 100644 index 00000000000..cfb42c394f7 --- /dev/null +++ b/docs/manual/new_features_2_4.html @@ -0,0 +1,3 @@ +URI: new_features_2_4.html.en +Content-Language: en +Content-type: text/html; charset=ISO-8859-1 diff --git a/docs/manual/new_features_2_4.html.en b/docs/manual/new_features_2_4.html.en new file mode 100644 index 00000000000..eaba7effcc4 --- /dev/null +++ b/docs/manual/new_features_2_4.html.en @@ -0,0 +1,66 @@ + + + +Overview of new features in Apache 2.4 - Apache HTTP Server + + + + + +

+Apache > HTTP Server > Documentation > Version 2.3

Overview of new features in Apache 2.4

Available Languages: en

+ +

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 2.2 new features + document.

Core Enhancements
Module Enhancements
Program Enhancements
Module Developer Changes

Core Enhancements

+ +

+ + +

Module Enhancements

+ +

+ + +

Program Enhancements

+ +

Module Developer Changes

+ +

Available Languages: en

+ \ No newline at end of file diff --git a/docs/manual/new_features_2_4.xml b/docs/manual/new_features_2_4.xml new file mode 100644 index 00000000000..6deb324794e --- /dev/null +++ b/docs/manual/new_features_2_4.xml @@ -0,0 +1,59 @@ + + + + + + + + + +Overview of new features in Apache 2.4 + +

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 2.2 new features + document.

+ +

+ Core Enhancements +

+ + +

+ +

+ Module Enhancements +

+ + +

+ +

+ Program Enhancements +

+ +

+ Module Developer Changes +

+ +

+ diff --git a/docs/manual/new_features_2_4.xml.meta b/docs/manual/new_features_2_4.xml.meta new file mode 100644 index 00000000000..f5fa37f7237 --- /dev/null +++ b/docs/manual/new_features_2_4.xml.meta @@ -0,0 +1,11 @@ + + + + new_features_2_4 + / + . + + + en + + diff --git a/docs/manual/sitemap.xml b/docs/manual/sitemap.xml index 222a144510e..13ae7fad875 100644 --- a/docs/manual/sitemap.xml +++ b/docs/manual/sitemap.xml @@ -26,12 +26,14 @@

This page lists the currently available documents of the -Apache HTTP Server Version 2.1 Documentation.

+Apache HTTP Server Version 2.3 Documentation.

Release Notes -Upgrading to 2.0 from 1.3 +Upgrading to 2.2 from 2.0 +New features with Apache 2.4 +New features with Apache 2.2 New features with Apache 2.0 Apache License diff --git a/docs/manual/style/lang/de.xml b/docs/manual/style/lang/de.xml index 2a95ccad44d..93eee6ddb94 100644 --- a/docs/manual/style/lang/de.xml +++ b/docs/manual/style/lang/de.xml @@ -100,7 +100,7 @@ - Apache HTTP Server Apache HTTP Server Version - 2.1 + 2.3 [APACHE DOCUMENTATION] Google-Suche Index @@ -110,7 +110,7 @@ Apache HTTP-Server Dokumentation - Version 2.1 + Version 2.3 Module diff --git a/docs/manual/style/lang/en.xml b/docs/manual/style/lang/en.xml index 3bcd3769be7..06205cc1a61 100644 --- a/docs/manual/style/lang/en.xml +++ b/docs/manual/style/lang/en.xml @@ -100,7 +100,7 @@ - Apache HTTP Server - Apache HTTP Server Version 2.1 + Apache HTTP Server Version 2.3 [APACHE DOCUMENTATION] Google Search Index @@ -110,7 +110,7 @@ Apache HTTP Server Documentation - Version 2.1 + Version 2.3 Modules diff --git a/docs/manual/style/lang/es.xml b/docs/manual/style/lang/es.xml index b972403c867..5b288f5743d 100644 --- a/docs/manual/style/lang/es.xml +++ b/docs/manual/style/lang/es.xml @@ -98,7 +98,7 @@ - Servidor HTTP Apache - Versión 2.1 del Servidor HTTP + Versión 2.3 del Servidor HTTP Apache [APACHE DOCUMENTATION] Buscar en Google @@ -109,7 +109,7 @@ Apache Servidor HTTP Documentación - Versión 2.1 + Versión 2.3 Módulos diff --git a/docs/manual/style/lang/fr.xml b/docs/manual/style/lang/fr.xml index cb71ff52275..501f4d1584c 100644 --- a/docs/manual/style/lang/fr.xml +++ b/docs/manual/style/lang/fr.xml @@ -101,7 +101,7 @@ - Serveur Apache HTTP - Serveur Apache HTTP Version 2.1 + Serveur Apache HTTP Version 2.3 [DOCUMENTATION APACHE] Recherche Google Index @@ -111,7 +111,7 @@ Apache Serveur HTTP Documentation - Version 2.1 + Version 2.3 Modules diff --git a/docs/manual/style/lang/ja.xml b/docs/manual/style/lang/ja.xml index 37ba31dd10c..a0e0ceb5cea 100644 --- a/docs/manual/style/lang/ja.xml +++ b/docs/manual/style/lang/ja.xml @@ -97,7 +97,7 @@ - Apache HTTP $B%5!<%P(B - Apache HTTP $B%5!<%P(B $B%P!<%8%g%s(B 2.1 + Apache HTTP $B%5!<%P(B $B%P!<%8%g%s(B 2.3 [APACHE DOCUMENTATION] Google Search $B:w0z(B @@ -107,7 +107,7 @@ Apache HTTP $B%5!<%P(B $B%I%-%e%a%s%F!<%7%g%s(B - $B%P!<%8%g%s(B 2.1 + $B%P!<%8%g%s(B 2.3 $B%b%8%e!<%k(B diff --git a/docs/manual/style/lang/ko.xml b/docs/manual/style/lang/ko.xml index 5bbd0295afd..0511c924dad 100644 --- a/docs/manual/style/lang/ko.xml +++ b/docs/manual/style/lang/ko.xml @@ -103,7 +103,7 @@ - Apache HTTP Server - Apache HTTP Server Version 2.1 + Apache HTTP Server Version 2.3 [APACHE DOCUMENTATION] Google °Ë»ö Index @@ -113,7 +113,7 @@ Apache HTTP Server Documentation - Version 2.1 + Version 2.3 ¸ðµâ diff --git a/docs/manual/style/lang/pt-br.xml b/docs/manual/style/lang/pt-br.xml index 904417b03c3..212abf9505c 100644 --- a/docs/manual/style/lang/pt-br.xml +++ b/docs/manual/style/lang/pt-br.xml @@ -102,7 +102,7 @@ - Servidor HTTP Apache - Servidor HTTP Apache Versão 2.1 + Servidor HTTP Apache Versão 2.3 [DOCUMENTAÇÃO APACHE] Busca Google Índice @@ -112,7 +112,7 @@ Apache Servidor HTTP Documentação - Versão 2.1 + Versão 2.3 Módulos diff --git a/docs/manual/style/lang/ru.xml b/docs/manual/style/lang/ru.xml index 1ed52c23df0..97648831706 100644 --- a/docs/manual/style/lang/ru.xml +++ b/docs/manual/style/lang/ru.xml @@ -87,7 +87,7 @@ - HTTP ÓÅÒ×ÅÒ Apache - HTTP ÓÅÒ×ÅÒ Apache ÷ÅÒÓÉÑ 2.1 + HTTP ÓÅÒ×ÅÒ Apache ÷ÅÒÓÉÑ 2.3 [äïëõíåîôáãéñ APACHE] Google Search ïÇÌÁ×ÌÅÎÉÅ @@ -97,7 +97,7 @@ Apache HTTP ÓÅÒ×ÅÒ äÏËÕÍÅÎÔÁÃÉÑ - ÷ÅÒÓÉÑ 2.1 + ÷ÅÒÓÉÑ 2.3 íÏÄÕÌÉ diff --git a/docs/manual/upgrading.xml b/docs/manual/upgrading.xml index e2409f0b577..1f712485aa0 100644 --- a/docs/manual/upgrading.xml +++ b/docs/manual/upgrading.xml @@ -22,35 +22,28 @@ -Upgrading to 2.1 from 2.0 +Upgrading to 2.4 from 2.2

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 New Features document, or in + href="new_features_2_4.html">New Features document, or in the src/CHANGES file.

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 1.3 to 2.0 +

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 2.0 to 2.2 upgrading document.

-Overview of new features in - Apache 2.2 +Overview of new features in + Apache 2.4

Compile-Time Configuration Changes

Upgraded to require the APR 1.0 API.
Updated bundled PCRE version to 5.0
mod_imap has been renamed to mod_imagemap
mod_auth has been split up into mod_auth_basic - and mod_authn_file
mod_access has been renamed to mod_authz_host
mod_auth_ldap has been renamed to mod_authnz_ldap

@@ -59,34 +52,6 @@ Run-Time Configuration Changes

The config file httpd.conf 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 conf/extra/ directory of the installed - server.
The apachectl option - startssl is no longer available. To enable ssl - support, you should edit httpd.conf to include the - relevant mod_ssl directives and then use - apachectl start to start the server. An example - configuration to activate mod_ssl has been included - in conf/extra/httpd-ssl.conf.
The default setting of UseCanonicalName is now - Off. If you did not have this directive in your - config file, you can add UseCanonicalName On to - retain the old behavior.
The module mod_userdir will no longer act - on requests unless a UserDir directive specifying a - directory name is present in the config file. To restore the - old default behavior, place the directive UserDir - public_html in your config file.

-- 2.47.2