From: Colm MacCarthaigh <colm@apache.org>
Date: Mon, 24 Oct 2005 10:56:25 +0000 (+0000)
Subject: Merge r327998 from trunk:
X-Git-Tag: 2.1.9~21
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a3847a9776ca6024f711679b38b9ba5b9f6fa3ad;p=thirdparty%2Fapache%2Fhttpd.git

Merge r327998 from trunk:

Talking to end-users has highlighted the new simpler default configuration
layout as a major selling point "feature" of 2.2. Add it to the list of
new features.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@328030 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/docs/manual/new_features_2_2.html.en b/docs/manual/new_features_2_2.html.en
index 11aef815de7..805fbe6acc7 100644
--- a/docs/manual/new_features_2_2.html.en
+++ b/docs/manual/new_features_2_2.html.en
@@ -52,6 +52,12 @@
           has been introduced to cleanup <code class="module"><a href="./mod/mod_disk_cache.html">mod_disk_cache</a></code>
           setups.</dd>
 
+      <dt>Configuration</dt>
+      <dd>The default configuration layout has been simplified and
+          modularised. Configuration snippets which assist with enabling 
+          commonly used features are now bundled and easily included in the 
+          main server configuration.</dd>
+
       <dt>Graceful stop</dt>
       <dd>The <code class="module"><a href="./mod/prefork.html">prefork</a></code>, <code class="module"><a href="./mod/worker.html">worker</a></code> and 
           <code class="module"><a href="./mod/event.html">event</a></code>  MPMs now allow <code class="program"><a href="./programs/httpd.html">httpd</a></code> 
diff --git a/docs/manual/new_features_2_2.xml b/docs/manual/new_features_2_2.xml
index bb0d4a3a531..c1d61097790 100644
--- a/docs/manual/new_features_2_2.xml
+++ b/docs/manual/new_features_2_2.xml
@@ -48,6 +48,12 @@
           has been introduced to cleanup <module>mod_disk_cache</module>
           setups.</dd>
 
+      <dt>Configuration</dt>
+      <dd>The default configuration layout has been simplified and
+          modularised. Configuration snippets which assist with enabling 
+          commonly used features are now bundled and easily included in the 
+          main server configuration.</dd>
+
       <dt>Graceful stop</dt>
       <dd>The <module>prefork</module>, <module>worker</module> and 
           <module>event</module>  MPMs now allow <program>httpd</program> 
diff --git a/docs/manual/new_features_2_2.xml.ko b/docs/manual/new_features_2_2.xml.ko
index a942f23f912..97662d44fea 100644
--- a/docs/manual/new_features_2_2.xml.ko
+++ b/docs/manual/new_features_2_2.xml.ko
@@ -1,7 +1,7 @@
 <?xml version='1.0' encoding='EUC-KR' ?>
 <!DOCTYPE manualpage SYSTEM "./style/manualpage.dtd">
 <?xml-stylesheet type="text/xsl" href="./style/manual.ko.xsl"?>
-<!-- English Revision: 105989:327998 (outdated) -->
+<!-- English Revision: 105989:307442 (outdated) -->
 
 <!--
  Copyright 2004-2005 The Apache Software Foundation or its licensors,
diff --git a/docs/manual/new_features_2_2.xml.pt-br b/docs/manual/new_features_2_2.xml.pt-br
index d299efe156d..71b6c1fc291 100644
--- a/docs/manual/new_features_2_2.xml.pt-br
+++ b/docs/manual/new_features_2_2.xml.pt-br
@@ -1,7 +1,7 @@
 <?xml version='1.0' encoding='UTF-8' ?>
 <!DOCTYPE manualpage SYSTEM "./style/manualpage.dtd">
 <?xml-stylesheet type="text/xsl" href="./style/manual.pt-br.xsl"?>
-<!-- English Revision: 151408:327998 (outdated) -->
+<!-- English Revision: 151408:307442 (outdated) -->
 
 <!--
  Copyright 2005 The Apache Software Foundation or its licensors,