Backport of r1629239, r1629244, 1629250:

Adjust docs for renaming of mod_example
to mod_example_hooks.

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

diff --git a/docs/manual/mod/allmodules.xml b/docs/manual/mod/allmodules.xml
index 592dce2a02ef03c2973d72d12d30531496804279..48e61762b67c26fd5ea57235cf23987b038f2365 100644 (file)
--- a/docs/manual/mod/allmodules.xml
+++ b/docs/manual/mod/allmodules.xml
@@ -46,7 +46,7 @@
   <modulefile>mod_dumpio.xml</modulefile>
   <modulefile>mod_echo.xml</modulefile>
   <modulefile>mod_env.xml</modulefile>
-  <modulefile>mod_example.xml</modulefile>
+  <modulefile>mod_example_hooks.xml</modulefile>
   <modulefile>mod_expires.xml</modulefile>
   <modulefile>mod_ext_filter.xml</modulefile>
   <modulefile>mod_file_cache.xml</modulefile>

diff --git a/docs/manual/mod/mod_example.html b/docs/manual/mod/mod_example_hooks.html
similarity index 100%
rename from docs/manual/mod/mod_example.html
rename to docs/manual/mod/mod_example_hooks.html

diff --git a/docs/manual/mod/mod_example.html.en b/docs/manual/mod/mod_example_hooks.html.en
similarity index 100%
rename from docs/manual/mod/mod_example.html.en
rename to docs/manual/mod/mod_example_hooks.html.en

diff --git a/docs/manual/mod/mod_example.html.fr b/docs/manual/mod/mod_example_hooks.html.fr
similarity index 100%
rename from docs/manual/mod/mod_example.html.fr
rename to docs/manual/mod/mod_example_hooks.html.fr

diff --git a/docs/manual/mod/mod_example.html.ko.euc-kr b/docs/manual/mod/mod_example_hooks.html.ko.euc-kr
similarity index 100%
rename from docs/manual/mod/mod_example.html.ko.euc-kr
rename to docs/manual/mod/mod_example_hooks.html.ko.euc-kr

diff --git a/docs/manual/mod/mod_example.xml b/docs/manual/mod/mod_example_hooks.xml
similarity index 79%
rename from docs/manual/mod/mod_example.xml
rename to docs/manual/mod/mod_example_hooks.xml
index 36f66a52c70f50ef6c4f7c78d8d81c07b4d3787b..dfb9655b8dc16ba8612138a403500a8d159d5ab2 100644 (file)
--- a/docs/manual/mod/mod_example.xml
+++ b/docs/manual/mod/mod_example_hooks.xml
@@ -20,40 +20,40 @@
  limitations under the License.
 -->
 
-<modulesynopsis metafile="mod_example.xml.meta">
+<modulesynopsis metafile="mod_example_hooks.xml.meta">
 
-<name>mod_example</name>
+<name>mod_example_hooks</name>
 <description>Illustrates the Apache module API</description>
 <status>Experimental</status>
-<sourcefile>mod_example.c</sourcefile>
-<identifier>example_module</identifier>
+<sourcefile>mod_example_hooks.c</sourcefile>
+<identifier>example_hooks_module</identifier>
 
 <summary>
-    <p>Some files in the <code>modules/experimental</code> directory
+    <p>The files in the <code>modules/examples</code> directory
     under the Apache distribution directory tree are provided as an
     example to those that wish to write modules that use the Apache
     API.</p>
 
-    <p>The main file is <code>mod_example.c</code>, which
+    <p>The main file is <code>mod_example_hooks.c</code>, which
     illustrates all the different callback mechanisms and call
     syntaxes. By no means does an add-on module need to include
     routines for all of the callbacks - quite the contrary!</p>
 
     <p>The example module is an actual working module. If you link
-    it into your server, enable the "example-handler" handler for a
+    it into your server, enable the "example-hooks-handler" handler for a
     location, and then browse to that location, you will see a
     display of some of the tracing the example module did as the
     various callbacks were made.</p>
 </summary>
 
-<section id="compiling"><title>Compiling the example module</title>
+<section id="compiling"><title>Compiling the example_hooks module</title>
 
-    <p>To include the example module in your server, follow the
+    <p>To include the example_hooks module in your server, follow the
     steps below:</p>
 
     <ol>
       <li>
-        Run <program>configure</program> with <code>--enable-example</code>
+        Run <program>configure</program> with <code>--enable-example-hooks</code>
         option.</li>
 
       <li>Make the server (run "<code>make</code>").</li>
