-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Argh... there seems to be many broken links. These two patches fix any
problems with programs/httpd.xml and invoking.xml. I also rewrote the links
to look more consistent (I mean, no "win32" any more - "windows" instead.) A
couple of grammatical fixes, too.
Iikka
========================================
Iikka Meril�inen
Vaala, Finland
E-mail: [EMAIL PROTECTED]
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.2.0 (GNU/Linux)
iD8DBQE+AJcgCVGYZ+r4ZncRArObAJ41hxMxAEtFC1OnbFXZra1AWqPlNwCfb/DB
KmG8UF6eAcyYPjsFEz6Vmhc=
=K8Lp
-----END PGP SIGNATURE-----
Index: invoking.xml
===================================================================
RCS file: /home/cvspublic/httpd-2.0/docs/manual/invoking.xml,v
retrieving revision 1.3
diff -u -r1.3 invoking.xml
--- invoking.xml 16 Dec 2002 21:46:25 -0000 1.3
+++ invoking.xml 18 Dec 2002 15:19:09 -0000
@@ -8,9 +8,11 @@
<summary>
<p>On Windows, Apache is normally run as a service on Windows
- NT, or as a console application on Windows 95. For details, see
- <a href="platform/windows.html#run">running Apache for
- Windows</a>.</p>
+ NT, 2000 and XP, or as a console application on Windows 9x and
+ ME. For details, see <a
+ href="platform/windows.html#winsvc">Running Apache as a Service</a>
+ and <a href="platform/windows.xml#wincons">Running Apache as a
+ Console Application</a>.</p>
<p>On Unix, the <a href="programs/httpd.html">httpd</a> program
is run as a daemon that executes continuously in the
@@ -123,4 +125,4 @@
provide.</p>
</section>
-</manualpage>
\ No newline at end of file
+</manualpage>
Index: httpd.xml
===================================================================
RCS file: /home/cvspublic/httpd-2.0/docs/manual/programs/httpd.xml,v
retrieving revision 1.1
diff -u -r1.1 httpd.xml
--- httpd.xml 14 Nov 2002 16:24:53 -0000 1.1
+++ httpd.xml 18 Dec 2002 15:27:57 -0000
@@ -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 @@
</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 @@
<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>
