From: Takashi Sato <takashi@apache.org>
Date: Fri, 9 May 2008 12:12:34 +0000 (+0000)
Subject: Merge r351614 from 2.2:
X-Git-Tag: 2.3.0~658
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=04790612a770aad07256e3e940df2371edaa98ed;p=thirdparty%2Fapache%2Fhttpd.git

Merge r351614 from 2.2:
It is mod_authN_file, not mod_auth_file

Merge r356658 from 2.2:
Mention mod_authz_user and mod_version, a new module in 2.2.

Merge r370945 from 2.2:
Fix spelling of occur.
Submitted By: Ãvar Arnfjörð Bjarmason <avarab gmail.com>

Merge r559984 from 2.2:
Fixed typo "separate" from PR 40454

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@654778 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/docs/manual/new_features_2_2.xml b/docs/manual/new_features_2_2.xml
index 4214f154b31..875189e77ab 100644
--- a/docs/manual/new_features_2_2.xml
+++ b/docs/manual/new_features_2_2.xml
@@ -96,7 +96,7 @@
           bodies has also been added.</dd>
 
       <dt>Event MPM</dt>
-      <dd>The <module>event</module> MPM uses a seperate thread to handle
+      <dd>The <module>event</module> MPM uses a separate 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 
@@ -118,7 +118,7 @@
       <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_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
@@ -132,6 +132,14 @@
           complicated search filters in the 
           <directive module="mod_authz_core">Require</directive> directive.</dd>
 
+      <dt><module>mod_authz_owner</module></dt>
+      <dd>A new module that authorizes access to files based
+          on the owner of the file on the file system</dd>
+
+      <dt><module>mod_version</module></dt>
+      <dd>A new module that allows configuration blocks to be enabled based on the
+          version number of the running server.</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
@@ -193,7 +201,7 @@
       <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, 
+          errors that occur with the client's connection.  When logged, 
           the message includes the client IP address.</dd>
 
       <dt>Test Configuration Hook Added</dt>