Added another note about Windows due to the recent changes in windows.xml.

Submitted by: Iikka Meril�inen <Iikka.Merilainen@pato.vaala.fi>

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

diff --git a/docs/manual/programs/httpd.html.en b/docs/manual/programs/httpd.html.en
index c6151a33626fceb43af21c806e8783b55215ac4a..b55cd453364376453643d19e470ba2a62a458357 100644 (file)
--- a/docs/manual/programs/httpd.html.en
+++ b/docs/manual/programs/httpd.html.en
@@ -23,12 +23,13 @@
      child processes or threads to handle requests.</p>
 
      <p>In general, <code>httpd</code> should not be invoked directly,
-     but rather should be invoked via <a href="apachectl.html">apachectl</a> on unix systems or as an NT
-     service under win32.</p>
+     but rather should be invoked via <a href="apachectl.html">apachectl</a> on Unix-based systems or <a href="../platform/windows.html#winsvc">as a service on Windows NT,
+     2000 and XP</a> and <a href="../platform/windows.html#wincons">as
+     a console application on Windows 9x and ME</a>.</p>
 </div>
 <div id="quickview"><ul id="toc"><li><img alt="" src="../images/down.gif" /> <a href="#synopsis">Synopsis</a></li>
 <li><img alt="" src="../images/down.gif" /> <a href="#options">Options</a></li>
-</ul><h3>See also</h3><ul class="seealso"><li><a href="../invoking.html">Starting Apache</a></li><li><a href="../stopping.html">Stopping Apache</a></li><li><a href="../configuring.html">Configuration Files</a></li><li><a href="../platform/">Platform Docs</a></li><li><a href="apachectl.html">apachectl</a></li></ul></div>
+</ul><h3>See also</h3><ul class="seealso"><li><a href="../invoking.html">Starting Apache</a></li><li><a href="../stopping.html">Stopping Apache</a></li><li><a href="../configuring.html">Configuration Files</a></li><li><a href="../platform/">Platform-specific Documentation</a></li><li><a href="apachectl.html">apachectl</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="synopsis" id="synopsis">Synopsis</a></h2>
@@ -45,7 +46,7 @@
      -<strong>t </strong>] [ -<strong>v </strong>] [ -<strong>V
      </strong>] [ -<strong>X </strong>]</code></p>
 
-     <p>On <a href="../platform/windows.html">Win32 systems</a>, the
+     <p>On <a href="../platform/windows.html">Windows systems</a>, the
      following additional arguments are available:</p>
 
      <p><code><strong>httpd </strong> [ -<strong>k </strong>
@@ -154,7 +155,7 @@ server will not detach from the console.</dd>
 
 </dl>
 
-<p>The following arguments are available only on the <a href="../platform/windows.html">win32 platform</a>:</p>
+<p>The following arguments are available only on the <a href="../platform/windows.html">Windows platform</a>:</p>
 
 <dl>
 
@@ -169,7 +170,7 @@ the Apache service; and uninstall the Apache service.</dd>
 
 <dt><code>-w</code></dt>
 
-<dd>Hold the console window open on error so that the error message can 
+<dd>Keep the console window open on error so that the error message can 
 be read.</dd>
 
 </dl>

diff --git a/docs/manual/programs/httpd.xml b/docs/manual/programs/httpd.xml
index 13d0fc8d9a3e05b1518bf0d5b2374e583af3e014..89b3ab12398efd85d7e4cc8aed90dcbdad7e98f4 100644 (file)
--- a/docs/manual/programs/httpd.xml
+++ b/docs/manual/programs/httpd.xml
@@ -15,14 +15,16 @@
 
      <p>In general, <code>httpd</code> should not be invoked directly,
      but rather should be invoked via <a
-     href="apachectl.html">apachectl</a> on unix systems or as an NT
-     service under win32.</p>
+     href="apachectl.html">apachectl</a> on Unix-based systems or <a
+     href="../platform/windows.html#winsvc">as a service on Windows NT,
+     2000 and XP</a> and <a href="../platform/windows.html#wincons">as
+     a console application on Windows 9x and ME</a>.</p>
 </summary>
 
 <seealso><a href="../invoking.html">Starting Apache</a></seealso>
 <seealso><a href="../stopping.html">Stopping Apache</a></seealso>
 <seealso><a href="../configuring.html">Configuration Files</a></seealso>
-<seealso><a href="../platform/">Platform Docs</a></seealso>
+<seealso><a href="../platform/">Platform-specific Documentation</a></seealso>
 <seealso><a href="apachectl.html">apachectl</a></seealso>
 
 <section id="synopsis"><title>Synopsis</title>
@@ -39,7 +41,7 @@
      -<strong>t </strong>] [ -<strong>v </strong>] [ -<strong>V
      </strong>] [ -<strong>X </strong>]</code></p>
 
-     <p>On <a href="../platform/windows.html">Win32 systems</a>, the
+     <p>On <a href="../platform/windows.html">Windows systems</a>, the
      following additional arguments are available:</p>
 
      <p><code><strong>httpd </strong> [ -<strong>k </strong>
@@ -152,7 +154,7 @@ server will not detach from the console.</dd>
 </dl>
 
 <p>The following arguments are available only on the <a
-href="../platform/windows.html">win32 platform</a>:</p>
+href="../platform/windows.html">Windows platform</a>:</p>
 
 <dl>
 
@@ -167,7 +169,7 @@ the Apache service; and uninstall the Apache service.</dd>
 
 <dt><code>-w</code></dt>
 
-<dd>Hold the console window open on error so that the error message can 
+<dd>Keep the console window open on error so that the error message can 
 be read.</dd>
 
 </dl>