Return-Path: 
 <cvs-return-14338-apmail-httpd-cvs-archive=httpd.apache.org@httpd.apache.org>
Delivered-To: apmail-httpd-cvs-archive@httpd.apache.org
Received: (qmail 30846 invoked by uid 500); 18 Dec 2002 21:48:35 -0000
Mailing-List: contact cvs-help@httpd.apache.org; run by ezmlm
Precedence: bulk
Reply-To: dev@httpd.apache.org
list-help: <mailto:cvs-help@httpd.apache.org>
list-unsubscribe: <mailto:cvs-unsubscribe@httpd.apache.org>
list-post: <mailto:cvs@httpd.apache.org>
Delivered-To: mailing list cvs@httpd.apache.org
Received: (qmail 30835 invoked by uid 500); 18 Dec 2002 21:48:35 -0000
Delivered-To: apmail-httpd-2.0-cvs@apache.org
Date: 18 Dec 2002 21:48:34 -0000
Message-ID: <20021218214834.8866.qmail@icarus.apache.org>
From: erikabele@apache.org
To: httpd-2.0-cvs@apache.org
Subject: cvs commit: httpd-2.0/docs/manual/programs httpd.xml httpd.html.en
X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N

erikabele    2002/12/18 13:48:34

  Modified:    docs/manual/programs Tag: APACHE_2_0_BRANCH httpd.xml
                        httpd.html.en
  Log:
  Added another note about Windows due to the recent changes in windows.xml.
  
  Submitted by: Iikka Meril�inen <Iikka.Merilainen@pato.vaala.fi>
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.1.2.1   +4 -2      httpd-2.0/docs/manual/programs/httpd.xml
  
  Index: httpd.xml
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/docs/manual/programs/httpd.xml,v
  retrieving revision 1.1
  retrieving revision 1.1.2.1
  diff -u -r1.1 -r1.1.2.1
  --- httpd.xml	14 Nov 2002 16:24:53 -0000	1.1
  +++ httpd.xml	18 Dec 2002 21:48:34 -0000	1.1.2.1
  @@ -15,8 +15,10 @@
   
        <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>
  
  
  
  1.1.2.2   +3 -2      httpd-2.0/docs/manual/programs/httpd.html.en
  
  Index: httpd.html.en
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/docs/manual/programs/httpd.html.en,v
  retrieving revision 1.1.2.1
  retrieving revision 1.1.2.2
  diff -u -r1.1.2.1 -r1.1.2.2
  --- httpd.html.en	11 Dec 2002 22:27:07 -0000	1.1.2.1
  +++ httpd.html.en	18 Dec 2002 21:48:34 -0000	1.1.2.2
  @@ -23,8 +23,9 @@
        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>