httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jchamp...@apache.org
Subject svn commit: r1793932 - in /httpd/httpd/trunk: ./ docs/ docs/manual/ docs/manual/mod/ docs/manual/style/ docs/manual/style/css/ docs/manual/style/xsl/
Date Thu, 04 May 2017 23:37:00 GMT
Author: jchampion
Date: Thu May  4 23:36:59 2017
New Revision: 1793932

URL: http://svn.apache.org/viewvc?rev=1793932&view=rev
Log:
merge in the override index

Added:
    httpd/httpd/trunk/docs/manual/mod/overrides.xml
      - copied unchanged from r1793931, httpd/httpd/branches/trunk-override-index/docs/manual/mod/overrides.xml
    httpd/httpd/trunk/docs/manual/style/xsl/overrideindex.xsl
      - copied unchanged from r1793931, httpd/httpd/branches/trunk-override-index/docs/manual/style/xsl/overrideindex.xsl
Modified:
    httpd/httpd/trunk/   (props changed)
    httpd/httpd/trunk/docs/   (props changed)
    httpd/httpd/trunk/docs/manual/index.xml
    httpd/httpd/trunk/docs/manual/mod/core.xml
    httpd/httpd/trunk/docs/manual/sitemap.xml
    httpd/httpd/trunk/docs/manual/style/css/manual.css
    httpd/httpd/trunk/docs/manual/style/modulesynopsis.dtd
    httpd/httpd/trunk/docs/manual/style/xsl/common.xsl

Propchange: httpd/httpd/trunk/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu May  4 23:36:59 2017
@@ -1,5 +1,6 @@
 /httpd/httpd/branches/revert-ap-ldap:1150158-1150173
 /httpd/httpd/branches/trunk-buildconf-noapr:1780253-1780970
 /httpd/httpd/branches/trunk-openssl-threadid:1791053-1791848
+/httpd/httpd/branches/trunk-override-index:1793921-1793931
 /httpd/httpd/branches/trunk-test-integration:1777251-1782067
 /httpd/httpd/branches/wombat-integration:723609-723841

Propchange: httpd/httpd/trunk/docs/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu May  4 23:36:59 2017
@@ -1,5 +1,6 @@
 /httpd/httpd/branches/2.4.x/docs:1537109
 /httpd/httpd/branches/revert-ap-ldap/docs:1150158-1150173
 /httpd/httpd/branches/trunk-openssl-threadid/docs:1791053-1791848
+/httpd/httpd/branches/trunk-override-index/docs:1793921-1793931
 /httpd/httpd/branches/trunk-test-integration/docs:1777251-1782067
 /httpd/httpd/branches/wombat-integration/docs:723609-723841

Modified: httpd/httpd/trunk/docs/manual/index.xml
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/index.xml?rev=1793932&r1=1793931&r2=1793932&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/index.xml (original)
+++ httpd/httpd/trunk/docs/manual/index.xml Thu May  4 23:36:59 2017
@@ -44,6 +44,7 @@ Documentation</title>
     <page href="filter.html">Filters</page>
     <page href="handler.html">Handlers</page>
     <page href="expr.html">Expression parser</page>
+    <page href="mod/overrides.html">Override Class Index for .htaccess</page>
     <page href="programs/">Server and Supporting Programs</page>
     <page href="glossary.html">Glossary</page>
 </category>

Modified: httpd/httpd/trunk/docs/manual/mod/core.xml
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/mod/core.xml?rev=1793932&r1=1793931&r2=1793932&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/mod/core.xml (original)
+++ httpd/httpd/trunk/docs/manual/mod/core.xml Thu May  4 23:36:59 2017
@@ -345,10 +345,12 @@ NoDecode option available in 2.3.12 and
     <code>.htaccess</code> files.</p>
 
     <p>The <var>directive-type</var> can be one of the following
-    groupings of directives.</p>
+    groupings of directives. (See the <a href="overrides.html">override class
+    index</a> for an up-to-date listing of which directives are enabled by each
+    <var>directive-type</var>.)</p>
 
     <dl>
-      <dt>AuthConfig</dt>
+      <dt><a href="overrides.html#override-authconfig">AuthConfig</a></dt>
 
       <dd>
 
@@ -361,7 +363,7 @@ NoDecode option available in 2.3.12 and
       module="mod_authn_file">AuthUserFile</directive>, <directive
       module="mod_authz_core">Require</directive>, <em>etc.</em>).</dd>
 
