XML update.

[apache] / docs / manual / server-wide.xml

diff --git a/docs/manual/server-wide.xml b/docs/manual/server-wide.xml
index 6d5c8766915c8bd1116b8f8b76fcf2d5c2ea7c3d..b22f9b3c04a19ed7c8d68600c59ed0792182b7a9 100644 (file)
--- a/docs/manual/server-wide.xml
+++ b/docs/manual/server-wide.xml
@@ -1,13 +1,15 @@
 <?xml version='1.0' encoding='UTF-8' ?>
 <!DOCTYPE manualpage SYSTEM "./style/manualpage.dtd">
 <?xml-stylesheet type="text/xsl" href="./style/manual.en.xsl"?>
+<!-- $LastChangedRevision$ -->
 
 <!--
- Copyright 2002-2004 The Apache Software Foundation
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements.  See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License.  You may obtain a copy of the License at
 
      http://www.apache.org/licenses/LICENSE-2.0
 
@@ -38,6 +40,7 @@ the basic operations of the server.</p>
         <directive module="core">ServerSignature</directive>
         <directive module="core">ServerTokens</directive>
         <directive module="core">UseCanonicalName</directive>
+        <directive module="core">UseCanonicalPhysicalPort</directive>
       </directivelist>
     </related>
 
@@ -48,12 +51,13 @@ the basic operations of the server.</p>
     <directive module="core">ServerTokens</directive> directive
     sets the value of the Server HTTP response header field.</p>
 
-    <p>The <directive module="core">ServerName</directive> and
-    <directive module="core">UseCanonicalName</directive>
+    <p>The <directive module="core">ServerName</directive>,
+    <directive module="core">UseCanonicalName</directive> and
+    <directive module="core">UseCanonicalPhysicalPort</directive>
     directives are used by the server to determine how to construct
     self-referential URLs. For example, when a client requests a
     directory, but does not include the trailing slash in the
-    directory name, Apache must redirect the client to the full
+    directory name, httpd must redirect the client to the full
     name including the trailing slash so that the client will
     correctly resolve relative references in the document.</p>
   </section>
@@ -66,7 +70,7 @@ the basic operations of the server.</p>
         <directive module="mpm_common">CoreDumpDirectory</directive>
         <directive module="core">DocumentRoot</directive>
         <directive module="core">ErrorLog</directive>
-        <directive module="mpm_common">LockFile</directive>
+        <directive module="core">Mutex</directive>
         <directive module="mpm_common">PidFile</directive>
         <directive module="mpm_common">ScoreBoardFile</directive>
         <directive module="core">ServerRoot</directive>
@@ -74,7 +78,7 @@ the basic operations of the server.</p>
     </related>
 
     <p>These directives control the locations of the various files
-    that Apache needs for proper operation. When the pathname used
+    that httpd needs for proper operation. When the pathname used
     does not begin with a slash (/), the files are located relative
     to the <directive module="core">ServerRoot</directive>. Be careful
     about locating files in paths which are writable by non-root users.
@@ -100,17 +104,33 @@ the basic operations of the server.</p>
 
     <p>The <directive>LimitRequest</directive>*
     directives are used to place limits on the amount of resources
-    Apache will use in reading requests from clients. By limiting
+    httpd will use in reading requests from clients. By limiting
     these values, some kinds of denial of service attacks can be
     mitigated.</p>
 
     <p>The <directive>RLimit</directive>* directives
     are used to limit the amount of resources which can be used by
-    processes forked off from the Apache children. In particular,
+    processes forked off from the httpd children. In particular,
     this will control resources used by CGI scripts and SSI exec
     commands.</p>
 
     <p>The <directive module="mpm_common">ThreadStackSize</directive>
     directive is used with some platforms to control the stack size.</p>
   </section>
+
+  <section id="implementation">
+    <title>Implementation Choices</title>
+
+    <related>
+      <directivelist>
+        <directive module="core">Mutex</directive>
+      </directivelist>
+    </related>
+
+    <p>The <directive>Mutex</directive> directive can be used to change
+    the underlying implementation used for mutexes, in order to relieve
+    functional or performance problems with <glossary>APR</glossary>'s
+    default choice.</p>
+  </section>
+
 </manualpage>