httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From minf...@apache.org
Subject svn commit: r928922 [1/3] - in /httpd/httpd/trunk/docs: man/ manual/ manual/mod/ manual/programs/
Date Mon, 29 Mar 2010 22:32:37 GMT
Author: minfrin
Date: Mon Mar 29 22:32:37 2010
New Revision: 928922

URL: http://svn.apache.org/viewvc?rev=928922&view=rev
Log:
Update transformations.

Modified:
    httpd/httpd/trunk/docs/man/htcacheclean.8
    httpd/httpd/trunk/docs/manual/install.xml.meta
    httpd/httpd/trunk/docs/manual/mod/core.html.en
    httpd/httpd/trunk/docs/manual/mod/core.xml.de
    httpd/httpd/trunk/docs/manual/mod/core.xml.ja
    httpd/httpd/trunk/docs/manual/mod/core.xml.tr
    httpd/httpd/trunk/docs/manual/mod/directives.html.en
    httpd/httpd/trunk/docs/manual/mod/quickreference.html.en
    httpd/httpd/trunk/docs/manual/programs/htcacheclean.html.en
    httpd/httpd/trunk/docs/manual/programs/htcacheclean.xml.ko
    httpd/httpd/trunk/docs/manual/programs/htcacheclean.xml.tr
    httpd/httpd/trunk/docs/manual/sections.html.en
    httpd/httpd/trunk/docs/manual/sections.xml.ja
    httpd/httpd/trunk/docs/manual/sections.xml.ko
    httpd/httpd/trunk/docs/manual/sections.xml.meta
    httpd/httpd/trunk/docs/manual/sections.xml.tr

Modified: httpd/httpd/trunk/docs/man/htcacheclean.8
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/man/htcacheclean.8?rev=928922&r1=928921&r2=928922&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/man/htcacheclean.8 (original)
+++ httpd/httpd/trunk/docs/man/htcacheclean.8 Mon Mar 29 22:32:37 2010
@@ -19,7 +19,7 @@
 .el .ne 3
 .IP "\\$1" \\$2
 ..
-.TH "HTCACHECLEAN" 8 "2010-02-16" "Apache HTTP Server" "htcacheclean"
+.TH "HTCACHECLEAN" 8 "2010-03-29" "Apache HTTP Server" "htcacheclean"
 
 .SH NAME
 htcacheclean \- Clean up the disk cache
@@ -32,11 +32,14 @@ htcacheclean \- Clean up the disk cache
 .PP
 \fBhtcacheclean\fR [ -\fBn\fR ] [ -\fBt\fR ] [ -\fBi\fR ] [ -\fBP\fR\fIpidfile\fR ] -\fBd\fR\fIinterval\fR
-\fBp\fR\fIpath\fR -\fBl\fR\fIlimit\fR
  
+.PP
+\fBhtcacheclean\fR [ -\fBD\fR ] [ -\fBv\fR ] [ -\fBt\fR ] -\fBp\fR\fIpath\fR \fIurl\fR
+ 
 
 .SH "SUMMARY"
  
 .PP
-htcacheclean is used to keep the size of mod_disk_cache's storage within a certain limit\&.
This tool can run either manually or in daemon mode\&. When running in daemon mode, it
sleeps in the background and checks the cache directories at regular intervals for cached
content to be removed\&. You can stop the daemon cleanly by sending it a TERM or INT signal\&.
+htcacheclean is used to keep the size of mod_disk_cache's storage within a certain limit\&.
This tool can run either manually or in daemon mode\&. When running in daemon mode, it
sleeps in the background and checks the cache directory at regular intervals for cached content
to be removed\&. You can stop the daemon cleanly by sending it a TERM or INT signal\&.
When run manually, a once off check of the cache directory is made for cached content to be
removed\&. If one or more URLs are specified, each URL will be deleted from the cache,
if present\&.
  
 
 .SH "OPTIONS"
@@ -73,8 +76,16 @@ Specify \fIlimit\fR as the total disk ca
 -i
 Be intelligent and run only when there was a modification of the disk cache\&. This option
is only possible together with the -d option\&.  
  
+.SH "DELETING A SPECIFIC URL"
+ 
+.PP
+If htcacheclean is passed one or more URLs, each URL will be deleted from the cache\&.
If multiple variants of an URL exists, all variants would be deleted\&.
+ 
+.PP
+When a reverse proxied URL is to be deleted, the effective URL is constructed from the \fBHost\fR
header, the \fBport\fR, the \fBpath\fR and the \fBquery\fR\&. Note the '?' in the URL
must always be specified explicitly, whether a query string is present or not\&. For example,
an attempt to delete the path \fB/\fR from the server \fBlocalhost\fR, the URL to delete would
be \fBhttp://localhost:80/?\fR\&.
+ 
 .SH "EXIT STATUS"
  
 .PP
