From: Paul Querna <pquerna@apache.org>
Date: Sun, 20 Nov 2005 01:39:40 +0000 (+0000)
Subject: Merge r345701 from trunk:
X-Git-Tag: 2.2.0^2~16
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=198224daeec540bcf3786c13143077c3bbdfb24b;p=thirdparty%2Fapache%2Fhttpd.git

Merge r345701 from trunk:

* Add a mention of the new httxt2dbm program


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

diff --git a/docs/manual/new_features_2_2.xml b/docs/manual/new_features_2_2.xml
index f2e226e96f6..21fe38db13c 100644
--- a/docs/manual/new_features_2_2.xml
+++ b/docs/manual/new_features_2_2.xml
@@ -154,6 +154,10 @@
       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>
+      <dt><program>htttxt2dbm</program></dt>
+      <dd>A new program used to generate dbm files from text input, 
+          for use in <directive module="mod_rewrite">RewriteMap</directive>
+          with the <code>dbm</code> map type.</dd>
     </dl>
   </section>