Changes necessary to document MPMs.

In particular, we use an mpm_common file for directives shared between
mpms.  These changes allow for an

<directivesynopsis location="mpm_common">
<name>Listen</name>
</directivesynopsis>

to be included in mpm documentation files.  Also, I added the option
of a <modulelist>, which is used in documenting directives inside
mpm_common.

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

diff --git a/docs/manual/style/manual.xsl b/docs/manual/style/manual.xsl
index ee5220be80510092f087e3034ef080c10fe9490e..b131aad0a398997d649a24377037ceadff26b8de 100644 (file)
--- a/docs/manual/style/manual.xsl
+++ b/docs/manual/style/manual.xsl
@@ -85,14 +85,24 @@ XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
 
 <xsl:if test="directivesynopsis">
   <ul>
-     <xsl:for-each select="directivesynopsis/name">
+     <xsl:for-each select="directivesynopsis">
        <xsl:sort select="name"/>
        <xsl:variable name="name">
-         <xsl:value-of select="."/>
+         <xsl:value-of select="name"/>
        </xsl:variable>
        <xsl:variable name="lowername" 
          select="translate($name, $uppercase, $lowercase)" />
-       <li><a href="#{$lowername}"><xsl:value-of select="."/></a></li>
+       <xsl:if test="not(@location)">
+         <li><a href="#{$lowername}"><xsl:value-of select="name"/></a></li>
+       </xsl:if>
+       <xsl:if test="./@location">
+         <xsl:variable name="location">
+           <xsl:value-of select="./@location"/>
+         </xsl:variable>
+         <xsl:variable name="lowerlocation" 
+           select="translate($location, $uppercase, $lowercase)" />
+         <li><a href="{$lowerlocation}.html#{$lowername}"><xsl:value-of select="name"/></a></li>
+       </xsl:if>
      </xsl:for-each>
   </ul>
 </xsl:if>
@@ -165,6 +175,7 @@ XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
 
   <xsl:template match="directivesynopsis">
 
+  <xsl:if test="not(@location)">
   <xsl:variable name="name">
     <xsl:value-of select="./name"/>
   </xsl:variable>
@@ -200,7 +211,13 @@ XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
   <tr><td><a class="help" href="directive-dict.html#Status">Status:</a> </td>
     <td><xsl:value-of select="/modulesynopsis/status"/></td></tr>
   <tr><td><a class="help" href="directive-dict.html#Module">Module:</a> </td>
-    <td><xsl:value-of select="/modulesynopsis/name"/></td></tr>
+    <td>
+    <xsl:if test="modulelist"><xsl:apply-templates select="modulelist"/>
+      </xsl:if>
+    <xsl:if test="not(modulelist)">
+      <xsl:value-of select="/modulesynopsis/name"/>
+    </xsl:if>
+    </td></tr>
   <xsl:if test="compatibility">
     <tr><td><a class="help" href="directive-dict.html#Compatibility"
       >Compatibility:</a> </td>
@@ -221,6 +238,7 @@ XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
 </xsl:if>
 
 <hr />
+</xsl:if> <!-- not(@location) -->
 </xsl:template> <!-- /directivesynopsis -->
 
   <xsl:template match="contextlist">
@@ -232,6 +250,10 @@ XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
     <xsl:if test="not(position()=last())">, </xsl:if>
   </xsl:template>
 
+  <xsl:template match="modulelist">
+    <xsl:apply-templates select="module"/>
+  </xsl:template>
+
   <xsl:template match="example">
   <blockquote>
   <table cellpadding="10"><tr><td bgcolor="#eeeeee">
@@ -287,6 +309,9 @@ XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
     </xsl:variable>
     <a href="{$href}.html"><xsl:value-of select="."/></a>
     </code>
+    <xsl:if test="parent::modulelist">
+      <xsl:if test="not(position()=last())">, </xsl:if>
+    </xsl:if>
   </xsl:template>
 
   <!-- Process everything else by just passing it through -->