-htcacheclean returns a zero status ("true") if all operations were successful, 1 otherwise\&.
+htcacheclean returns a zero status ("true") if all operations were successful, 1 otherwise\&.
If an URL is specified, and the URL was cached and successfully removed, 0 is returned, 2
otherwise\&. If an error occurred during URL removal, 1 is returned\&.
  

Modified: httpd/httpd/trunk/docs/manual/install.xml.meta
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/install.xml.meta?rev=928922&r1=928921&r2=928922&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/install.xml.meta (original)
+++ httpd/httpd/trunk/docs/manual/install.xml.meta Mon Mar 29 22:32:37 2010
@@ -10,7 +10,7 @@
     <variant outdated="yes">de</variant>
     <variant>en</variant>
     <variant outdated="yes">es</variant>
-    <variant outdated="yes">fr</variant>
+    <variant>fr</variant>
     <variant outdated="yes">ja</variant>
     <variant outdated="yes">ko</variant>
     <variant outdated="yes">tr</variant>

Modified: httpd/httpd/trunk/docs/manual/mod/core.html.en
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/mod/core.html.en?rev=928922&r1=928921&r2=928922&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/mod/core.html.en (original)
+++ httpd/httpd/trunk/docs/manual/mod/core.html.en Mon Mar 29 22:32:37 2010
@@ -61,6 +61,7 @@ available</td></tr>
 <li><img alt="" src="../images/down.gif" /> <a href="#ifdefine">&lt;IfDefine&gt;</a></li>
 <li><img alt="" src="../images/down.gif" /> <a href="#ifmodule">&lt;IfModule&gt;</a></li>
 <li><img alt="" src="../images/down.gif" /> <a href="#include">Include</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#includestrict">IncludeStrict</a></li>
 <li><img alt="" src="../images/down.gif" /> <a href="#keepalive">KeepAlive</a></li>
 <li><img alt="" src="../images/down.gif" /> <a href="#keepalivetimeout">KeepAliveTimeout</a></li>
 <li><img alt="" src="../images/down.gif" /> <a href="#limit">&lt;Limit&gt;</a></li>
@@ -1573,7 +1574,8 @@ later.</td></tr>
 <table class="directive">
 <tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Includes
other configuration files from within
 the server configuration files</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>Include
<var>file-path</var>|<var>directory-path</var></code></td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>Include
<var>file-path</var>|<var>directory-path</var>|
+<var>wildcard</var></code></td></tr>
 <tr><th><a href="directive-dict.html#Context">Context:</a></th><td>server
config, virtual host, directory</td></tr>
 <tr><th><a href="directive-dict.html#Status">Status:</a></th><td>Core</td></tr>
 <tr><th><a href="directive-dict.html#Module">Module:</a></th><td>core</td></tr>
@@ -1604,6 +1606,11 @@ wildcard matching available in 2.3.6 and
     for placeholder files to exist so that at least one file or directory is
     found by the wildcard.</p>
 
+    <p>Under certain circumstances, it may be required for the server to fail
+    explicitly when no files or directories match a specific wildcard. In these
+    cases, use the <code class="directive"><a href="../mod/code.html#includestrict">IncludeStrict</a></code>
+    directive instead.</p>
+
     <p>The file path specified may be an absolute path, or may be relative 
     to the <code class="directive"><a href="#serverroot">ServerRoot</a></code>
directory.</p>
 
@@ -1636,6 +1643,48 @@ wildcard matching available in 2.3.6 and
 </ul>
 </div>
 <div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif"