@@ -62,7 +62,7 @@
     <p>To add another module of your own:</p>
 
     <ol type="A">
-      <li><code>cp modules/experimental/mod_example.c
+      <li><code>cp modules/examples/mod_example_hooks.c
       modules/new_module/<em>mod_myexample.c</em></code></li>
 
       <li>Modify the file.</li>
@@ -70,9 +70,9 @@
       <li>Create <code>modules/new_module/config.m4</code>.
         <ol>
           <li>Add <code>APACHE_MODPATH_INIT(new_module)</code>.</li>
-          <li>Copy APACHE_MODULE line with "example" from
-            <code>modules/experimental/config.m4</code>.</li>
-          <li>Replace the first argument "example" with <em>myexample</em>.</li>
+          <li>Copy APACHE_MODULE line with "example_hooks" from
+            <code>modules/examples/config.m4</code>.</li>
+          <li>Replace the first argument "example_hooks" with <em>myexample</em>.</li>
           <li>Replace the second argument with brief description of your module.
             It will be used in <code>configure --help</code>.</li>
           <li>If your module needs additional C compiler flags, linker flags or
@@ -95,13 +95,13 @@
     </ol>
 </section>
 
-<section id="using"><title>Using the <code>mod_example</code> Module</title>
+<section id="using"><title>Using the <code>mod_example_hooks</code> Module</title>
 
-    <p>To activate the example module, include a block similar to
+    <p>To activate the example_hooks module, include a block similar to
     the following in your <code>httpd.conf</code> file:</p>
 <highlight language="config">
-&lt;Location /example-info&gt;
-   SetHandler example-handler
+&lt;Location /example-hooks-info&gt;
+   SetHandler example-hooks-handler
 &lt;/Location&gt;
 </highlight>
 
@@ -109,7 +109,7 @@
     href="core.html#accessfilename"><code>.htaccess</code></a> file
     and then request the file "test.example" from that location:</p>
 <highlight language="config">
-   AddHandler example-handler .example
+   AddHandler example-hooks-handler .example
 </highlight>
 
     <p>After reloading/restarting your server, you should be able
@@ -130,7 +130,7 @@ API</description>
     <p>The <directive>Example</directive> directive just sets a demonstration
     flag which the example module's content handler displays. It
     takes no arguments. If you browse to an URL to which the
-    example content-handler applies, you will get a display of the
+    example-hooks content-handler applies, you will get a display of the
     routines within the module and how and in what order they were
     called to service the document request. The effect of this
     directive one can observe under the point "<code>Example

diff --git a/docs/manual/mod/mod_example.xml.fr b/docs/manual/mod/mod_example_hooks.xml.fr
similarity index 78%
rename from docs/manual/mod/mod_example.xml.fr
rename to docs/manual/mod/mod_example_hooks.xml.fr
index d96bf8c3500bc4ffa96e6ef0b35a5fae1022b1c1..5e31dd8b4339ccefd89ea22dcb45aad4dcfb52e5 100644 (file)
--- a/docs/manual/mod/mod_example.xml.fr
+++ b/docs/manual/mod/mod_example_hooks.xml.fr
@@ -22,41 +22,41 @@
  limitations under the License.
 -->
 
-<modulesynopsis metafile="mod_example.xml.meta">
+<modulesynopsis metafile="mod_example_hooks.xml.meta">
 
-<name>mod_example</name>
+<name>mod_example_hooks</name>
 <description>Illustration de l'API des modules Apache</description>
 <status>Experimental</status>
-<sourcefile>mod_example.c</sourcefile>
-<identifier>example_module</identifier>
+<sourcefile>mod_example_hooks.c</sourcefile>
+<identifier>example_hooks_module</identifier>
 
 <summary>
     <p>Certains fichiers situ&eacute;s dans le r&eacute;pertoire
-    <code>modules/experimental</code> de l'arborescence de la
+    <code>modules/examples</code> de l'arborescence de la
     distribution d'Apache sont fournis &agrave; titre d'exemples pour ceux qui
     souhaitent &eacute;crire des modules qui utilisent l'API d'Apache.</p>
 
