From owner-p4-projects@FreeBSD.ORG  Fri Dec 21 13:57:25 2007
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 6371D16A41B; Fri, 21 Dec 2007 13:57:25 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 0868216A418
	for <perforce@freebsd.org>; Fri, 21 Dec 2007 13:57:25 +0000 (UTC)
	(envelope-from gabor@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id DD3C713C457
	for <perforce@freebsd.org>; Fri, 21 Dec 2007 13:57:24 +0000 (UTC)
	(envelope-from gabor@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lBLDvOe8013595
	for <perforce@freebsd.org>; Fri, 21 Dec 2007 13:57:24 GMT
	(envelope-from gabor@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lBLDvOYe013592
	for perforce@freebsd.org; Fri, 21 Dec 2007 13:57:24 GMT
	(envelope-from gabor@freebsd.org)
Date: Fri, 21 Dec 2007 13:57:24 GMT
Message-Id: <200712211357.lBLDvOYe013592@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	gabor@freebsd.org using -f
From: Gabor Kovesdan <gabor@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 131372 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 21 Dec 2007 13:57:25 -0000

http://perforce.freebsd.org/chv.cgi?CH=131372

Change 131372 by gabor@gabor_server on 2007/12/21 13:56:35

	IFC

Affected files ...

.. //depot/projects/docproj_hu/books/handbook/network-servers/chapter.sgml#2 integrate
.. //depot/projects/docproj_hu/share/sgml/mailing-lists.ent#3 integrate
.. //depot/projects/docproj_hu/share/sgml/teams.ent#3 integrate
.. //depot/projects/docproj_hu/share/sgml/trademarks.ent#4 integrate

Differences ...

==== //depot/projects/docproj_hu/books/handbook/network-servers/chapter.sgml#2 (text+ko) ====

@@ -1,7 +1,7 @@
 <!--
      The FreeBSD Documentation Project
 
-     $FreeBSD: doc/en_US.ISO8859-1/books/handbook/network-servers/chapter.sgml,v 1.101 2007/08/15 19:02:48 blackend Exp $
+     $FreeBSD: doc/en_US.ISO8859-1/books/handbook/network-servers/chapter.sgml,v 1.102 2007/11/28 21:26:59 remko Exp $
 -->
 
 <chapter id="network-servers">
@@ -3819,7 +3819,7 @@
         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 @@
 
       <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 @@
 	  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 @@
             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

==== //depot/projects/docproj_hu/share/sgml/mailing-lists.ent#3 (text+ko) ====

@@ -1,7 +1,7 @@
 <!--
      Names of FreeBSD mailing lists and related software.
 
-     $FreeBSD: doc/hu_HU.ISO8859-2/share/sgml/mailing-lists.ent,v 1.1 2007/04/15 15:23:55 gabor Exp $
+     $FreeBSD: doc/hu_HU.ISO8859-2/share/sgml/mailing-lists.ent,v 1.2 2007/11/27 23:01:47 gabor Exp $
 -->
 
 <!-- The FreeBSD Hungarian Documentation Project

==== //depot/projects/docproj_hu/share/sgml/teams.ent#3 (text+ko) ====

@@ -6,7 +6,7 @@
 
      Please keep this list in alphabetical order by entity names.
 
-     $FreeBSD: doc/hu_HU.ISO8859-2/share/sgml/teams.ent,v 1.1 2007/04/15 15:23:55 gabor Exp $
+     $FreeBSD: doc/hu_HU.ISO8859-2/share/sgml/teams.ent,v 1.2 2007/11/27 23:01:47 gabor Exp $
 -->
 
 <!-- The FreeBSD Hungarian Documentation Project

==== //depot/projects/docproj_hu/share/sgml/trademarks.ent#4 (text+ko) ====

@@ -8,7 +8,7 @@
 
      Please keep this file sorted.
 
-     $FreeBSD: doc/hu_HU.ISO8859-2/share/sgml/trademarks.ent,v 1.1 2007/04/15 15:23:55 gabor Exp $
+     $FreeBSD: doc/hu_HU.ISO8859-2/share/sgml/trademarks.ent,v 1.2 2007/11/27 23:01:47 gabor Exp $
 -->
 
 <!-- The FreeBSD Hungarian Documentation Project