From: Eric Covener <covener@apache.org>
Date: Sun, 17 Nov 2013 16:25:06 +0000 (+0000)
Subject: Merge r1542752 from trunk:
X-Git-Tag: 2.4.7~12
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=e767af82d06f1da9162cc1f73c5b020f2f01ff7f;p=apache

Merge r1542752 from trunk:

reword windows binaries text so it's clear that you may or may not see
binaries for a given release.  Remove a "HTTPd" term that looked funny.




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

diff --git a/docs/manual/platform/win_compiling.html.en b/docs/manual/platform/win_compiling.html.en
index 39377ec9d9..ffdbe6982a 100644
--- a/docs/manual/platform/win_compiling.html.en
+++ b/docs/manual/platform/win_compiling.html.en
@@ -257,7 +257,7 @@
 
     
 
-    <p>The policy of the HTTPd Server project is to only release Unix sources.
+    <p>The policy of the Apache HTTP Server project is to only release Unix sources.
     Windows source packages made available for download have been supplied by 
     volunteers and may not be available for every release. You can still build 
     the server on Windows from the Unix source tarball with just a few additional
diff --git a/docs/manual/platform/win_compiling.xml b/docs/manual/platform/win_compiling.xml
index ec5370ae55..5115736ef3 100644
--- a/docs/manual/platform/win_compiling.xml
+++ b/docs/manual/platform/win_compiling.xml
@@ -253,7 +253,7 @@
 
     <title>Building from Unix sources</title>
 
-    <p>The policy of the HTTPd Server project is to only release Unix sources.
+    <p>The policy of the Apache HTTP Server project is to only release Unix sources.
     Windows source packages made available for download have been supplied by 
     volunteers and may not be available for every release. You can still build 
     the server on Windows from the Unix source tarball with just a few additional
diff --git a/docs/manual/platform/windows.html.en b/docs/manual/platform/windows.html.en
index 5c9ab9f64b..9edb19dfbe 100644
--- a/docs/manual/platform/windows.html.en
+++ b/docs/manual/platform/windows.html.en
@@ -64,7 +64,9 @@
     
 
     <p>The Apache HTTP Server Project itself does not provide binary releases of
-    software, only source code. If you cannot compile the Apache HTTP Server
+    software, only source code. Individual committers <em>may</em> provide 
+    binary packages as a convenience, but it is not a release deliverable.</p>
+    <p>If you cannot compile the Apache HTTP Server
     yourself, you can obtain a binary package from numerous binary distributions
     available on the Internet.</p>
 
diff --git a/docs/manual/platform/windows.xml b/docs/manual/platform/windows.xml
index 65ccff0e87..2153a851df 100644
--- a/docs/manual/platform/windows.xml
+++ b/docs/manual/platform/windows.xml
@@ -55,7 +55,9 @@
     <title>Downloading Apache for Windows</title>
 
     <p>The Apache HTTP Server Project itself does not provide binary releases of
-    software, only source code. If you cannot compile the Apache HTTP Server
+    software, only source code. Individual committers <em>may</em> provide 
+    binary packages as a convenience, but it is not a release deliverable.</p>
+    <p>If you cannot compile the Apache HTTP Server
     yourself, you can obtain a binary package from numerous binary distributions
     available on the Internet.</p>