From: Nick Kew <niq@apache.org>
Date: Tue, 29 Jun 2010 23:04:27 +0000 (+0000)
Subject: Move new_api_2_4 doc to developer docs where it belongs
X-Git-Tag: 2.3.7~113
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=042384c3b48673d5f73888352aa7276cc31c11de;p=thirdparty%2Fapache%2Fhttpd.git

Move new_api_2_4 doc to developer docs where it belongs


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

diff --git a/docs/manual/developer/index.xml b/docs/manual/developer/index.xml
index df8cf6b6d06..5b04eefa244 100644
--- a/docs/manual/developer/index.xml
+++ b/docs/manual/developer/index.xml
@@ -28,7 +28,7 @@
 <summary>
     <p>Many of the documents on these Developer pages are lifted
     from Apache 1.3's documentation. While they are all being
-    updated to Apache 2.0, they are in different stages of
+    updated to Apache 2, they are in different stages of
     progress. Please be patient, and point out any discrepancies or
     errors on the developer/ pages directly to the
     <a href="http://httpd.apache.org/lists.html#http-dev"
@@ -38,14 +38,15 @@
 <section id="topics"><title>Topics</title>
     <ul>
       <li><a href="API.html">Apache 1.3 API Notes</a></li>
-      <li><a href="hooks.html">Apache 2.0 Hook Functions</a></li>
-      <li><a href="request.html">Request Processing in Apache 2.0</a></li>
-      <li><a href="filters.html">How filters work in Apache 2.0</a></li>
-      <li><a href="output-filters.html">Guidelines for output filters in Apache 2.0</a></li>
-      <li><a href="modules.html">Converting Modules from Apache 1.3 to Apache 2.0</a></li>
+      <li><a href="new_api_2_4.html">API changes in Apache 2.3/2.4</a></li>
+      <li><a href="hooks.html">Apache 2.x Hook Functions</a></li>
+      <li><a href="request.html">Request Processing in Apache 2.x</a></li>
+      <li><a href="filters.html">How filters work in Apache 2.x</a></li>
+      <li><a href="output-filters.html">Guidelines for output filters in Apache 2.x</a></li>
+      <li><a href="modules.html">Converting Modules from Apache 1.3 to Apache 2.x</a></li>
       <li><a href="debugging.html">Debugging Memory Allocation in APR</a></li>
-      <li><a href="documenting.html">Documenting Apache 2.0</a></li>
-      <li><a href="thread_safety.html">Apache 2.0 Thread Safety Issues</a></li>
+      <li><a href="documenting.html">Documenting Apache 2.x</a></li>
+      <li><a href="thread_safety.html">Apache 2.x Thread Safety Issues</a></li>
     </ul>
 </section>
 
diff --git a/docs/manual/new_api_2_4.xml b/docs/manual/developer/new_api_2_4.xml
similarity index 100%
rename from docs/manual/new_api_2_4.xml
rename to docs/manual/developer/new_api_2_4.xml
diff --git a/docs/manual/new_api_2_4.xml.meta b/docs/manual/developer/new_api_2_4.xml.meta
similarity index 100%
rename from docs/manual/new_api_2_4.xml.meta
rename to docs/manual/developer/new_api_2_4.xml.meta
diff --git a/docs/manual/index.xml b/docs/manual/index.xml
index c6cbe77ba07..cf89a549921 100644
--- a/docs/manual/index.xml
+++ b/docs/manual/index.xml
@@ -27,7 +27,6 @@
 Documentation</title>
 
 <category id="release"><title>Release Notes</title>
-    <page href="new_api_2_4.html">API changes with Apache 2.3/2.4</page>
     <page href="new_features_2_4.html">New features with Apache 2.3/2.4</page>
     <page href="new_features_2_2.html">New features with Apache 2.1/2.2</page>
     <page href="new_features_2_0.html">New features with Apache 2.0</page>