-    <p>Le fichier principal est <code>mod_example.c</code>, qui
+    <p>Le fichier principal est <code>mod_example_hooks.c</code>, qui
     constitue une illustration exhaustive des diff&eacute;rents m&eacute;canismes et
     syntaxes d'appels. En aucun cas un module additionnel n'aura &agrave;
     inclure des routines pour tous les appels - il n'en n&eacute;cessitera au
     contraire qu'un petit nombre !</p>
 
-    <p>Le module example fonctionne r&eacute;ellement. Si vous le chargez dans
-    votre serveur, activez le gestionnaire "example-handler" dans une
+    <p>Le module example_hooks fonctionne r&eacute;ellement. Si vous le chargez dans
+    votre serveur, activez le gestionnaire "example-hooks-handler" dans une
     section location, et essayez d'acc&eacute;der &agrave; la zone du site web
     correspondante, vous verrez s'afficher certaines sorties que le
-    module example produit au cours des diff&eacute;rents appels.</p>
+    module example_hooks produit au cours des diff&eacute;rents appels.</p>
 </summary>
 
-<section id="compiling"><title>Compilation du module example</title>
+<section id="compiling"><title>Compilation du module example_hooks</title>
 
-    <p>Pour inclure le module example dans votre serveur, effectuez les
+    <p>Pour inclure le module example_hooks dans votre serveur, effectuez les
     &eacute;tapes suivantes :</p>
 
     <ol>
       <li>Ex&eacute;cutez <program>configure</program> avec l'option
-      <code>--enable-example</code>.</li>
+      <code>--enable-example-hooks</code>.</li>
 
       <li>Compilez le serveur (ex&eacute;cutez la commande
       "<code>make</code>").</li>
@@ -65,7 +65,7 @@
     <p>Pour ajouter votre propre module :</p>
 
     <ol type="A">
-      <li><code>cp modules/experimental/mod_example.c
+      <li><code>cp modules/examples/mod_example_hooks.c
       modules/nouveau_module/<em>mod_monexemple.c</em></code></li>
 
       <li>Modifiez le fichier.</li>
@@ -73,9 +73,9 @@
       <li>Cr&eacute;ez <code>modules/nouveau_module/config.m4</code>.
         <ol>
           <li>Ajoutez <code>APACHE_MODPATH_INIT(nouveau_module)</code>.</li>
-          <li>Copiez la ligne APACHE_MODULE contenant "example" depuis
-         <code>modules/experimental/config.m4</code>.</li>
-          <li>Remplacez le premier argument "example" par
+          <li>Copiez la ligne APACHE_MODULE contenant "example_hooks" depuis
+         <code>modules/examples/config.m4</code>.</li>
+          <li>Remplacez le premier argument "example-hooks" par
          <em>monexemple</em>.</li>
           <li>Remplacez le second argument par une br&egrave;ve description de
          votre module. Cette description sera utilis&eacute;e par la commande
@@ -105,13 +105,13 @@
 </section>
 
 <section id="using"><title>Utilisation du module
-<code>mod_example</code></title>
+<code>mod_example_hooks</code></title>
 
-    <p>Pour activer le module example, ajoutez &agrave; votre fichier
+    <p>Pour activer le module example_hooks, ajoutez &agrave; votre fichier
     <code>httpd.conf</code> un bloc du style :</p>
 <highlight language="config">
-&lt;Location /example-info&gt;
-   SetHandler example-handler
+&lt;Location /example-hooks-info&gt;
+   SetHandler example-hooks-handler
 &lt;/Location&gt;
 </highlight>
 
@@ -121,7 +121,7 @@
     correspondant :</p>
 
 <highlight language="config">
-   AddHandler example-handler .example
+   AddHandler example-hooks-handler .example
    </highlight>
 
     <p>Apr&egrave;s avoir recharg&eacute; la configuration ou red&eacute;marr&eacute; votre serveur,
@@ -141,9 +141,9 @@ Apache</description>
 <usage>
     <p>La directive <directive>Example</directive> n'a pour fonction que
     de d&eacute;finir un drapeau de d&eacute;monstration que le gestionnaire de
-    contenu du module example va afficher. Elle ne poss&egrave;de aucun
+    contenu du module example_hooks va afficher. Elle ne poss&egrave;de aucun
     argument. Si vous naviguez vers une URL &agrave; laquelle le gestionnaire
-    de contenu example s'applique, vous verrez s'afficher les routines
+    de contenu example_hooks s'applique, vous verrez s'afficher les routines
     du module, ainsi que l'ordre dans lequel elles ont &eacute;t&eacute; appel&eacute;es pour
     servir le document demand&eacute;. On peut observer l'effet de cette
     directive dans la phrase "<code>Example

