Skip to content

Commit 360ec0d

Browse files
committed
Update transformations.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1194876 13f79535-47bb-0310-9956-ffa450edef68
1 parent e06f408 commit 360ec0d

12 files changed

Lines changed: 66 additions & 42 deletions

docs/man/rotatelogs.8

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,15 +19,15 @@
1919
.el .ne 3
2020
.IP "\\$1" \\$2
2121
..
22-
.TH "ROTATELOGS" 8 "2011-07-02" "Apache HTTP Server" "rotatelogs"
22+
.TH "ROTATELOGS" 8 "2011-10-28" "Apache HTTP Server" "rotatelogs"
2323

2424
.SH NAME
2525
rotatelogs \- Piped logging program to rotate Apache logs
2626

2727
.SH "SYNOPSIS"
2828

2929
.PP
30-
\fBrotatelogs\fR [ -\fBl\fR ] [ -\fBL\fR \fIlinkname\fR ] [ -\fBp\fR \fIprogram\fR ] [ -\fBf\fR ] [ -\fBv\fR ] [ -\fBe\fR ] \fIlogfile\fR \fIrotationtime\fR|\fIfilesize\fR(B|K|M|G) [ \fIoffset\fR ]
30+
\fBrotatelogs\fR [ -\fBl\fR ] [ -\fBL\fR \fIlinkname\fR ] [ -\fBp\fR \fIprogram\fR ] [ -\fBf\fR ] [ -\fBv\fR ] [ -\fBe\fR ] [ -\fBc\fR ] \fIlogfile\fR \fIrotationtime\fR|\fIfilesize\fR(B|K|M|G) [ \fIoffset\fR ]
3131

3232

3333
.SH "SUMMARY"
@@ -61,6 +61,9 @@ Produce verbose output on STDERR\&. The output contains the result of the config
6161
-e
6262
Echo logs through to stdout\&. Useful when logs need to be further processed in real time by a further tool in the chain\&.
6363
.TP
64+
-c
65+
Create log file for each interval, even if empty\&.
66+
.TP
6467
\fIlogfile\fR
6568
.PP The path plus basename of the logfile\&. If \fIlogfile\fR includes any '%' characters, it is treated as a format string for strftime(3)\&. Otherwise, the suffix \fI\&.nnnnnnnnnn\fR is automatically added and is the time in seconds (unless the -t option is used)\&. Both formats compute the start time from the beginning of the current period\&. For example, if a rotation time of 86400 is specified, the hour, minute, and second fields created from the strftime(3) format will all be zero, referring to the beginning of the current 24-hour period (midnight)\&. .PP When using strftime(3) filename formatting, be sure the log file format has enough granularity to produce a different file name each time the logs are rotated\&. Otherwise rotation will overwrite the same file instead of starting a new one\&. For example, if \fIlogfile\fR was /var/logs/errorlog\&.%Y-%m-%d with log rotation at 5 megabytes, but 5 megabytes was reached twice in the same day, the same log file name would be produced and log rotation would keep writing to the same file\&.
6669
.TP

docs/manual/filter.html.en

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
<div class="section">
3838
<h2><a name="intro" id="intro">Filtering in Apache 2</a></h2>
3939