diff --git a/docs/manual/new_api_2_4.html b/docs/manual/new_api_2_4.html
deleted file mode 100644
index f13974a3bca..00000000000
--- a/docs/manual/new_api_2_4.html
+++ /dev/null
@@ -1,5 +0,0 @@
-# GENERATED FROM XML -- DO NOT EDIT
-
-URI: new_api_2_4.html.en
-Content-Language: en
-Content-type: text/html; charset=ISO-8859-1
diff --git a/docs/manual/new_api_2_4.html.en b/docs/manual/new_api_2_4.html.en
deleted file mode 100644
index b49f08ad2c3..00000000000
--- a/docs/manual/new_api_2_4.html.en
+++ /dev/null
@@ -1,223 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en"><head><!--
-        XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
-              This file is generated from xml source: DO NOT EDIT
-        XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
-      -->
-<title>API Changes in Apache HTTP Server 2.4 since 2.2 - Apache HTTP Server</title>
-<link href="./style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" />
-<link href="./style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" />
-<link href="./style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" />
-<link href="./images/favicon.ico" rel="shortcut icon" /></head>
-<body id="manual-page"><div id="page-header">
-<p class="menu"><a href="./mod/">Modules</a> | <a href="./mod/directives.html">Directives</a> | <a href="./faq/">FAQ</a> | <a href="./glossary.html">Glossary</a> | <a href="./sitemap.html">Sitemap</a></p>
-<p class="apache">Apache HTTP Server Version 2.3</p>
-<img alt="" src="./images/feather.gif" /></div>
-<div class="up"><a href="./"><img title="&lt;-" alt="&lt;-" src="./images/left.gif" /></a></div>
-<div id="path">
-<a href="http://www.apache.org/">Apache</a> &gt; <a href="http://httpd.apache.org/">HTTP Server</a> &gt; <a href="http://httpd.apache.org/docs/">Documentation</a> &gt; <a href="./">Version 2.3</a></div><div id="page-content"><div id="preamble"><h1>API Changes in Apache HTTP Server 2.4 since 2.2</h1>
-<div class="toplang">
-<p><span>Available Languages: </span><a href="./en/new_api_2_4.html" title="English">&nbsp;en&nbsp;</a></p>
-</div>
-
-  <p>This document describes changes to the Apache HTTPD API from
-     version 2.2 to 2.4, that may be of interest to module/application
-     developers and core hacks.  At the time of writing, the 2.4 API
-     is not finalised, and this document may serve to highlight
-     points that call for further review.</p>
-  <p>API changes fall into two categories: APIs that are altogether new,
-     and existing APIs that are expanded or changed.  The latter are
-     further divided into those where all changes are back-compatible
-     (so existing modules can ignore them), and those that might
-     require attention by maintainers.  As with the transition from
-     HTTPD 2.0 to 2.2, existing modules and applications will require
-     recompiling and may call for some attention, but most should not
-     require any substantial updating (although some may be able to
-     take advantage of API changes to offer significant improvements).</p>
-  <p>For the purpose of this document, the API is split according
-     to the public header files.  These headers are themselves the
-     reference documentation, and can be used to generate a browsable 
-     HTML reference with <code>make docs</code>.</p>
-</div>
-<div id="quickview"><ul id="toc"><li><img alt="" src="./images/down.gif" /> <a href="#ap_expr">ap_expr (NEW!)</a></li>
-<li><img alt="" src="./images/down.gif" /> <a href="#ap_listen">ap_listen (changed; back-compatible)</a></li>
-<li><img alt="" src="./images/down.gif" /> <a href="#ap_mpm">ap_mpm (changed)</a></li>
-<li><img alt="" src="./images/down.gif" /> <a href="#ap_slotmem">ap_slotmem (NEW!)</a></li>
-<li><img alt="" src="./images/down.gif" /> <a href="#ap_socache">ap_socache (NEW!)</a></li>
-<li><img alt="" src="./images/down.gif" /> <a href="#heartbeat">heartbeat (NEW!)</a></li>
-<li><img alt="" src="./images/down.gif" /> <a href="#http_config">http_config (changed)</a></li>
-<li><img alt="" src="./images/down.gif" /> <a href="#http_core">http_core (changed)</a></li>
-<li><img alt="" src="./images/down.gif" /> <a href="#httpd">httpd (changed)</a></li>
-<li><img alt="" src="./images/down.gif" /> <a href="#http_log">http_log (changed)</a></li>
-<li><img alt="" src="./images/down.gif" /> <a href="#http_request">http_request (changed)</a></li>
-<li><img alt="" src="./images/down.gif" /> <a href="#mod_auth">mod_auth (NEW!)</a></li>
-<li><img alt="" src="./images/down.gif" /> <a href="#mod_core">mod_core (NEW!)</a></li>
-<li><img alt="" src="./images/down.gif" /> <a href="#mod_request">mod_request (NEW!)</a></li>
-<li><img alt="" src="./images/down.gif" /> <a href="#mpm_common">mpm_common (changed)</a></li>
-<li><img alt="" src="./images/down.gif" /> <a href="#scoreboard">scoreboard (changed)</a></li>
-<li><img alt="" src="./images/down.gif" /> <a href="#util_cookies">util_cookies (NEW!)</a></li>
-<li><img alt="" src="./images/down.gif" /> <a href="#util_ldap">util_ldap (changed)</a></li>
-<li><img alt="" src="./images/down.gif" /> <a href="#util_mutex">util_mutex (NEW!)</a></li>
-<li><img alt="" src="./images/down.gif" /> <a href="#util_script">util_script (changed)</a></li>
-<li><img alt="" src="./images/down.gif" /> <a href="#util_time">util_time (changed)</a></li>
-</ul></div>
-<div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div>
-<div class="section">
-<h2><a name="ap_expr" id="ap_expr">ap_expr (NEW!)</a></h2>
-    
-    <p>Introduces a new API to parse and evaluate boolean and algebraic
-       expressions, including provision for a standard syntax and
-       customised variants.</p>
-  </div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div>
-<div class="section">
-<h2><a name="ap_listen" id="ap_listen">ap_listen (changed; back-compatible)</a></h2>
-    
-    <p>Introduces new API to enable apache child processes to serve different purposes.</p>
-  </div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div>
-<div class="section">
-<h2><a name="ap_mpm" id="ap_mpm">ap_mpm (changed)</a></h2>
-    
-  <p><code>ap_mpm_run</code> is replaced by a new <code>mpm</code> hook.
-  Also <code>ap_graceful_stop_signalled</code> is lost, and
-  <code>ap_mpm_register_timed_callback</code> is new.</p>
-  </div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div>
-<div class="section">
-<h2><a name="ap_slotmem" id="ap_slotmem">ap_slotmem (NEW!)</a></h2>
-    
-    <p>Introduces an API for modules to allocate and manage memory slots
-    (normally) for shared memory.</p>
-  </div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div>
-<div class="section">
-<h2><a name="ap_socache" id="ap_socache">ap_socache (NEW!)</a></h2>
-    
-    <p>API to manage a shared object cache.</p>
-  </div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div>
-<div class="section">
-<h2><a name="heartbeat" id="heartbeat">heartbeat (NEW!)</a></h2>
-    
-    <p>common structures for heartbeat modules (should this be public API?)</p>
-  </div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div>
-<div class="section">
-<h2><a name="http_config" id="http_config">http_config (changed)</a></h2>
-    
-    <ul>
-      <li>Introduces per-module, per-directory loglevels, including macro wrappers.</li>
-      <li>New AP_DECLARE_MODULE macro to declare all modules.</li>
-      <li>New APLOG_USE_MODULE macro necessary for per-module loglevels in
-          multi-file modules.</li>
-      <li>New API to retain data across module unload/load</li>
-      <li>New check_config hook</li>
-      <li>New ap_process_fnmatch_configs() to process wildcards</li>
-    </ul>
-  </div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div>
-<div class="section">
-<h2><a name="http_core" id="http_core">http_core (changed)</a></h2>
-    
-    <ul>
-      <li>REMOVED ap_default_type, ap_requires, all 2.2 authnz API</li>
-      <li>Introduces Optional Functions for logio and authnz</li>
-      <li>New function ap_get_server_name_for_url to support ipv6 literals.</li>
-    </ul>
-  </div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div>
-<div class="section">
-<h2><a name="httpd" id="httpd">httpd (changed)</a></h2>
-    
-    <ul>
-      <li>Introduce per-directory, per-module loglevel</li>
-      <li>New loglevels APLOG_TRACEn</li>
-      <li>Support for mod_request kept_body</li>
-      <li>Support buffering filter data for async requests</li>
-      <li>New CONN_STATE values</li>
-      <li>Function changes: ap_escape_html updated; ap_unescape_all, ap_escape_path_segment_buffer</li>
-    </ul>
-  </div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div>
-<div class="section">
-<h2><a name="http_log" id="http_log">http_log (changed)</a></h2>
-    
-    <ul>
-      <li>Introduce per-directory, per-module loglevel</li>
-      <li>New loglevels APLOG_TRACEn</li>
-      <li>ap_log_*error become macro wrappers (fully back-compatible if
-          APLOG_MARK macro is used)</li>
-      <li>piped logging revamped</li>
-      <li>module_index added to error_log hook</li>
-      <li>new function: ap_log_command_line</li>
-    </ul>
-  </div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div>
-<div class="section">
-<h2><a name="http_request" id="http_request">http_request (changed)</a></h2>
-    
-    <ul>
-      <li>New auth_internal API and auth_provider API</li>
-      <li>New EOR bucket type</li>
-      <li>New function ap_process_async_request</li>
-      <li>New functions ap_hook_check_access, ap_hook_check_authn, ap_hook_check_authz (why are these called ap_hook_* when they are functions not hooks?)</li>
-    </ul>
-  </div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div>
-<div class="section">
-<h2><a name="mod_auth" id="mod_auth">mod_auth (NEW!)</a></h2>
-    
-    <p>Introduces the new provider framework for authn and authz</p>
-  </div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div>
-<div class="section">
-<h2><a name="mod_core" id="mod_core">mod_core (NEW!)</a></h2>
-    
-    <p>This introduces low-level APIs to send arbitrary headers,
-    and exposes functions to handle HTTP OPTIONS and TRACE.</p>
-  </div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div>
-<div class="section">
-<h2><a name="mod_request" id="mod_request">mod_request (NEW!)</a></h2>
-    
-    <p>The API for <code class="module"><a href="./mod/mod_request.html">mod_request</a></code>, to make input data
-    available to multiple application/handler modules where required,
-    and to parse HTML form data.</p>
-  </div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div>
-<div class="section">
-<h2><a name="mpm_common" id="mpm_common">mpm_common (changed)</a></h2>
-    
-    <ul>
-      <li>REMOVES: accept, lockfile, lock_mech, set_scoreboard (locking uses the new ap_mutex API)</li>
-      <li>NEW API to drop privileges (delegates this platform-dependent
-          function to modules)</li>
-      <li>NEW Hooks: mpm_query, mpm_note_child_killed, timed_callback, get_name, and function ap_mpm_note_child_killed</li>
-    </ul>
-  </div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div>
-<div class="section">
-<h2><a name="scoreboard" id="scoreboard">scoreboard (changed)</a></h2>
-    
-    <p>ap_get_scoreboard_worker is gratuitously made non-back-compatible
-    as an alternative version is introduced.  Additional proxy_balancer
-    support.  Child status stuff revamped.</p>
-  </div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div>
-<div class="section">
-<h2><a name="util_cookies" id="util_cookies">util_cookies (NEW!)</a></h2>
-    
-    <p>Introduces a new API for managing HTTP Cookies.</p>
-  </div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div>
-<div class="section">
-<h2><a name="util_ldap" id="util_ldap">util_ldap (changed)</a></h2>
-    
-    <p>I have yet to get a handle on this update.</p>
-  </div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div>
-<div class="section">
-<h2><a name="util_mutex" id="util_mutex">util_mutex (NEW!)</a></h2>
-    
-    <p>A wrapper for APR proc and global mutexes in httpd.</p>
-  </div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div>
-<div class="section">
-<h2><a name="util_script" id="util_script">util_script (changed)</a></h2>
-    
-    <p>NEW: ap_args_to_table</p>
-  </div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div>
-<div class="section">
-<h2><a name="util_time" id="util_time">util_time (changed)</a></h2>
-    
-    <p>NEW: ap_recent_ctime_ex</p>
-  </div></div>
-<div class="bottomlang">
-<p><span>Available Languages: </span><a href="./en/new_api_2_4.html" title="English">&nbsp;en&nbsp;</a></p>
-</div><div id="footer">
-<p class="apache">Copyright 2010 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
-<p class="menu"><a href="./mod/">Modules</a> | <a href="./mod/directives.html">Directives</a> | <a href="./faq/">FAQ</a> | <a href="./glossary.html">Glossary</a> | <a href="./sitemap.html">Sitemap</a></p></div>
-</body></html>
\ No newline at end of file
diff --git a/docs/manual/sitemap.xml b/docs/manual/sitemap.xml
index 1866775e6d5..316c8518e25 100644
--- a/docs/manual/sitemap.xml
+++ b/docs/manual/sitemap.xml
@@ -34,7 +34,6 @@ Documentation</a>.</p>
 <title>Release Notes</title>
 <page href="upgrading.html">Upgrading to 2.4 from 2.2</page>
 <page href="new_features_2_4.html">New features with Apache 2.3/2.4</page>