-      <dt>FileInfo</dt>
+      <dt><a href="overrides.html#override-fileinfo">FileInfo</a></dt>
 
       <dd>
       Allow use of the directives controlling document types
@@ -398,7 +400,7 @@ NoDecode option available in 2.3.12 and
       <module>mod_actions</module>.
       </dd>
 
-      <dt>Indexes</dt>
+      <dt><a href="overrides.html#override-indexes">Indexes</a></dt>
 
       <dd>
       Allow use of the directives controlling directory indexing
@@ -417,7 +419,7 @@ NoDecode option available in 2.3.12 and
       module="mod_autoindex">ReadmeName</directive>,
       <em>etc.</em>).</dd>
 
-      <dt>Limit</dt>
+      <dt><a href="overrides.html#override-limit">Limit</a></dt>
 
       <dd>
       Allow use of the directives controlling host access (<directive
@@ -453,7 +455,7 @@ NoDecode option available in 2.3.12 and
       </note>
       </dd>
 
-      <dt>Options[=<var>Option</var>,...]</dt>
+      <dt><a href="overrides.html#override-options">Options</a>[=<var>Option</var>,...]</dt>
 
       <dd>
       Allow use of the directives controlling specific directory
@@ -500,6 +502,7 @@ AllowOverride AuthConfig Indexes
 <seealso><directive module="core">AllowOverrideList</directive></seealso>
 <seealso><a href="../configuring.html">Configuration Files</a></seealso>
 <seealso><a href="../howto/htaccess.html">.htaccess Files</a></seealso>
+<seealso><a href="overrides.html">Override Class Index for .htaccess</a></seealso>
 </directivesynopsis>
 
 <directivesynopsis>

Modified: httpd/httpd/trunk/docs/manual/sitemap.xml
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/sitemap.xml?rev=1793932&r1=1793931&r2=1793932&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/sitemap.xml (original)
+++ httpd/httpd/trunk/docs/manual/sitemap.xml Thu May  4 23:36:59 2017
@@ -193,6 +193,7 @@ log_server_status</page>
 <page href="mod/">Module index</page>
 <page href="mod/directives.html">Directive index</page>
 <page href="mod/quickreference.html">Directive Quick-Reference</page>
+<page href="mod/overrides.html">Override class index for .htaccess</page>
 </category>
 
 </sitemap>

Modified: httpd/httpd/trunk/docs/manual/style/css/manual.css
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/style/css/manual.css?rev=1793932&r1=1793931&r2=1793932&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/style/css/manual.css (original)
+++ httpd/httpd/trunk/docs/manual/style/css/manual.css Thu May  4 23:36:59 2017
@@ -611,6 +611,12 @@ div#directive-list ul {
     padding: 0;
 }
 
+/* override index */
+/* ============== */
+div#override-list td.module {
+    width: 20%;
+}
+
 /* indextable */
 /* ========== */
 table#indextable td ul {

Modified: httpd/httpd/trunk/docs/manual/style/modulesynopsis.dtd
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/style/modulesynopsis.dtd?rev=1793932&r1=1793931&r2=1793932&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/style/modulesynopsis.dtd (original)
+++ httpd/httpd/trunk/docs/manual/style/modulesynopsis.dtd Thu May  4 23:36:59 2017
@@ -75,3 +75,11 @@ usage?, seealso*)>
 <!ATTLIST quickreference metafile CDATA  #REQUIRED>
 
 <!ELEMENT legend (table, table)>
+
+<!-- Used in overrides.xml -->
+<!ELEMENT overrideindex (title | summary | overridesummary)+>
+<!ATTLIST overrideindex metafile CDATA #REQUIRED>
+
+<!ELEMENT overridesummary %Block;>
+<!ATTLIST overridesummary class    CDATA #IMPLIED
+                          fallback CDATA #IMPLIED>

Modified: httpd/httpd/trunk/docs/manual/style/xsl/common.xsl
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/style/xsl/common.xsl?rev=1793932&r1=1793931&r2=1793932&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/style/xsl/common.xsl (original)
+++ httpd/httpd/trunk/docs/manual/style/xsl/common.xsl Thu May  4 23:36:59 2017
@@ -64,6 +64,7 @@
 <xsl:include href="indexpage.xsl" />
 <xsl:include href="quickreference.xsl" />
 <xsl:include href="faq.xsl" />
+<xsl:include href="overrideindex.xsl" />
 
 <!-- load utility snippets -->
 <xsl:include href="util/modtrans.xsl" />



Mime
View raw message