Rebuild html, metafiles.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1490414 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/docs/manual/platform/windows.html.en b/docs/manual/platform/windows.html.en
index bedde714efff5ef172c79fd386322998753d5b46..e8d673bcccbfe3e35173b0a53197149a744c7c76 100644 (file)
--- a/docs/manual/platform/windows.html.en
+++ b/docs/manual/platform/windows.html.en
@@ -67,6 +67,14 @@
     software, only source code. If you cannot compile the Apache HTTP Server
     yourself, you can obtain a binary package from numerous binary distributions
     available on the Internet.</p>
+
+    <p>Popular options for deploying Apache httpd, and, optionally, PHP
+    and MySQL, on Microsoft Windows, include:</p>
+    <ul>
+    <li><a href="http://www.apachefriends.org/en/xampp.html">XAMPP, from
+    ApacheFriends</a></li>
+    <li><a href="http://www.wampserver.com/">WampServer</a></li>
+    </ul>
   </div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
 <div class="section">
 <h2><a name="cust" id="cust">Customizing Apache for Windows</a></h2>

diff --git a/docs/manual/platform/windows.html.fr b/docs/manual/platform/windows.html.fr
index ec8ae33e464128704343a885c7c075a414df82e7..cc937daeceac4135e22a29fd67f8703a3050ae8e 100644 (file)
--- a/docs/manual/platform/windows.html.fr
+++ b/docs/manual/platform/windows.html.fr
@@ -26,6 +26,8 @@
 <a href="../fr/platform/windows.html" title="Français">&nbsp;fr&nbsp;</a> |
 <a href="../ko/platform/windows.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&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 l'installation, la configuration et

diff --git a/docs/manual/platform/windows.xml.fr b/docs/manual/platform/windows.xml.fr
index b73e01a61a89134740760c50536569f20f881cbf..8895792a71eef223b09e4c1c42e4b8c6a69bff69 100644 (file)
--- a/docs/manual/platform/windows.xml.fr
+++ b/docs/manual/platform/windows.xml.fr
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="ISO-8859-1" ?>
 <!DOCTYPE manualpage SYSTEM "../style/manualpage.dtd">
 <?xml-stylesheet type="text/xsl" href="../style/manual.fr.xsl"?>
-<!-- English Revision : 1480916 -->
+<!-- English Revision: 1480916:1490413 (outdated) -->
 <!-- French translation : Lucien GENTIS -->
 <!-- Reviewed by : Vincent Deffontaines -->
 

diff --git a/docs/manual/platform/windows.xml.ko b/docs/manual/platform/windows.xml.ko
index 0958235dd321e62b6e6540b2f175bb9dcb070aa1..cca6ad8850214fbcd3be2f882c6490f79b59b14b 100644 (file)
--- a/docs/manual/platform/windows.xml.ko
+++ b/docs/manual/platform/windows.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:1480916 (outdated) -->
+<!-- English Revision: 105989:1490413 (outdated) -->
 
 <!--
  Licensed to the Apache Software Foundation (ASF) under one or more

diff --git a/docs/manual/platform/windows.xml.meta b/docs/manual/platform/windows.xml.meta
index df994e4ed61aaed8ad63e81ab55cc7c0d6815e7a..166e6d7d314782768f9edab0865cf27fb37cb68f 100644 (file)
--- a/docs/manual/platform/windows.xml.meta
+++ b/docs/manual/platform/windows.xml.meta
@@ -8,7 +8,7 @@
 
   <variants>
     <variant>en</variant>
-    <variant>fr</variant>
+    <variant outdated="yes">fr</variant>
     <variant outdated="yes">ko</variant>
   </variants>
 </metafile>