/></a></div>
+<div class="directive-section"><h2><a name="IncludeStrict" id="IncludeStrict">IncludeStrict</a>
<a name="includestrict" id="includestrict">Directive</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Includes
other configuration files from within the server
+configuration files, throwing an error if no files or directories match
+a wildcard
+</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>IncludeStrict
<var>file-path</var>|<var>directory-path</var>|
+<var>wildcard</var></code></td></tr>
+<tr><th><a href="directive-dict.html#Context">Context:</a></th><td>server
config, virtual host, directory</td></tr>
+<tr><th><a href="directive-dict.html#Status">Status:</a></th><td>Core</td></tr>
+<tr><th><a href="directive-dict.html#Module">Module:</a></th><td>core</td></tr>
+<tr><th><a href="directive-dict.html#Compatibility">Compatibility:</a></th><td>Available
in 2.3.6 and later</td></tr>
+</table>
+      <p>This directive allows inclusion of other configuration files
+      from within the server configuration files.</p>
+
+      <p>It is functionally equivalent to the
+      <code class="directive"><a href="#include">Include</a></code>
directive, with the additional
+      restriction that any wildcards are required to match at least one file or
+      directory.</p>
+
+      <p>The file path specified may be an absolute path, or may be relative 
+      to the <code class="directive"><a href="#serverroot">ServerRoot</a></code>
directory.</p>
+
+      <p>Example:</p>
+
+      <p>The server will fail to load if the wildcard path
+      <var>/usr/local/apache2/conf/vhosts/*.conf</var> does not match at least
+      one file or directory.</p>
+
+      <div class="example"><p><code>
+        IncludeStrict /usr/local/apache2/conf/ssl.conf<br />
+        IncludeStrict /usr/local/apache2/conf/vhosts/*.conf
+      </code></p></div>
+
+
+<h3>See also</h3>
+<ul>
+<li><code class="program"><a href="../programs/apachectl.html">apachectl</a></code></li>
+</ul>
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif"
/></a></div>
 <div class="directive-section"><h2><a name="KeepAlive" id="KeepAlive">KeepAlive</a>
<a name="keepalive" id="keepalive">Directive</a></h2>
 <table class="directive">
 <tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Enables
HTTP persistent connections</td></tr>

Modified: httpd/httpd/trunk/docs/manual/mod/core.xml.de
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/mod/core.xml.de?rev=928922&r1=928921&r2=928922&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/mod/core.xml.de (original)
+++ httpd/httpd/trunk/docs/manual/mod/core.xml.de Mon Mar 29 22:32:37 2010
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <!DOCTYPE modulesynopsis SYSTEM "../style/modulesynopsis.dtd">
 <?xml-stylesheet type="text/xsl" href="../style/manual.de.xsl"?>
-<!-- English Revision: 167959:926419 (outdated) -->
+<!-- English Revision: 167959:928916 (outdated) -->
 
 <!--
  Licensed to the Apache Software Foundation (ASF) under one or more

Modified: httpd/httpd/trunk/docs/manual/mod/core.xml.ja
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/mod/core.xml.ja?rev=928922&r1=928921&r2=928922&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/mod/core.xml.ja [utf-8] (original)
+++ httpd/httpd/trunk/docs/manual/mod/core.xml.ja [utf-8] Mon Mar 29 22:32:37 2010
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE modulesynopsis SYSTEM "../style/modulesynopsis.dtd">
 <?xml-stylesheet type="text/xsl" href="../style/manual.ja.xsl"?>
-<!-- English Revision: 669847:926419 (outdated) -->
+<!-- English Revision: 669847:928916 (outdated) -->
 
 <!--
  Licensed to the Apache Software Foundation (ASF) under one or more

Modified: httpd/httpd/trunk/docs/manual/mod/core.xml.tr
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/mod/core.xml.tr?rev=928922&r1=928921&r2=928922&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/mod/core.xml.tr [utf-8] (original)
+++ httpd/httpd/trunk/docs/manual/mod/core.xml.tr [utf-8] Mon Mar 29 22:32:37 2010
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <!DOCTYPE modulesynopsis SYSTEM "../style/modulesynopsis.dtd">
 <?xml-stylesheet type="text/xsl" href="../style/manual.tr.xsl"?>
-<!-- English Revision: 813376:926419 (outdated) -->
+<!-- English Revision: 813376:928916 (outdated) -->
 <!-- =====================================================
  Translated by: Nilgün Belma Bugüner <nilgun belgeler.org>
    Reviewed by: Orhan Berent <berent belgeler.org>

Modified: httpd/httpd/trunk/docs/manual/mod/directives.html.en
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/mod/directives.html.en?rev=928922&r1=928921&r2=928922&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/mod/directives.html.en (original)
+++ httpd/httpd/trunk/docs/manual/mod/directives.html.en Mon Mar 29 22:32:37 2010
@@ -249,6 +249,7 @@
 <li><a href="mod_imagemap.html#imapdefault">ImapDefault</a></li>
 <li><a href="mod_imagemap.html#imapmenu">ImapMenu</a></li>
 <li><a href="core.html#include">Include</a></li>
+<li><a href="core.html#includestrict">IncludeStrict</a></li>
 <li><a href="mod_autoindex.html#indexheadinsert">IndexHeadInsert</a></li>
 <li><a href="mod_autoindex.html#indexignore">IndexIgnore</a></li>
 <li><a href="mod_autoindex.html#indexoptions">IndexOptions</a></li>



Mime
View raw message