summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--docs/manual/index.html.de2
-rw-r--r--docs/manual/index.html.en2
-rw-r--r--docs/manual/mod/mod_log_config.html.en26
3 files changed, 15 insertions, 15 deletions
diff --git a/docs/manual/index.html.de b/docs/manual/index.html.de
index c8095ccd06..9a9e555b6d 100644
--- a/docs/manual/index.html.de
+++ b/docs/manual/index.html.de
@@ -19,7 +19,7 @@
<div id="path">
<a href="http://www.apache.org/">Apache</a> &gt; <a href="http://httpd.apache.org/">HTTP-Server</a> &gt; <a href="http://httpd.apache.org/docs-project/">Dokumentation</a></div>
<div id="page-content"><h1>Dokumentation zum Apache HTTP Server Version 2.1</h1>
-<form action="http://search.apache.org/" method="post"><p><input value="httpd.apache.org" name="what" type="hidden" /><input value="20" name="results" type="hidden" /><input value="2" name="version" type="hidden" /><input size="20" name="keyword" type="text" /> <input value="Suchen" type="submit" /></p></form>
+<form method="get" action="http://www.google.com/search"><p><input name="as_q" value="" type="text" /> <input value="Google-Suche" type="submit" /><input value="10" name="num" type="hidden" /><input value="de" name="hl" type="hidden" /><input value="ISO-8859-1" name="ie" type="hidden" /><input value="Google Search" name="btnG" type="hidden" /><input name="as_epq" value="Apache 2.0" type="hidden" /><input name="as_oq" value="" type="hidden" /><input name="as_eq" value="&quot;List-Post&quot;" type="hidden" /><input value="" name="lr" type="hidden" /><input value="i" name="as_ft" type="hidden" /><input value="" name="as_filetype" type="hidden" /><input value="all" name="as_qdr" type="hidden" /><input value="any" name="as_occt" type="hidden" /><input value="i" name="as_dt" type="hidden" /><input value="httpd.apache.org" name="as_sitesearch" type="hidden" /><input value="off" name="safe" type="hidden" /></p></form>
<table id="indextable"><tr><td class="col1"><div class="category"><h2><a name="release" id="release">Hinweise zur Version</a></h2>
<ul><li><a href="new_features_2_0.html">Neue Funktionen in Version 2.0</a></li>
<li><a href="upgrading.html">Upgrade auf Version 2.0</a></li>
diff --git a/docs/manual/index.html.en b/docs/manual/index.html.en
index d2013c7173..86d081fa57 100644
--- a/docs/manual/index.html.en
+++ b/docs/manual/index.html.en
@@ -19,7 +19,7 @@
<div id="path">
<a href="http://www.apache.org/">Apache</a> &gt; <a href="http://httpd.apache.org/">HTTP Server</a> &gt; <a href="http://httpd.apache.org/docs-project/">Documentation</a></div>
<div id="page-content"><h1>Apache HTTP Server Version 2.1 Documentation</h1>
-<form action="http://search.apache.org/" method="post"><p><input value="httpd.apache.org" name="what" type="hidden" /><input value="20" name="results" type="hidden" /><input value="2" name="version" type="hidden" /><input size="20" name="keyword" type="text" /> <input value="Search" type="submit" /></p></form>
+<form method="get" action="http://www.google.com/search"><p><input name="as_q" value="" type="text" /> <input value="Google Search" type="submit" /><input value="10" name="num" type="hidden" /><input value="en" name="hl" type="hidden" /><input value="ISO-8859-1" name="ie" type="hidden" /><input value="Google Search" name="btnG" type="hidden" /><input name="as_epq" value="Apache 2.0" type="hidden" /><input name="as_oq" value="" type="hidden" /><input name="as_eq" value="&quot;List-Post&quot;" type="hidden" /><input value="" name="lr" type="hidden" /><input value="i" name="as_ft" type="hidden" /><input value="" name="as_filetype" type="hidden" /><input value="all" name="as_qdr" type="hidden" /><input value="any" name="as_occt" type="hidden" /><input value="i" name="as_dt" type="hidden" /><input value="httpd.apache.org" name="as_sitesearch" type="hidden" /><input value="off" name="safe" type="hidden" /></p></form>
<table id="indextable"><tr><td class="col1"><div class="category"><h2><a name="release" id="release">Release Notes</a></h2>
<ul><li><a href="new_features_2_0.html">New features with Apache 2.0</a></li>
<li><a href="upgrading.html">Upgrading to 2.0 from 1.3</a></li>
diff --git a/docs/manual/mod/mod_log_config.html.en b/docs/manual/mod/mod_log_config.html.en
index 7c542da77e..7f28d31945 100644
--- a/docs/manual/mod/mod_log_config.html.en
+++ b/docs/manual/mod/mod_log_config.html.en
@@ -60,8 +60,8 @@
<h2><a name="formats" id="formats">Custom Log Formats</a></h2>
<p>The format argument to the <code class="directive"><a href="#logformat">LogFormat</a></code> and <code class="directive"><a href="#customlog">CustomLog</a></code> directives is a string. This string is
- logged to the log file for each request. It can contain literal
- characters copied into the log files and the c-type control
+ used to log each request to the log file. It can contain literal
+ characters copied into the log files and the C-style control
characters "\n" and "\t" to represent new-lines and tabs.
Literal quotes and back-slashes should be escaped with
back-slashes.</p>
@@ -178,20 +178,20 @@
"%!200,304,302{Referer}i" logs <code>Referer:</code> on all requests
which did <em>not</em> return some sort of normal status.</p>
- <p>Note that in versions previous to 2.0.46 no escaping has been performed
+ <p>Note that in httpd 2.0 versions prior to 2.0.46, no escaping was performed
on the strings from <code>%...r</code>, <code>%...i</code> and
<code>%...o</code>. This was mainly to comply with the requirements of
the Common Log Format. This implied that clients could insert control
characters into the log, so you had to be quite careful when dealing
with raw log files.</p>
- <p>For security reasons starting with 2.0.46 non-printable and
+ <p>For security reasons, starting with 2.0.46, non-printable and
other special characters are escaped mostly by using
<code>\x<var>hh</var></code> sequences, where <var>hh</var> stands for
the hexadecimal representation of the raw byte. Exceptions from this
rule are <code>"</code> and <code>\</code> which are escaped by prepending
- a backslash, and all whitespace characters that are written in their
- C-notation (<code>\n</code>, <code>\t</code> etc).</p>
+ a backslash, and all whitespace characters which are written in their
+ C-style notation (<code>\n</code>, <code>\t</code> etc).</p>
<p>Some commonly used log format strings are:</p>
@@ -261,7 +261,7 @@
characteristics using environment variables.</p>
<p>The first argument, which specifies the location to which
- the logs will be written, can take on one of the following two
+ the logs will be written, can take one of the following two
types of values:</p>
<dl>
@@ -274,7 +274,7 @@
input.
<div class="warning"><h3>Security:</h3>
- <p>If a program is used, then it will be run under the user who
+ <p>If a program is used, then it will be run as the user who
started httpd. This will be root if the server was started by root;
be sure that the program is secure.</p>
</div>
@@ -304,8 +304,8 @@
CustomLog logs/access_log "%h %l %u %t \"%r\" %&gt;s %b"
</code></p></div>
- <p>The third argument is optional and allows the decision on
- whether or not to log a particular request to be based on the
+ <p>The third argument is optional and controls whether or
+ not to log a particular request based on the
presence or absence of a particular variable in the server
environment. If the specified <a href="../env.html">environment
variable</a> is set for the request (or is not set, in the case
@@ -345,7 +345,7 @@
this directive sets the log format which will be used by logs
specified in subsequent <code class="directive">TransferLog</code>
directives. The single argument can specify an explicit
- <var>format</var> as discussed in <a href="#formats">custom log
+ <var>format</var> as discussed in the <a href="#formats">custom log
formats</a> section above. Alternatively, it can use a
<var>nickname</var> to refer to a log format defined in a
previous <code class="directive">LogFormat</code> directive as described
@@ -363,7 +363,7 @@
it the default. Therefore, it will not affect subsequent
<code class="directive"><a href="#transferlog">TransferLog</a></code> directives.
In addition, <code class="directive">LogFormat</code> cannot use one nickname
- to define another nickname. Note, that the nickname should not contain
+ to define another nickname. Note that the nickname should not contain
percent signs (<code>%</code>).</p>
<div class="example"><h3>Example</h3><p><code>
@@ -386,7 +386,7 @@
to be specified explicitly or for conditional logging of requests.
Instead, the log format is determined by the most recently specified
<code class="directive"><a href="#logformat">LogFormat</a></code> directive
- (which does not define a nickname). Common Log Format is used if no
+ which does not define a nickname. Common Log Format is used if no
other format has been specified.</p>
<div class="example"><h3>Example</h3><p><code>