html build

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1602769 13f79535-47bb-0310-9956-ffa450edef68

10 files changed, 20 insertions, 8 deletions

diff --git a/docs/manual/mpm.html.en b/docs/manual/mpm.html.en
index 4659e50bae..3505248135 100644
--- a/docs/manual/mpm.html.en
+++ b/docs/manual/mpm.html.en
@@ -149,6 +149,16 @@ two features.</p>
     updating the <code class="directive"><a href="./mod/mod_so.html#loadmodule">LoadModule</a></code> directive
     for the MPM instead of by rebuilding the server.</p>
 
+    <pre class="prettyprint lang-config">LoadModule mpm_prefork_module modules/mod_mpm_prefork.so</pre>
+
+
+    <p>Attempting to <code class="directive"><a href="./mod/mod_so.html#loadmodule">LoadModule</a></code>
+    more than one MPM will result in a startup failure with the
+    following error.</p>
+
+    <div class="example"><p><code>AH00534: httpd: Configuration error: More than one MPM
+    loaded.</code></p></div>
+
     <p>This feature is enabled using the
     <code>--enable-mpms-shared</code> option of the <code class="program"><a href="./programs/configure.html">configure</a></code>
     script.
diff --git a/docs/manual/mpm.html.fr b/docs/manual/mpm.html.fr
index e30c4c3e12..d2ed9c4102 100644
--- a/docs/manual/mpm.html.fr
+++ b/docs/manual/mpm.html.fr
@@ -30,6 +30,8 @@
 <a href="./tr/mpm.html" hreflang="tr" rel="alternate" title="Türkçe">&nbsp;tr&nbsp;</a> |
 <a href="./zh-cn/mpm.html" hreflang="zh-cn" rel="alternate" title="Simplified Chinese">&nbsp;zh-cn&nbsp;</a></p>
 </div>
+<div class="outofdate">Cette traduction peut être périmée. Vérifiez la version
+            anglaise pour les changements récents.</div>
 
 <p>Ce document décrit ce qu'est un Module Multi-Processus, ainsi
 que la manière dont ces modules sont utilisés par le serveur HTTP Apache.</p>
diff --git a/docs/manual/mpm.xml.de b/docs/manual/mpm.xml.de
index fcc7c0e0c4..f072f66d85 100644
--- a/docs/manual/mpm.xml.de
+++ b/docs/manual/mpm.xml.de
@@ -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.de.xsl"?>
-<!-- English Revision: 420990:1395555 (outdated) -->
+<!-- English Revision: 420990:1602764 (outdated) -->
 
 <!--
  Licensed to the Apache Software Foundation (ASF) under one or more
diff --git a/docs/manual/mpm.xml.es b/docs/manual/mpm.xml.es
index 45491c6e4b..6aa65aadee 100644
--- a/docs/manual/mpm.xml.es
+++ b/docs/manual/mpm.xml.es
@@ -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.es.xsl"?>
-<!-- English Revision: 105989:1395555 (outdated) -->
+<!-- English Revision: 105989:1602764 (outdated) -->
 
 <!--
  Licensed to the Apache Software Foundation (ASF) under one or more
diff --git a/docs/manual/mpm.xml.fr b/docs/manual/mpm.xml.fr
index 11272b147e..cd8600720f 100644
--- a/docs/manual/mpm.xml.fr
+++ b/docs/manual/mpm.xml.fr
@@ -3,7 +3,7 @@
 <?xml-stylesheet type="text/xsl" href="./style/manual.fr.xsl"?>
 <!-- French translation : Lucien GENTIS -->
 <!-- Reviewed by : Vincent Deffontaines -->
-<!-- English Revision : 1395555 -->
+<!-- English Revision: 1395555:1602764 (outdated) -->
 
 <!--
  Licensed to the Apache Software Foundation (ASF) under one or more
diff --git a/docs/manual/mpm.xml.ja b/docs/manual/mpm.xml.ja
index 84195fdec6..5d4081d023 100644
--- a/docs/manual/mpm.xml.ja
+++ b/docs/manual/mpm.xml.ja
@@ -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: 420990:1395555 (outdated) -->
+<!-- English Revision: 420990:1602764 (outdated) -->
 
 <!--
  Licensed to the Apache Software Foundation (ASF) under one or more
diff --git a/docs/manual/mpm.xml.ko b/docs/manual/mpm.xml.ko
index 00506469c2..69e0977460 100644
--- a/docs/manual/mpm.xml.ko
+++ b/docs/manual/mpm.xml.ko
@@ -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: 105989:1395555 (outdated) -->
+<!-- English Revision: 105989:1602764 (outdated) -->
 
 <!--
  Licensed to the Apache Software Foundation (ASF) under one or more
diff --git a/docs/manual/mpm.xml.meta b/docs/manual/mpm.xml.meta
index 5d74cffd01..fab28f4169 100644
--- a/docs/manual/mpm.xml.meta
+++ b/docs/manual/mpm.xml.meta
@@ -10,7 +10,7 @@
     <variant outdated="yes">de</variant>
     <variant>en</variant>
     <variant outdated="yes">es</variant>
-    <variant>fr</variant>
+    <variant outdated="yes">fr</variant>
     <variant outdated="yes">ja</variant>
     <variant outdated="yes">ko</variant>
     <variant outdated="yes">tr</variant>
diff --git a/docs/manual/mpm.xml.tr b/docs/manual/mpm.xml.tr
index a76f9e328a..63d25ec845 100644
--- a/docs/manual/mpm.xml.tr
+++ b/docs/manual/mpm.xml.tr
@@ -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.tr.xsl"?>
-<!-- English Revision: 1174747:1395555 (outdated) -->
+<!-- English Revision: 1174747:1602764 (outdated) -->
 <!-- =====================================================
  Translated by: Nilgün Belma Bugüner <nilgun belgeler.org>
    Reviewed by: Orhan Berent <berent belgeler.org>
diff --git a/docs/manual/mpm.xml.zh-cn b/docs/manual/mpm.xml.zh-cn
index be4a3b1fa2..1e579f40df 100644
--- a/docs/manual/mpm.xml.zh-cn
+++ b/docs/manual/mpm.xml.zh-cn
@@ -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.zh-cn.xsl"?>
-<!-- English Revision: 927046:1395555 (outdated) -->
+<!-- English Revision: 927046:1602764 (outdated) -->
 
 <!--
  Licensed to the Apache Software Foundation (ASF) under one or more