From: Daniel Gruno Date: Sun, 29 Apr 2012 12:23:02 +0000 (+0000) Subject: xforms X-Git-Tag: 2.5.0-alpha~6942 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=2979abc2be83b6eb8aec5ece7e79a065551f8bc0;p=thirdparty%2Fapache%2Fhttpd.git xforms git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1331904 13f79535-47bb-0310-9956-ffa450edef68 --- diff --git a/docs/manual/mod/core.html.en b/docs/manual/mod/core.html.en index dde1dfe4026..6673eacde97 100644 --- a/docs/manual/mod/core.html.en +++ b/docs/manual/mod/core.html.en @@ -1071,13 +1071,13 @@ satisfied 
 <If "-R '10.1.0.0/16'">
-#...
+  #...
 </If>
 <ElseIf "-R '10.0.0.0/8'">
-#...
+  #...
 </ElseIf>
 <Else>
-#...
+  #...
 </Else>
@@ -1334,7 +1334,7 @@ ErrorDocument 404 /cgi-bin/bad_urls.pl error rather than masking it. More information is available in Microsoft Knowledge Base article Q294807.

-

Although most error messages can be overriden, there are certain +

Although most error messages can be overridden, there are certain circumstances where the internal messages are used regardless of the setting of ErrorDocument. In particular, if a malformed request is detected, normal request processing @@ -1442,11 +1442,11 @@ ErrorLogFormat "[%t] [%l] [pid %P] %F: %E: [client %a] %M" example, the Referer header is only present if the log message is associated to a request and the log message happens at a time when the Referer header has already been read from the client. If no output is - produced, the default behavior is to delete everything from the preceeding + produced, the default behavior is to delete everything from the preceding space character to the next space character. This means the log line is implicitly divided into fields on non-whitespace to whitespace transitions. If a format string item does not produce output, the whole field is - ommitted. For example, if the remote address %a in the log + omitted. For example, if the remote address %a in the log format [%t] [%l] [%a] %M  is not available, the surrounding brackets are not logged either. Space characters can be escaped with a backslash to prevent them from delimiting a field. The combination '% ' @@ -1458,7 +1458,7 @@ ErrorLogFormat "[%t] [%l] [pid %P] %F: %E: [client %a] %M" respective item does not produce any output. In once-per-connection/request formats, it is also possible to use the + (plus) modifier. If an item with the plus modifier does not produce any output, the whole line is - ommitted.

+ omitted.

A number as modifier can be used to assign a log severity level to a format item. The item will only be logged if the severity of the log @@ -1568,7 +1568,7 @@ ErrorLogFormat "[%{u}t] [%-m:%l] [pid %P:tid %T] %7F: %E: [client\ %a] %M%  [Thu May 12 08:28:57.652118 2011] [core:error] [pid 8777:tid 4326490112] [client ::1:58619] File does not exist: /usr/local/apache2/htdocs/favicon.ico

-

Notice that, as discussed above, some fields are ommitted +

Notice that, as discussed above, some fields are omitted entirely because they are not defined.

@@ -1847,7 +1847,7 @@ media type in the HTTP Content-Type header field
 Status:Core
 Module:core
 
-    
When the server has been compiled with gprof profiling suppport,
+    
When the server has been compiled with gprof profiling support,
     GprofDir causes gmon.out files to
     be written to the specified directory when the process exits.  If the
     argument ends with a percent symbol ('%'), subdirectories are created
@@ -3784,7 +3784,7 @@ to name-virtual hosts
-

Name-based virtual hosts for the best-matching set of <virtualhost>s are processsed +

Name-based virtual hosts for the best-matching set of <virtualhost>s are processed in the order they appear in the configuration. The first matching ServerName or ServerAlias is used, with no different precedence for wildcards (nor for ServerName vs. ServerAlias).

diff --git a/docs/manual/mod/core.xml.de b/docs/manual/mod/core.xml.de index 42f49da81d6..5057dfe7dd2 100644 --- a/docs/manual/mod/core.xml.de +++ b/docs/manual/mod/core.xml.de @@ -1,7 +1,7 @@ - + + + diff --git a/docs/manual/mod/core.xml.ja b/docs/manual/mod/core.xml.ja index 47fd1abb6a9..585e8eedbf9 100644 --- a/docs/manual/mod/core.xml.ja +++ b/docs/manual/mod/core.xml.ja @@ -1,7 +1,7 @@ - + + + diff --git a/docs/manual/mod/mod_proxy.xml.ja b/docs/manual/mod/mod_proxy.xml.ja index 304335449b4..ed2f72d71d8 100644 --- a/docs/manual/mod/mod_proxy.xml.ja +++ b/docs/manual/mod/mod_proxy.xml.ja @@ -1,7 +1,7 @@ - +