From d65a57ea79dd2d6fdc8bff557609874e3fbf22f2 Mon Sep 17 00:00:00 2001
From: Rich Bowen <rbowen@apache.org>
Date: Mon, 26 Jun 2006 16:55:29 +0000
Subject: [PATCH] Patch submitted by Matt Lewandowsky - fixes name of mod_isapi
 handler.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@417237 13f79535-47bb-0310-9956-ffa450edef68
---
 docs/manual/mod/core.html.en      | 2 +-
 docs/manual/mod/core.xml          | 2 +-
 docs/manual/mod/core.xml.de       | 2 +-
 docs/manual/mod/core.xml.ja       | 2 +-
 docs/manual/mod/mod_isapi.html.en | 7 +++++++
 docs/manual/mod/mod_isapi.xml     | 7 +++++++
 docs/manual/mod/mod_isapi.xml.ko  | 4 ++--
 7 files changed, 20 insertions(+), 6 deletions(-)

diff --git a/docs/manual/mod/core.html.en b/docs/manual/mod/core.html.en
index 2b6731a7d4..2a1818ba94 100644
--- a/docs/manual/mod/core.html.en
+++ b/docs/manual/mod/core.html.en
@@ -190,7 +190,7 @@ available</td></tr>
     <dt><code>Default</code></dt><dd>The treatment of requests with
     trailing pathname information is determined by the <a href="../handler.html">handler</a> responsible for the request.
     The core handler for normal files defaults to rejecting
-    <code>PATH_INFO</code> requests. Handlers that serve scripts, such as <a href="mod_cgi.html">cgi-script</a> and <a href="mod_isapi.html">isapi-isa</a>, generally accept
+    <code>PATH_INFO</code> requests. Handlers that serve scripts, such as <a href="mod_cgi.html">cgi-script</a> and <a href="mod_isapi.html">isapi-handler</a>, generally accept
     <code>PATH_INFO</code> by default.</dd>
     </dl>
 
diff --git a/docs/manual/mod/core.xml b/docs/manual/mod/core.xml
index d57e5f1a02..2722b280ab 100644
--- a/docs/manual/mod/core.xml
+++ b/docs/manual/mod/core.xml
@@ -125,7 +125,7 @@ available</description>
     The core handler for normal files defaults to rejecting
     <code>PATH_INFO</code> requests. Handlers that serve scripts, such as <a
     href="mod_cgi.html">cgi-script</a> and <a
-    href="mod_isapi.html">isapi-isa</a>, generally accept
+    href="mod_isapi.html">isapi-handler</a>, generally accept
     <code>PATH_INFO</code> by default.</dd>
     </dl>
 
diff --git a/docs/manual/mod/core.xml.de b/docs/manual/mod/core.xml.de
index 6bcc7d4a5d..78fce30b60 100644
--- a/docs/manual/mod/core.xml.de
+++ b/docs/manual/mod/core.xml.de
@@ -79,7 +79,7 @@ Servers</description>
     f&uuml;r gew&ouml;hnliche Dateien weist <code>PATH_INFO</code>-Zugriffe
     standardm&auml;&szlig;ig zur&uuml;ck. Handler, die Skripte bedienen,
     wie z.B. <a href="mod_cgi.html">cgi-script</a> und
-    <a href="mod_isapi.html">isapi-isa</a>, sind im Allgemeinen darauf
+    <a href="mod_isapi.html">isapi-handler</a>, sind im Allgemeinen darauf
     voreingestellt, <code>PATH_INFO</code> zu akzeptieren.</dd>
     </dl>
 