diff --git a/docs/manual/mod/mod_example.xml.ko b/docs/manual/mod/mod_example_hooks.xml.ko
similarity index 81%
rename from docs/manual/mod/mod_example.xml.ko
rename to docs/manual/mod/mod_example_hooks.xml.ko
index e2927d9e0ac5b049019db57943a1014ef0ae8e6e..c00928d6424cbd87365dc46a22b89f2ab252d49d 100644 (file)
--- a/docs/manual/mod/mod_example.xml.ko
+++ b/docs/manual/mod/mod_example_hooks.xml.ko
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="EUC-KR" ?>
 <!DOCTYPE modulesynopsis SYSTEM "../style/modulesynopsis.dtd">
 <?xml-stylesheet type="text/xsl" href="../style/manual.ko.xsl"?>
-<!-- English Revision: 105989:1334016 (outdated) -->
+<!-- English Revision: 105989:1629244 (outdated) -->
 
 <!--
  Licensed to the Apache Software Foundation (ASF) under one or more
@@ -20,25 +20,25 @@
  limitations under the License.
 -->
 
-<modulesynopsis metafile="mod_example.xml.meta">
+<modulesynopsis metafile="mod_example_hooks.xml.meta">
 
-<name>mod_example</name>
+<name>mod_example_hooks</name>
 <description>¾ÆÆÄÄ¡ ¸ðµâ API¸¦ ¼³¸íÇÑ´Ù</description>
 <status>Experimental</status>
-<sourcefile>mod_example.c</sourcefile>
-<identifier>example_module</identifier>
+<sourcefile>mod_example_hooks.c</sourcefile>
+<identifier>example_hooks_module</identifier>
 
 <summary>
-    <p>¾ÆÆÄÄ¡ ¹èÆ÷º» <code>modules/experimental</code> µð·ºÅ丮¿¡
+    <p>¾ÆÆÄÄ¡ ¹èÆ÷º» <code>modules/examples</code> µð·ºÅ丮¿¡
     ÀÖ´Â ÆÄÀϵéÀº ¾ÆÆÄÄ¡ API¸¦ »ç¿ëÇÏ¿© ¸ðµâÀ» ÀÛ¼ºÇÏ·Á´Â »ç¶÷µéÀ»
     µ½±âÀ§ÇÑ ¿¹Á¦´Ù.</p>
 
-    <p><code>mod_example.c</code>´Â ¸ðµç Äݹé(callback) ±¸Á¶¿Í
+    <p><code>mod_example_hooks.c</code>´Â ¸ðµç Äݹé(callback) ±¸Á¶¿Í
     È£Ãâ ¹®¹ýÀ» ¼³¸íÇÏ´Â ÆÄÀÏÀÌ´Ù. ´ç½ÅÀº ¸ðµâ¿¡ ÀÌ ¸ðµç ÄݹéÀ»
     ±¸ÇöÇÒ ÇÊ¿ä°¡ ¾ø´Ù. »ç½Ç Á¤¹Ý´ë´Ù!</p>
 
     <p>example ¸ðµâÀº ½ÇÁ¦·Î µ¿ÀÛÇÏ´Â ¸ðµâÀÌ´Ù. ÀÌ ¸ðµâÀ» ¼­¹ö¿¡
-    ¿¬°áÇÏ°í ƯÁ¤ À§Ä¡¿¡ "example-handler" Çڵ鷯¸¦ ÇÒ´çÇÏ¿©
+    ¿¬°áÇÏ°í ƯÁ¤ À§Ä¡¿¡ "example-hooks-handler" Çڵ鷯¸¦ ÇÒ´çÇÏ¿©
     ±×°÷À» ºê¶ó¿ì¡Çϸé example ¸ðµâÀÇ ¿©·¯ ÄݹéÀ» È®ÀÎÇÒ ¼ö
     ÀÖ´Ù.</p>
 </summary>
@@ -49,7 +49,7 @@
 
     <ol>
       <li>
-        <code>--enable-example</code> ¿É¼Ç°ú ÇÔ²²
+        <code>--enable-example-hooks</code> ¿É¼Ç°ú ÇÔ²²
         <code>configure</code>¸¦ ½ÇÇàÇÑ´Ù.</li>
 
       <li>¼­¹ö¸¦ ÄÄÆÄÀÏÇÑ´Ù ("<code>make</code>"¸¦ ½ÇÇàÇÑ´Ù).</li>