40-
<table class="related"><tr><th>Related Modules</th><th>Related Directives</th></tr><tr><td><ul><li><code class="module"><a href="./mod/mod_filter.html">mod_filter</a></code></li><li><code class="module"><a href="./mod/mod_deflate.html">mod_deflate</a></code></li><li><code class="module"><a href="./mod/mod_ext_filter.html">mod_ext_filter</a></code></li><li><code class="module"><a href="./mod/mod_include.html">mod_include</a></code></li><li><code class="module"><a href="./mod/mod_charset_lite.html">mod_charset_lite</a></code></li><li><code class="module"><a href="./mod/mod_reflector.html">mod_reflector</a></code></li><li><code class="module"><a href="./mod/mod_buffer.html">mod_buffer</a></code></li><li><code class="module"><a href="./mod/mod_data.html">mod_data</a></code></li><li><code class="module"><a href="./mod/mod_ratelimit.html">mod_ratelimit</a></code></li><li><code class="module"><a href="./mod/mod_reqtimeout.html">mod_reqtimeout</a></code></li><li><code class="module"><a href="./mod/mod_request.html">mod_request</a></code></li><li><code class="module"><a href="./mod/mod_sed.html">mod_sed</a></code></li><li><code class="module"><a href="./mod/mod_substitute.html">mod_substitute</a></code></li></ul></td><td><ul><li><code class="directive"><a href="./mod/mod_filter.html#filterchain">FilterChain</a></code></li><li><code class="directive"><a href="./mod/mod_filter.html#filterdeclare">FilterDeclare</a></code></li><li><code class="directive"><a href="./mod/mod_filter.html#filterprotocol">FilterProtocol</a></code></li><li><code class="directive"><a href="./mod/mod_filter.html#filterprovider">FilterProvider</a></code></li><li><code class="directive"><a href="./mod/mod_mime.html#addinputfilter">AddInputFilter</a></code></li><li><code class="directive"><a href="./mod/mod_mime.html#addoutputfilter">AddOutputFilter</a></code></li><li><code class="directive"><a href="./mod/mod_mime.html#removeinputfilter">RemoveInputFilter</a></code></li><li><code class="directive"><a href="./mod/mod_mime.html#removeoutputfilter">RemoveOutputFilter</a></code></li><li><code class="directive"><a href="./mod/mod_reflector.html#reflectorheader">ReflectorHeader</a></code></li><li><code class="directive"><a href="./mod/mod_ext_filter.html#extfilterdefine">ExtFilterDefine</a></code></li><li><code class="directive"><a href="./mod/mod_ext_filter.html#extfilteroptions">ExtFilterOptions</a></code></li><li><code class="directive"><a href="./mod/core.html#setinputfilter">SetInputFilter</a></code></li><li><code class="directive"><a href="./mod/core.html#setoutputfilter">SetOutputFilter</a></code></li></ul></td></tr></table>
40+
<table class="related"><tr><th>Related Modules</th><th>Related Directives</th></tr><tr><td><ul><li><code class="module"><a href="./mod/mod_filter.html">mod_filter</a></code></li><li><code class="module"><a href="./mod/mod_deflate.html">mod_deflate</a></code></li><li><code class="module"><a href="./mod/mod_ext_filter.html">mod_ext_filter</a></code></li><li><code class="module"><a href="./mod/mod_include.html">mod_include</a></code></li><li><code class="module"><a href="./mod/mod_charset_lite.html">mod_charset_lite</a></code></li><li><code class="module"><a href="./mod/mod_reflector.html">mod_reflector</a></code></li><li><code class="module"><a href="./mod/mod_buffer.html">mod_buffer</a></code></li><li><code class="module"><a href="./mod/mod_data.html">mod_data</a></code></li><li><code class="module"><a href="./mod/mod_ratelimit.html">mod_ratelimit</a></code></li><li><code class="module"><a href="./mod/mod_reqtimeout.html">mod_reqtimeout</a></code></li><li><code class="module"><a href="./mod/mod_request.html">mod_request</a></code></li><li><code class="module"><a href="./mod/mod_sed.html">mod_sed</a></code></li><li><code class="module"><a href="./mod/mod_substitute.html">mod_substitute</a></code></li><li><code class="module"><a href="./mod/mod_xml2enc.html">mod_xml2enc</a></code></li><li><code class="module"><a href="./mod/mod_proxy_html.html">mod_proxy_html</a></code></li></ul></td><td><ul><li><code class="directive"><a href="./mod/mod_filter.html#filterchain">FilterChain</a></code></li><li><code class="directive"><a href="./mod/mod_filter.html#filterdeclare">FilterDeclare</a></code></li><li><code class="directive"><a href="./mod/mod_filter.html#filterprotocol">FilterProtocol</a></code></li><li><code class="directive"><a href="./mod/mod_filter.html#filterprovider">FilterProvider</a></code></li><li><code class="directive"><a href="./mod/mod_mime.html#addinputfilter">AddInputFilter</a></code></li><li><code class="directive"><a href="./mod/mod_mime.html#addoutputfilter">AddOutputFilter</a></code></li><li><code class="directive"><a href="./mod/mod_mime.html#removeinputfilter">RemoveInputFilter</a></code></li><li><code class="directive"><a href="./mod/mod_mime.html#removeoutputfilter">RemoveOutputFilter</a></code></li><li><code class="directive"><a href="./mod/mod_reflector.html#reflectorheader">ReflectorHeader</a></code></li><li><code class="directive"><a href="./mod/mod_ext_filter.html#extfilterdefine">ExtFilterDefine</a></code></li><li><code class="directive"><a href="./mod/mod_ext_filter.html#extfilteroptions">ExtFilterOptions</a></code></li><li><code class="directive"><a href="./mod/core.html#setinputfilter">SetInputFilter</a></code></li><li><code class="directive"><a href="./mod/core.html#setoutputfilter">SetOutputFilter</a></code></li></ul></td></tr></table>
4141

4242
<p>The Filter Chain is available in Apache 2.0 and higher,
4343
and enables applications to process incoming and outgoing data

docs/manual/filter.xml.es

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="UTF-8" ?>
22
<!DOCTYPE manualpage SYSTEM "./style/manualpage.dtd">
33
<?xml-stylesheet type="text/xsl" href="./style/manual.es.xsl"?>
4-
<!-- English Revision: 151408:1174747 (outdated) -->
4+
<!-- English Revision: 151408:1189549 (outdated) -->
55