diff --git a/docs/manual/mod/core.xml.ja b/docs/manual/mod/core.xml.ja
index 5e3fc7749f..9e2c206a9a 100644
--- a/docs/manual/mod/core.xml.ja
+++ b/docs/manual/mod/core.xml.ja
@@ -118,7 +118,7 @@
     <a href="../handler.html">$B%O%s%I%i(B</a>$B$G7h$^$j$^$9!#(B
     $BIaDL$N%U%!%$%k$N$?$a$N%3%"%O%s%I%i$N%G%U%)%k%H$O(B <code>PATH_INFO</code> $B$r5qH]$7$^$9!#(B
     <a href="mod_cgi.html">cgi-script</a> $B$d(B <a
-    href="mod_isapi.html">isapi-isa</a> $B$N$h$&$K%9%/%j%W%H$r07$&%O%s%I%i$O(B
+    href="mod_isapi.html">isapi-handler</a> $B$N$h$&$K%9%/%j%W%H$r07$&%O%s%I%i$O(B
     $B0lHLE*$K%G%U%)%k%H$G(B <code>PATH_INFO</code> $B$r<u$1IU$1$^$9!#(B</dd>
     </dl>
 
diff --git a/docs/manual/mod/mod_isapi.html.en b/docs/manual/mod/mod_isapi.html.en
index 9a14abc053..405f566a13 100644
--- a/docs/manual/mod/mod_isapi.html.en
+++ b/docs/manual/mod/mod_isapi.html.en
@@ -72,6 +72,13 @@
         AddHandler isapi-handler.dll
     </code></p></div>
 
+    <div class="note">In older versions of the Apache server,
+    <code>isapi-isa</code> was the proper handler name, rather than
+    <code>isapi-handler</code>. As of 2.3 development versions of the Apache
+    server, <code>isapi-isa</code> is no longer valid. You will need to
+    change your configuration to use <code>isapi-handler</code>
+    instead.</div>
+
     <p>There is no capability within the Apache server to leave a
     requested module loaded. However, you may preload and keep a
     specific module loaded by using the following syntax in your
diff --git a/docs/manual/mod/mod_isapi.xml b/docs/manual/mod/mod_isapi.xml
index f57a130fd1..a183000551 100644
--- a/docs/manual/mod/mod_isapi.xml
+++ b/docs/manual/mod/mod_isapi.xml
@@ -55,6 +55,13 @@
         AddHandler isapi-handler.dll
     </example>
 
+    <note>In older versions of the Apache server,
+    <code>isapi-isa</code> was the proper handler name, rather than
+    <code>isapi-handler</code>. As of 2.3 development versions of the Apache
+    server, <code>isapi-isa</code> is no longer valid. You will need to
+    change your configuration to use <code>isapi-handler</code>
+    instead.</note>
+
     <p>There is no capability within the Apache server to leave a
     requested module loaded. However, you may preload and keep a
     specific module loaded by using the following syntax in your
diff --git a/docs/manual/mod/mod_isapi.xml.ko b/docs/manual/mod/mod_isapi.xml.ko
index 760746cfc5..c54dee4e08 100644
--- a/docs/manual/mod/mod_isapi.xml.ko
+++ b/docs/manual/mod/mod_isapi.xml.ko
@@ -45,11 +45,11 @@
 
     <p>¼­¹ö¼³Á¤ÆÄÀÏ¿¡¼­ <directive
     module="mod_mime">AddHandler</directive> Áö½Ã¾î¸¦ »ç¿ëÇÏ¿©
-    ISAPI ÆÄÀÏ È®ÀåÀÚ¿Í <code>isapi-isa</code> Çڵ鷯¸¦ ¿¬°áÇÑ´Ù.
+    ISAPI ÆÄÀÏ È®ÀåÀÚ¿Í <code>isapi-handler</code> Çڵ鷯¸¦ ¿¬°áÇÑ´Ù.
     .dll ÆÄÀÏÀ» ISAPI extensionÀ¸·Î ó¸®ÇÏ·Á¸é httpd.conf ÆÄÀÏ¿¡
     ´ÙÀ½°ú °°ÀÌ Ãß°¡ÇÑ´Ù.</p>
     <example>
-        AddHandler isapi-isa .dll
+        AddHandler isapi-handler .dll
     </example>
 
     <p>¾ÆÆÄÄ¡ ¼­¹ö´Â ¿äûÇÑ ¸ðµâÀ» ¸Þ¸ð¸®¿¡ °è¼Ó µÑ ¼ö ¾ø´Ù.
-- 
2.40.0