From dc302a920c4f7b9626fe95643e8de4d88f16348c Mon Sep 17 00:00:00 2001
From: Remko Lodder <remko@FreeBSD.org>
Date: Wed, 28 Nov 2007 21:26:59 +0000
Subject: [PATCH] Add some information for apache 2.2 instead of 2.0 and give a
 really short idea on how to enable apache2.2 via the /etc/rc.conf system.

This is just an initial commit in this region.

PR:		docs/114898
Submitted by:	znerd
---
 .../books/handbook/network-servers/chapter.sgml        | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/en_US.ISO8859-1/books/handbook/network-servers/chapter.sgml b/en_US.ISO8859-1/books/handbook/network-servers/chapter.sgml
index 8ae53c5852..51fe1e4b59 100644
--- a/en_US.ISO8859-1/books/handbook/network-servers/chapter.sgml
+++ b/en_US.ISO8859-1/books/handbook/network-servers/chapter.sgml
@@ -3819,7 +3819,7 @@ www             IN CNAME        @</programlisting>
         install <application>Apache</application> when you first
         installed FreeBSD, then you can install it from the <filename
         role="package">www/apache13</filename> or <filename
-        role="package">www/apache20</filename> port.</para>
+        role="package">www/apache22</filename> port.</para>
 
       <para>Once <application>Apache</application> has been installed
         successfully, it must be configured.</para>
@@ -3952,6 +3952,10 @@ Log file format -->
 
       <programlisting>apache_enable="YES"</programlisting>
 
+      <para>or for <application>Apache</application> 2.2:</para>
+
+      <programlisting>apache22_enable="YES"</programlisting>
+
       <para>If you would like to supply additional command line
 	options for the <application>Apache</application>
 	<command>httpd</command> program started at system boot, you
@@ -4041,7 +4045,7 @@ DocumentRoot /www/someotherdomain.tld
 	  1.3.X that includes <application>mod_ssl</application> may be installed with the <filename
 	  role="package">www/apache13-modssl</filename> port.  SSL
 	  support is also available for <application>Apache</application>&nbsp;2.X in the
-	  <filename role="package">www/apache20</filename> port,
+	  <filename role="package">www/apache22</filename> port,
 	  where it is enabled by default.</para>
 
 <!-- XXX add more information about configuring mod_ssl here. -->
@@ -4082,7 +4086,7 @@ DocumentRoot /www/someotherdomain.tld
             remember that <application>mod_perl</application> 1.0 only
             works with <application>Apache</application> 1.3 and
             <application>mod_perl</application> 2.0 only works with
-            <application>Apache</application> 2.
+            <application>Apache</application> 2.X.
             <application>mod_perl</application> 1.0 is available in
             <filename role="package">www/mod_perl</filename> and a
             statically compiled version is available in