66
<!--
77
Licensed to the Apache Software Foundation (ASF) under one or more

docs/manual/filter.xml.ja

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="UTF-8" ?>
22
<!DOCTYPE manualpage SYSTEM "./style/manualpage.dtd">
33
<?xml-stylesheet type="text/xsl" href="./style/manual.ja.xsl"?>
4-
<!-- English Revision: 151408:1174747 (outdated) -->
4+
<!-- English Revision: 151408:1189549 (outdated) -->
55

66
<!--
77
Licensed to the Apache Software Foundation (ASF) under one or more

docs/manual/filter.xml.ko

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="EUC-KR" ?>
22
<!DOCTYPE manualpage SYSTEM "./style/manualpage.dtd">
33
<?xml-stylesheet type="text/xsl" href="./style/manual.ko.xsl"?>
4-
<!-- English Revision: 151408:1174747 (outdated) -->
4+
<!-- English Revision: 151408:1189549 (outdated) -->
55

66
<!--
77
Licensed to the Apache Software Foundation (ASF) under one or more

docs/manual/filter.xml.tr

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="UTF-8" ?>
22
<!DOCTYPE manualpage SYSTEM "./style/manualpage.dtd">
33
<?xml-stylesheet type="text/xsl" href="./style/manual.tr.xsl"?>
4-
<!-- English Revision: 659902:1174747 (outdated) -->
4+
<!-- English Revision: 659902:1189549 (outdated) -->
55
<!-- =====================================================
66
Translated by: Nilgün Belma Bugüner <nilgun belgeler.org>
77
Reviewed by: Orhan Berent <berent belgeler.org>

docs/manual/mod/mod_include.html.en

Lines changed: 40 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -207,13 +207,15 @@
207207
is <code>none</code>, where no decoding will be done. If set to
208208
<code>url</code>, then URL decoding (also known as %-encoding;
209209
this is appropriate for use within URLs in links, etc.) will be
210-
performed. If set to <code>base64</code>, base64 will be decoded,
211-
and if set to <code>entity</code>, HTML entity encoding will be
212-
stripped. Decoding is done prior to any further encoding on the
213-
variable. Multiple encodings can be stripped by specifying more
214-
than one comma separated encoding. The decoding setting will
215-
remain in effect until the next decoding attribute is encountered,
216-
or the element ends.</p>
210+
performed. If set to <code>urlencoded</code>,
211+
application/x-www-form-urlencoded compatible encoding (found in
212+
query strings) will be stripped. If set to <code>base64</code>,
213+
base64 will be decoded, and if set to <code>entity</code>, HTML
214+
entity encoding will be stripped. Decoding is done prior to any
215+
further encoding on the variable. Multiple encodings can be
216+
stripped by specifying more than one comma separated encoding.
217+
The decoding setting will remain in effect until the next decoding
218+
attribute is encountered, or the element ends.</p>
217219

218220
<p>The <code>decoding</code> attribute must <em>precede</em> the
219221
corresponding <code>var</code> attribute to be effective.</p>
@@ -225,14 +227,17 @@
225227
to <code>none</code>, no encoding will be done. If set to
226228
<code>url</code>, then URL encoding (also known as %-encoding;
227229
this is appropriate for use within URLs in links, etc.) will be
228-
performed. If set to <code>base64</code>, base64 encoding will
229-
be performed. At the start of an <code>echo</code> element,
230-
the default is set to <code>entity</code>, resulting in entity
231-
encoding (which is appropriate in the context of a block-level
232-
HTML element, <em>e.g.</em> a paragraph of text). This can be
233-
changed by adding an <code>encoding</code> attribute, which will
234-
remain in effect until the next <code>encoding</code> attribute
235-
is encountered or the element ends, whichever comes first.</p>
230+
performed. If set to <code>urlencoded</code>,
231+
application/x-www-form-urlencoded compatible encoding will be
232+
performed instead, and should be used with query strings. If set
233+
to <code>base64</code>, base64 encoding will be performed. At
234+
the start of an <code>echo</code> element, the default is set to
235+
<code>entity</code>, resulting in entity encoding (which is
236+
appropriate in the context of a block-level HTML element,
237+
<em>e.g.</em> a paragraph of text). This can be changed by adding
238+
an <code>encoding</code> attribute, which will remain in effect
239+
until the next <code>encoding</code> attribute is encountered or
240+
the element ends, whichever comes first.</p>
236241

