From 4f9f6f79bf6bb9c357e0b8090187e80878cb5638 Mon Sep 17 00:00:00 2001
From: Jim Jagielski <jim@apache.org>
Date: Tue, 13 Sep 2011 18:48:19 +0000
Subject: [PATCH] Some more 2.4 goodness and notes

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1170294 13f79535-47bb-0310-9956-ffa450edef68
---
 docs/manual/mod/core.xml         |  2 +-
 docs/manual/new_features_2_4.xml | 16 +++++++++++++---
 2 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/docs/manual/mod/core.xml b/docs/manual/mod/core.xml
index 81be2179ec..d2436f93a7 100644
--- a/docs/manual/mod/core.xml
+++ b/docs/manual/mod/core.xml
@@ -3194,7 +3194,7 @@ or specified mutexes</description>
 
 <directivesynopsis>
 <name>NameVirtualHost</name>
-<description>Designates an IP address for name-virtual
+<description>DEPRECATED: Designates an IP address for name-virtual
 hosting</description>
 <syntax>NameVirtualHost <var>addr</var>[:<var>port</var>]</syntax>
 <contextlist><context>server config</context></contextlist>
diff --git a/docs/manual/new_features_2_4.xml b/docs/manual/new_features_2_4.xml
index 98967c1a92..ebf1b37fd4 100644
--- a/docs/manual/new_features_2_4.xml
+++ b/docs/manual/new_features_2_4.xml
@@ -35,7 +35,6 @@
     <title>Core Enhancements</title>
     <dl>
       <dt>KeepAliveTimeout in milliseconds</dt>
-
       <dd>It is now possible to specify <directive module="core"
       >KeepAliveTimeout</directive> in milliseconds.
       </dd>
@@ -51,7 +50,7 @@
       level.</dd>
 
       <dt>Event MPM</dt>
-      <dd>The Event MPM is no longer experimental but is rather fully supported.</dd>
+      <dd>The Event MPM is no longer experimental but is now fully supported.</dd>
  
       <dt>Asynchronous support</dt>
       <dd>Better support for asynchronous read/write for supporting MPMs and
@@ -60,7 +59,10 @@
       <dt>Per-request configuration sections</dt>
       <dd>&lt;<directive module="core">If</directive>&gt; sections can be used to 
       set the configuration based on per-request criteria</dd>
- 
+
+      <dt>NameVirtualHost directive</dt>
+      <dd>No longer needed and is now deprecated.</dd>
+
     </dl>
   </section>
 
@@ -81,6 +83,9 @@
       <dd>Embeds the <a href="http://www.lua.org/">Lua</a> language into httpd, 
       for configuration and small business logic functions.</dd>
 
+      <dt><module>mod_proxy_express</module></dt>
+      <dd>Provides dynamically configured mass reverse proxies for <module>mod_proxy</module></dd>
+
       <dt><module>mod_proxy_fcgi</module></dt>
       <dd>FastCGI Protocol backend for <module>mod_proxy</module></dd>
 
@@ -149,6 +154,11 @@
 
       <dd>Runtime configuration of a subset of Balancer parameters</dd>
 
+      <dd>BalancerMembers can be set to 'Drain' so that they only respond to existing sticky
+      sessions, allowing them to be taken gracefully offline.</dd>
+
+      <dd>Balancer settings can be persistant after restarts.</dd>
+
       <dt><module>mod_cache</module></dt>
 
       <dd><module>mod_cache</module> can now cache HEAD requests.</dd>
-- 
2.40.0