@@ -58,7 +58,7 @@
     <p>ÀÚ½ÅÀÌ ¸¸µç ¸ðµâÀ» Ãß°¡ÇÏ·Á¸é:</p>
 
     <ol type="A">
-      <li><code>cp modules/experimental/mod_example.c
+      <li><code>cp modules/examples/mod_example_hooks.c
       modules/new_module/<em>mod_myexample.c</em></code></li>
 
       <li>ÆÄÀÏÀ» ¼öÁ¤ÇÑ´Ù.</li>
@@ -67,9 +67,9 @@
         <ol>
           <li><code>APACHE_MODPATH_INIT(new_module)</code>À»
             Ãß°¡ÇÑ´Ù.</li>
-          <li><code>modules/experimental/config.m4</code> ÆÄÀÏ¿¡¼­
-            "example"ÀÌ ÀÖ´Â APACHE_MODULE ÁÙÀ» º¹»çÇؿ´Ù.</li>
-          <li>ù¹ø° ¾Æ±Ô¸ÕÆ® "example"À» <em>myexample</em>·Î
+          <li><code>modules/examples/config.m4</code> ÆÄÀÏ¿¡¼­
+            "example_hooks"ÀÌ ÀÖ´Â APACHE_MODULE ÁÙÀ» º¹»çÇؿ´Ù.</li>
+          <li>ù¹ø° ¾Æ±Ô¸ÕÆ® "example_hooks"À» <em>myexample</em>·Î
             º¯°æÇÑ´Ù.</li>
           <li>µÎ¹ø° ¾Æ±Ô¸ÕÆ® ÀÚ¸®¿¡ ÀÚ½ÅÀÌ ¸¸µç ¸ðµâ¿¡ ´ëÇÑ
             °£´ÜÇÑ ¼³¸íÀ» Àû´Â´Ù. <code>configure --help</code>¸¦
@@ -94,13 +94,13 @@
     </ol>
 </section>
 
-<section id="using"><title><code>mod_example</code> ¸ðµâ »ç¿ëÇϱâ</title>
+<section id="using"><title><code>mod_example_hooks</code> ¸ðµâ »ç¿ëÇϱâ</title>
 
     <p>example ¸ðµâÀ» »ç¿ëÇÏ·Á¸é <code>httpd.conf</code> ÆÄÀÏ¿¡
     ´ÙÀ½°ú °°Àº ¼³Á¤À» Ãß°¡Ç϶ó:</p>
 <example>
-   &lt;Location /example-info&gt;<br />
-       SetHandler example-handler<br />
+   &lt;Location /example-hooks-info&gt;<br />
+       SetHandler example-hooks-handler<br />
    &lt;/Location&gt;
 </example>
 
@@ -109,7 +109,7 @@
     ÆÄÀÏ¿¡ ´ÙÀ½°ú °°Àº ³»¿ëÀ» Ãß°¡ÇÏ°í, ±× À§Ä¡¿¡¼­ "test.example"
     °°Àº ÆÄÀÏÀ» ¿äûÇ϶ó:</p>
 <example>
-   AddHandler example-handler .example
+   AddHandler example-hooks-handler .example
 </example>
 
     <p>¼­¹ö¸¦ Àç½ÃÀÛÇÑ ÈÄ ÀÌ À§Ä¡¸¦ ºê¶ó¿ì¡ÇÏ¸é ¾Õ¿¡¼­ ¸»ÇÑ

diff --git a/docs/manual/mod/mod_example.xml.meta b/docs/manual/mod/mod_example_hooks.xml.meta
similarity index 75%
rename from docs/manual/mod/mod_example.xml.meta
rename to docs/manual/mod/mod_example_hooks.xml.meta
index ddb2541c372ca645ef4b5ad7ae69ae5d4b23e2e0..cd07cfa4ad78e1ebd316c369c8078dc2f95dd501 100644 (file)
--- a/docs/manual/mod/mod_example.xml.meta
+++ b/docs/manual/mod/mod_example_hooks.xml.meta
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!-- GENERATED FROM XML: DO NOT EDIT -->
 
-<metafile reference="mod_example.xml">
-  <basename>mod_example</basename>
+<metafile reference="mod_example_hooks.xml">
+  <basename>mod_example_hooks</basename>
   <path>/mod/</path>
   <relpath>..</relpath>