237242
<p>The <code>encoding</code> attribute must <em>precede</em> the
238243
corresponding <code>var</code> attribute to be effective.</p>
@@ -442,29 +447,32 @@
442447
<dd><p>Specifies whether Apache should strip an encoding from
443448
the variable before processing the variable further. The default
444449
is <code>none</code>, where no decoding will be done. If set to
445-
<code>url</code>, <code>base64</code> or <code>entity</code>,
446-
URL decoding, base64 decoding or HTML entity decoding will be
447-
performed respectively. More than one decoding can be specified
448-
by separating with commas. The decoding setting will remain in
449-
effect until the next decoding attribute is encountered, or the
450-
element ends. The <code>decoding</code> attribute must
451-
<em>precede</em> the corresponding <code>var</code> attribute to
452-
be effective.</p>
450+
<code>url</code>, <code>urlencoded</code>, <code>base64</code>
451+
or <code>entity</code>, URL decoding,
452+
application/x-www-form-urlencoded decoding, base64 decoding or HTML
453+
entity decoding will be performed respectively. More than one
454+
decoding can be specified by separating with commas. The decoding
455+
setting will remain in effect until the next decoding attribute
456+
is encountered, or the element ends. The <code>decoding</code>
457+
attribute must <em>precede</em> the corresponding
458+
<code>var</code> attribute to be effective.</p>
453459
</dd>
454460

455461
<dt><code>encoding</code></dt>
456462
<dd><p>Specifies how Apache should encode special characters
457463
contained in the variable before setting them. The default is
458464
<code>none</code>, where no encoding will be done. If set to
459-
<code>url</code>, <code>base64</code> or <code>entity</code>,
460-
URL encoding, base64 encoding or HTML entity encoding will be
461-
performed respectively. More than one encoding can be specified
462-
by separating with commas. The encoding setting will remain in
463-
effect until the next encoding attribute is encountered, or the
464-
element ends. The <code>encoding</code> attribute must
465-
<em>precede</em> the corresponding <code>var</code> attribute
466-
to be effective. Encodings are applied after all decodings have
467-
been stripped.</p>
465+
<code>url</code>, <code>urlencoding</code>, <code>base64</code>
466+
or <code>entity</code>, URL encoding,
467+
application/x-www-form-urlencoded encoding, base64 encoding or
468+
HTML entity encoding will be performed respectively. More than
469+
one encoding can be specified by separating with commas. The
470+
encoding setting will remain in effect until the next encoding
471+
attribute is encountered, or the element ends. The
472+
<code>encoding</code> attribute must <em>precede</em> the
473+
corresponding <code>var</code> attribute to be effective.
474+
Encodings are applied after all decodings have been
475+
stripped.</p>
468476
</dd>
469477
</dl>
470478

docs/manual/mod/mod_include.xml.ja

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="UTF-8" ?>
22
<!DOCTYPE modulesynopsis SYSTEM "../style/modulesynopsis.dtd">
33
<?xml-stylesheet type="text/xsl" href="../style/manual.ja.xsl"?>
4-
<!-- English Revision: 656287:1174747 (outdated) -->
4+
<!-- English Revision: 656287:1194870 (outdated) -->
55

66
<!--
77
Licensed to the Apache Software Foundation (ASF) under one or more

docs/manual/new_features_2_4.html.en

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -119,6 +119,15 @@
119119
<dd>Allows to add customizable debug logging at different phases of the
120120
request processing.</dd>
121121

122+
<dt><code class="module"><a href="./mod/mod_xml2enc.html">mod_xml2enc</a></code></dt>
123+
<dd>Formerly a third-party module, this supports internationalisation
124+
in libxml2-based (markup-aware) filter modules.</dd>
125+
126+
<dt><code class="module"><a href="./mod/mod_proxy_html.html">mod_proxy_html</a></code></dt>
127+
<dd>Formerly a third-party module, this supports fixing of HTML
128+
links in a reverse proxy situation, where the backend generates
129+
URLs that are not valid for the proxy's clients.</dd>
130+
122131
</dl>
123132
</div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div>
124133
<div class="section">

docs/manual/programs/rotatelogs.html.en

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@
4343
[ -<strong>f</strong> ]
4444
[ -<strong>v</strong> ]
4545
[ -<strong>e</strong> ]
46+
[ -<strong>c</strong> ]
4647
<var>logfile</var>
4748
<var>rotationtime</var>|<var>filesize</var>(B|K|M|G)
4849
[ <var>offset</var> ]</code></p>
@@ -101,6 +102,9 @@ close actions.</dd>
101102
<dd>Echo logs through to stdout. Useful when logs need to be further
102103
processed in real time by a further tool in the chain.</dd>
103104

105+
<dt><code>-c</code></dt>
106+
<dd>Create log file for each interval, even if empty.</dd>
107+
104108
<dt><code><var>logfile</var></code></dt>
105109

106110
<dd><p>The path plus basename of the logfile. If <var>logfile</var>

0 commit comments

Comments
 (0)