You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by mi...@apache.org on 2010/09/29 23:36:18 UTC
svn commit: r1002855 - in /httpd/httpd/trunk/docs: man/ manual/
manual/howto/ manual/mod/ manual/programs/
Author: minfrin
Date: Wed Sep 29 21:36:17 2010
New Revision: 1002855
URL: http://svn.apache.org/viewvc?rev=1002855&view=rev
Log:
Update transformations.
Modified:
httpd/httpd/trunk/docs/man/htcacheclean.8
httpd/httpd/trunk/docs/manual/bind.xml.meta
httpd/httpd/trunk/docs/manual/caching.xml.meta
httpd/httpd/trunk/docs/manual/howto/htaccess.xml.ja
httpd/httpd/trunk/docs/manual/howto/htaccess.xml.ko
httpd/httpd/trunk/docs/manual/howto/htaccess.xml.pt-br
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/mod_slotmem_shm.html.en
httpd/httpd/trunk/docs/manual/programs/htcacheclean.html.en
Modified: httpd/httpd/trunk/docs/man/htcacheclean.8
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/man/htcacheclean.8?rev=1002855&r1=1002854&r2=1002855&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/man/htcacheclean.8 (original)
+++ httpd/httpd/trunk/docs/man/htcacheclean.8 Wed Sep 29 21:36:17 2010
@@ -19,7 +19,7 @@
.el .ne 3
.IP "\\$1" \\$2
..
-.TH "HTCACHECLEAN" 8 "2010-03-29" "Apache HTTP Server" "htcacheclean"
+.TH "HTCACHECLEAN" 8 "2010-09-29" "Apache HTTP Server" "htcacheclean"
.SH NAME
htcacheclean \- Clean up the disk cache
@@ -27,13 +27,13 @@ htcacheclean \- Clean up the disk cache
.SH "SYNOPSIS"
.PP
-\fBhtcacheclean\fR [ -\fBD\fR ] [ -\fBv\fR ] [ -\fBt\fR ] [ -\fBr\fR ] [ -\fBn\fR ] -\fBp\fR\fIpath\fR -\fBl\fR\fIlimit\fR
+\fBhtcacheclean\fR [ -\fBD\fR ] [ -\fBv\fR ] [ -\fBt\fR ] [ -\fBr\fR ] [ -\fBn\fR ] [ -\fBR\fR\fIround\fR ] -\fBp\fR\fIpath\fR -\fBl\fR\fIlimit\fR
.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
+\fBhtcacheclean\fR [ -\fBn\fR ] [ -\fBt\fR ] [ -\fBi\fR ] [ -\fBP\fR\fIpidfile\fR ] [ -\fBR\fR\fIround\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
+\fBhtcacheclean\fR [ -\fBD\fR ] [ -\fBv\fR ] [ -\fBt\fR ] [ -\fBR\fR\fIround\fR ] -\fBp\fR\fIpath\fR \fIurl\fR
.SH "SUMMARY"
@@ -70,6 +70,9 @@ Specify \fIpath\fR as the root directory
-P\fIpidfile\fR
Specify \fIpidfile\fR as the name of the file to write the process ID to when daemonized\&.
.TP
+-R\fIround\fR
+Specify \fIround\fR as the amount to round sizes up to, to compensate for disk block sizes\&. Set to the block size of the cache partition\&.
+.TP
-l\fIlimit\fR
Specify \fIlimit\fR as the total disk cache size limit\&. The value is expressed in bytes by default (or attaching B to the number)\&. Attach K for Kbytes or M for MBytes\&.
.TP
Modified: httpd/httpd/trunk/docs/manual/bind.xml.meta
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/bind.xml.meta?rev=1002855&r1=1002854&r2=1002855&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/bind.xml.meta (original)
+++ httpd/httpd/trunk/docs/manual/bind.xml.meta Wed Sep 29 21:36:17 2010
@@ -12,6 +12,6 @@
<variant>fr</variant>
<variant outdated="yes">ja</variant>
<variant outdated="yes">ko</variant>
- <variant outdated="yes">tr</variant>
+ <variant>tr</variant>
</variants>
</metafile>
Modified: httpd/httpd/trunk/docs/manual/caching.xml.meta
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/caching.xml.meta?rev=1002855&r1=1002854&r2=1002855&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/caching.xml.meta (original)
+++ httpd/httpd/trunk/docs/manual/caching.xml.meta Wed Sep 29 21:36:17 2010
@@ -9,6 +9,6 @@
<variants>
<variant>en</variant>
<variant>fr</variant>
- <variant outdated="yes">tr</variant>
+ <variant>tr</variant>
</variants>
</metafile>
Modified: httpd/httpd/trunk/docs/manual/howto/htaccess.xml.ja
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/howto/htaccess.xml.ja?rev=1002855&r1=1002854&r2=1002855&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/howto/htaccess.xml.ja [utf-8] (original)
+++ httpd/httpd/trunk/docs/manual/howto/htaccess.xml.ja [utf-8] Wed Sep 29 21:36:17 2010
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE manualpage SYSTEM "../style/manualpage.dtd">
<?xml-stylesheet type="text/xsl" href="../style/manual.ja.xsl"?>
-<!-- English Revision: 574882:1002112 (outdated) -->
+<!-- English Revision: 574882:1002119 (outdated) -->
<!--
Licensed to the Apache Software Foundation (ASF) under one or more
Modified: httpd/httpd/trunk/docs/manual/howto/htaccess.xml.ko
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/howto/htaccess.xml.ko?rev=1002855&r1=1002854&r2=1002855&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/howto/htaccess.xml.ko [euc-kr] (original)
+++ httpd/httpd/trunk/docs/manual/howto/htaccess.xml.ko [euc-kr] Wed Sep 29 21:36:17 2010
@@ -1,7 +1,7 @@
<?xml version='1.0' encoding='EUC-KR' ?>
<!DOCTYPE manualpage SYSTEM "../style/manualpage.dtd">
<?xml-stylesheet type="text/xsl" href="../style/manual.ko.xsl"?>
-<!-- English Revision: 151408:1002112 (outdated) -->
+<!-- English Revision: 151408:1002119 (outdated) -->
<!--
Licensed to the Apache Software Foundation (ASF) under one or more
Modified: httpd/httpd/trunk/docs/manual/howto/htaccess.xml.pt-br
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/howto/htaccess.xml.pt-br?rev=1002855&r1=1002854&r2=1002855&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/howto/htaccess.xml.pt-br (original)
+++ httpd/httpd/trunk/docs/manual/howto/htaccess.xml.pt-br Wed Sep 29 21:36:17 2010
@@ -1,7 +1,7 @@
<?xml version='1.0' encoding='UTF-8' ?>
<!DOCTYPE manualpage SYSTEM "../style/manualpage.dtd">
<?xml-stylesheet type="text/xsl" href="../style/manual.pt-br.xsl"?>
-<!-- English Revision: 151408:1002112 (outdated) -->
+<!-- English Revision: 151408:1002119 (outdated) -->
<!--
Licensed to the Apache Software Foundation (ASF) under one or more
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=1002855&r1=1002854&r2=1002855&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/mod/core.xml.de (original)
+++ httpd/httpd/trunk/docs/manual/mod/core.xml.de Wed Sep 29 21:36:17 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:1001381 (outdated) -->
+<!-- English Revision: 167959:1002427 (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=1002855&r1=1002854&r2=1002855&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] Wed Sep 29 21:36:17 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:1001381 (outdated) -->
+<!-- English Revision: 669847:1002427 (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=1002855&r1=1002854&r2=1002855&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] Wed Sep 29 21:36:17 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:1001381 (outdated) -->
+<!-- English Revision: 813376:1002427 (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/mod_slotmem_shm.html.en
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/mod/mod_slotmem_shm.html.en?rev=1002855&r1=1002854&r2=1002855&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/mod/mod_slotmem_shm.html.en (original)
+++ httpd/httpd/trunk/docs/manual/mod/mod_slotmem_shm.html.en Wed Sep 29 21:36:17 2010
@@ -34,6 +34,13 @@
in which the datasets are organized in "slots."
</p>
+ <p>All shared memory is cleared and cleaned with each
+ restart, whether graceful or not. The data itself is
+ stored and restored within a file noted by the <code>name</code>
+ parameter in the <code>create</code> and <code>attach</code>
+ calls.
+ </p>
+
<p><code>mod_slotmem_shm</code> provides the following API functions:
</p>
@@ -42,10 +49,21 @@
<dd>call the callback on all worker slots</dd>
<dt>apr_status_t create(ap_slotmem_instance_t **new, const char *name, apr_size_t item_size, unsigned int item_num, ap_slotmem_type_t type, apr_pool_t *pool)</dt>
- <dd>create a new slotmem with each item size is item_size.</dd>
+ <dd>create a new slotmem with each item size is item_size. <code>name</code> is the filename for the persistent store of
+ the shared memory. Values are:
+ <dl>
+ <dt><code>"none"</code></dt>
+ <dd><code>Does not persist shared memory in file.</code></dd>
+ <dt><code>"anonymous"</code></dt>
+ <dd><code>$server_root/logs/anonymous.slotmem</code></dd>
+ <dt><code>":file-name"</code></dt>
+ <dd><code>$server_root/logs/file-name.slotmem</code></dd>
+ <dt><code>"absolute-file-name"</code></dt>
+ <dd><code>$absolute-file-name.slotmem</code></dd>
+ </dl></dd>
<dt>apr_status_t attach(ap_slotmem_instance_t **new, const char *name, apr_size_t *item_size, unsigned int *item_num, apr_pool_t *pool)</dt>
- <dd>attach to an existing slotmem.</dd>
+ <dd>attach to an existing slotmem. See <code>create</code> for description of <code>name</code> parameter.</dd>
<dt>apr_status_t dptr(ap_slotmem_instance_t *s, unsigned int item_id, void**mem)</dt>
<dd>get the direct pointer to the memory associated with this worker slot.</dd>
Modified: httpd/httpd/trunk/docs/manual/programs/htcacheclean.html.en
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/programs/htcacheclean.html.en?rev=1002855&r1=1002854&r2=1002855&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/programs/htcacheclean.html.en (original)
+++ httpd/httpd/trunk/docs/manual/programs/htcacheclean.html.en Wed Sep 29 21:36:17 2010
@@ -47,6 +47,7 @@
[ -<strong>t</strong> ]
[ -<strong>r</strong> ]
[ -<strong>n</strong> ]
+ [ -<strong>R</strong><var>round</var> ]
-<strong>p</strong><var>path</var>
-<strong>l</strong><var>limit</var></code></p>
@@ -55,6 +56,7 @@
[ -<strong>t</strong> ]
[ -<strong>i</strong> ]
[ -<strong>P</strong><var>pidfile</var> ]
+ [ -<strong>R</strong><var>round</var> ]
-<strong>d</strong><var>interval</var>
-<strong>p</strong><var>path</var>
-<strong>l</strong><var>limit</var></code></p>
@@ -63,6 +65,7 @@
[ -<strong>D</strong> ]
[ -<strong>v</strong> ]
[ -<strong>t</strong> ]
+ [ -<strong>R</strong><var>round</var> ]
-<strong>p</strong><var>path</var>
<var>url</var></code></p>
</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
@@ -111,6 +114,11 @@
<dd>Specify <var>pidfile</var> as the name of the file to write the
process ID to when daemonized.</dd>
+ <dt><code>-R<var>round</var></code></dt>
+ <dd>Specify <var>round</var> as the amount to round sizes up to, to
+ compensate for disk block sizes. Set to the block size of the cache
+ partition.</dd>
+
<dt><code>-l<var>limit</var></code></dt>
<dd>Specify <var>limit</var> as the total disk cache size limit. The value
is expressed in bytes by default (or attaching <code>B</code> to the