From 664be5573a519549afacc0cdacbf6f94c0e13604 Mon Sep 17 00:00:00 2001
From: Paul Querna <pquerna@apache.org>
Date: Sat, 11 Dec 2004 08:48:01 +0000
Subject: [PATCH] Mention TLS Upgrade Support as a new feature. Add blurb about
 the new -M option to httpd.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@111589 13f79535-47bb-0310-9956-ffa450edef68
---
 docs/manual/new_features_2_2.html.en | 18 ++++++++++++++++++
 docs/manual/new_features_2_2.xml     | 17 +++++++++++++++++
 2 files changed, 35 insertions(+)

diff --git a/docs/manual/new_features_2_2.html.en b/docs/manual/new_features_2_2.html.en
index b7572f1581..871884fc44 100644
--- a/docs/manual/new_features_2_2.html.en
+++ b/docs/manual/new_features_2_2.html.en
@@ -29,6 +29,7 @@
 </div>
 <div id="quickview"><ul id="toc"><li><img alt="" src="./images/down.gif" /> <a href="#core">Core Enhancements</a></li>
 <li><img alt="" src="./images/down.gif" /> <a href="#module">Module Enhancements</a></li>
+<li><img alt="" src="./images/down.gif" /> <a href="#programs">Program Enhancements</a></li>
 <li><img alt="" src="./images/down.gif" /> <a href="#developer">Module Developer Changes</a></li>
 </ul></div>
 <div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div>
@@ -83,6 +84,23 @@
           their file name and line number.  The module also 
           shows the order of all request hooks and additional
           build information, similar to <code>httpd -V</code>.</dd>
+
+      <dt><code class="module"><a href="./mod/mod_ssl.html">mod_ssl</a></code></dt>
+      
+      <dd>Added a support for 
+         <a href="http://www.ietf.org/rfc/rfc2817.txt">RFC 2817</a>, which 
+         allows connections to upgrade from clear text to TLS encryption.</dd>
+    </dl>
+  </div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="programs" id="programs">Program Enhancements</a></h2>
+    
+    <dl>
+      <dt><code class="program"><a href="./programs/httpd.html">httpd</a></code></dt>
+      <dd>A new command line option <code>-M</code> has been added that
+      lists all modules that are loaded based on the current
+      configuration. Unlike the <code>-l</code> option, this list
+      includes DSOs loaded via <code class="module"><a href="./mod/mod_so.html">mod_so</a></code>.</dd>
     </dl>
   </div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div>
 <div class="section">
diff --git a/docs/manual/new_features_2_2.xml b/docs/manual/new_features_2_2.xml
index 00c1284ca0..27835968e7 100644
--- a/docs/manual/new_features_2_2.xml
+++ b/docs/manual/new_features_2_2.xml
@@ -80,6 +80,23 @@
           their file name and line number.  The module also 
           shows the order of all request hooks and additional
           build information, similar to <code>httpd -V</code>.</dd>
+
+      <dt><module>mod_ssl</module></dt>
+      <!-- Need Info on SSLEngine Support? -->
+      <dd>Added a support for 
+         <a href="http://www.ietf.org/rfc/rfc2817.txt">RFC 2817</a>, which 
+         allows connections to upgrade from clear text to TLS encryption.</dd>
+    </dl>
+  </section>
+
+  <section id="programs">
+    <title>Program Enhancements</title>
+    <dl>
+      <dt><program>httpd</program></dt>
+      <dd>A new command line option <code>-M</code> has been added that
+      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>
     </dl>
   </section>