-<page href="new_api_2_4.html">API updates in Apache HTTPD 2.4</page>
 <page href="new_features_2_2.html">New features with Apache 2.1/2.2</page>
 <page href="new_features_2_0.html">New features with Apache 2.0</page>
 <page href="license.html">Apache License</page>
@@ -157,6 +156,7 @@ Server on HPUX</page>
 <title>Developer Documentation</title>
 <page separate="yes" href="developer/">Overview</page>
 <page href="developer/API.html">Apache API notes</page>
+<page href="developer/new_api_2_4.html">API updates in Apache HTTPD 2.4</page>
 <page href="developer/debugging.html">Debugging Memory Allocation in APR</page>
 <page href="developer/documenting.html">Documenting Apache 2.x</page>
 <page href="developer/hooks.html">Apache 2.x Hook Functions</page>
diff --git a/docs/manual/upgrading.xml b/docs/manual/upgrading.xml
index 4a9b64e7bfa..eb73c304b7f 100644
--- a/docs/manual/upgrading.xml
+++ b/docs/manual/upgrading.xml
@@ -31,7 +31,7 @@
   more information in either the <a
   href="new_features_2_4.html">New Features</a> document, or in
   the <code>src/CHANGES</code> file.  Application and module developers
-  can find a summary of API changes in the <a href="new_api_2_4.html"
+  can find a summary of API changes in the <a href="developer/new_api_2_4.html"
   >API updates</a> overview.</p>
 
   <p>This document describes changes in server behavior that might
@@ -238,7 +238,7 @@
 
     <p>Many third-party modules designed for version 2.2 will
     otherwise work unchanged with the Apache HTTP Server version 2.4.
-    Some will require changes; see the <a href="new_api_2_4.html">API
+    Some will require changes; see the <a href="developer/new_api_2_4.html">API
     update</a> overview.</p>
   </section>