PERFORCE change 131372 for review
Gabor Kovesdan
gabor at FreeBSD.org
Fri Dec 21 05:57:25 PST 2007
http://perforce.freebsd.org/chv.cgi?CH=131372
Change 131372 by gabor at 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> 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
More information about the p4-projects
mailing list