From jhelfman@experts-exchange.com  Fri Nov 11 21:40:57 2011
Return-Path: <jhelfman@experts-exchange.com>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 934CA1065670
	for <FreeBSD-gnats-submit@freebsd.org>; Fri, 11 Nov 2011 21:40:57 +0000 (UTC)
	(envelope-from jhelfman@experts-exchange.com)
Received: from mail.experts-exchange.com (mail.experts-exchange.com [72.29.183.251])
	by mx1.freebsd.org (Postfix) with ESMTP id 710DE8FC0A
	for <FreeBSD-gnats-submit@freebsd.org>; Fri, 11 Nov 2011 21:40:57 +0000 (UTC)
Received: from mail.experts-exchange.com (localhost [127.0.0.1])
	by mail.experts-exchange.com (Postfix) with ESMTP id 4832171728E;
	Fri, 11 Nov 2011 13:40:57 -0800 (PST)
Received: from mail.experts-exchange.com ([127.0.0.1])
	by mail.experts-exchange.com (mail.experts-exchange.com [127.0.0.1]) (amavisd-new, port 10024)
	with ESMTP id q4-IA9oyo1Ud; Fri, 11 Nov 2011 13:40:57 -0800 (PST)
Received: from experts-exchange.com (unknown [192.168.103.120])
	by mail.experts-exchange.com (Postfix) with SMTP id 1D31571728C;
	Fri, 11 Nov 2011 13:40:57 -0800 (PST)
Received: (nullmailer pid 46327 invoked by uid 1001);
	Fri, 11 Nov 2011 21:40:42 -0000
Message-Id: <1321047642.111565.46326.nullmailer@experts-exchange.com>
Date: Fri, 11 Nov 2011 13:40:42 -0800
From: Jason Helfman <jhelfman@experts-exchange.com>
Reply-To: Jason Helfman <jhelfman@experts-exchange.com>
To: FreeBSD-gnats-submit@freebsd.org
Cc: apache@freebsd.org
Subject: books/porters-handbook,handbook: follow deprecatation of apache13 in documentation
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         162494
>Category:       docs
>Synopsis:       books/porters-handbook,handbook: follow deprecatation of apache13 in documentation
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    gjb
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Fri Nov 11 21:50:05 UTC 2011
>Closed-Date:    Fri Feb 03 05:30:54 UTC 2012
>Last-Modified:  Fri Feb  3 05:40:16 UTC 2012
>Originator:     Jason Helfman
>Release:        FreeBSD 8.2-RELEASE i386
>Organization:
Experts Exchange, LLC.
>Environment:
System: FreeBSD dormouse.experts-exchange.com 8.2-RELEASE FreeBSD 8.2-RELEASE #0: Thu Feb 17 02:41:51 UTC 2011 root@mason.cse.buffalo.edu:/usr/obj/usr/src/sys/GENERIC  amd64


	
>Description:
Apache13 is being deprecated soon. Documentation should follow.
worked with apache@ group on ideas of updating configuration area, and
it was decided to remove most of it.

>How-To-Repeat:
	
>Fix:

Index: book.sgml
===================================================================
RCS file: /usr/local/ncvs/doc/en_US.ISO8859-1/books/porters-handbook/book.sgml,v
retrieving revision 1.1119
diff -r1.1119 book.sgml
14769,14770c14769,14770
< 		  <filename role="package">www/apache21</filename> but
< 		  <filename role="package">www/apache13</filename>
---
> 		  <filename role="package">www/apache20</filename> but
> 		  <filename role="package">www/apache22</filename>
Index: handbook/config/chapter.sgml
===================================================================
RCS file: /usr/local/ncvs/doc/en_US.ISO8859-1/books/handbook/config/chapter.sgml,v
retrieving revision 1.247
diff -r1.247 chapter.sgml
355c355
<       <filename role="package">www/apache13</filename> are just two
---
>       <filename role="package">www/apache22</filename> are just two
Index: handbook/mac/chapter.sgml
===================================================================
RCS file: /usr/local/ncvs/doc/en_US.ISO8859-1/books/handbook/mac/chapter.sgml,v
retrieving revision 1.75
diff -r1.75 chapter.sgml
1654c1654
<       <filename role="package">www/apache13</filename> ports are all
---
>       <filename role="package">www/apache22</filename> ports are all
Index: handbook/network-servers/chapter.sgml
===================================================================
RCS file: /usr/local/ncvs/doc/en_US.ISO8859-1/books/handbook/network-servers/chapter.sgml,v
retrieving revision 1.138
diff -r1.138 chapter.sgml
4349d4348
<         role="package">www/apache13</filename> or <filename
4355c4354
<       <note><para>This section covers version 1.3.X of the
---
>       <note><para>This section covers version 2.2.X of the
4357,4359c4356,4359
<         most widely used version for &os;.  <application>Apache</application>&nbsp;2.X introduces many
<         new technologies but they are not discussed here.  For more
<         information about <application>Apache</application>&nbsp;2.X, please see <ulink
---
>         most widely used version for &os;.  <application>Apache
>         </application>&nbsp;2.X introduces many new technologies but
>         they are not discussed here.  For more information about
>         <application>Apache</application>&nbsp;2.X, please see <ulink
4372c4372
< 	<filename>/usr/local/etc/apache/httpd.conf</filename> on &os;.
---
> 	<filename>/usr/local/etc/apache22/httpd.conf</filename> on &os;.
4376,4430c4376,4379
< 	configuration options is outside the scope of this book, so
< 	only the most frequently modified directives will be described
< 	here.</para>
< 
<       <variablelist>
< 	<varlistentry>
< 	  <term><literal>ServerRoot "/usr/local"</literal></term>
< 
< 	  <listitem>
< 	    <para>This specifies the default directory hierarchy for
< 	    the <application>Apache</application> installation.  Binaries are stored in the
< 	    <filename class="directory">bin</filename> and
< 	    <filename class="directory">sbin</filename> subdirectories
< 	    of the server root, and configuration files are stored in
< 	    <filename class="directory">etc/apache</filename>.</para>
< 	  </listitem>
< 	</varlistentry>
< 
< 	<varlistentry>
< 	  <term><literal>ServerAdmin you@your.address</literal></term>
< 
< 	  <listitem>
< 	    <para>The address to which problems with the server should
< 	      be emailed.  This address appears on some
< 	      server-generated pages, such as error documents.</para>
< 	  </listitem>
< 	</varlistentry>
< 
< 	<varlistentry>
< 	  <term><literal>ServerName www.example.com</literal></term>
< 
< 	  <listitem>
< 	    <para><literal>ServerName</literal> allows you to set a host name which is
< 	      sent back to clients for your server if it is different
< 	      to the one that the host is configured with (i.e., use <hostid>www</hostid>
< 	      instead of the host's real name).</para>
< 	  </listitem>
< 	</varlistentry>
< 
< 	<varlistentry>
< 	  <term><literal>DocumentRoot "/usr/local/www/data"</literal></term>
< 
< 	  <listitem>
< 	    <para><literal>DocumentRoot</literal>: The directory out of which you will
< 	      serve your documents. By default, all requests are taken
< 	      from this directory, but symbolic links and aliases may
< 	      be used to point to other locations.</para>
< 	  </listitem>
< 	</varlistentry>
<       </variablelist>
< 
<       <para>It is always a good idea to make backup copies of your
< 	<application>Apache</application> configuration file before making changes.  Once you are
< 	satisfied with your initial configuration you are ready to
< 	start running <application>Apache</application>.</para>
---
> 	configuration options is outside the scope of this book, however
> 	the <ulink url="http://httpd.apache.org/docs/2.2/">Apache HTTP Server
> 	Documentation</ulink> is a great resource for configuring your
> 	web server.</para>
4432,4477c4381
< <!-- sect3 for performance tuning directives?  maxservers minservers -->
< <!-- etc..?? -->
< 
< <!-- Advanced configuration section.
< 
< Performance tuning directives.
< 
< Log file format -->
< 
<     </sect2>
< 
<     <sect2>
<       <title>Running <application>Apache</application></title>
< 
<       <indexterm><primary>Apache</primary>
< 	<secondary>starting or stopping</secondary></indexterm>
< 
<       <para><application>Apache</application> does not run from the
<         <application>inetd</application> super server as many other
<         network servers do.  It is configured to run standalone for
<         better performance for incoming HTTP requests from client web
<         browsers.  A shell script wrapper is included to make
<         starting, stopping, and restarting the server as simple as
<         possible.  To start up <application>Apache</application> for
<         the first time, just run:</para>
< 
<       <screen>&prompt.root; <userinput>/usr/local/sbin/apachectl start</userinput></screen>
< 
<       <para>You can stop the server at any time by typing:</para>
< 
<       <screen>&prompt.root; <userinput>/usr/local/sbin/apachectl stop</userinput></screen>
< 
<       <para>After making changes to the configuration file for any
<       reason, you will need to restart the server:</para>
< 
<       <screen>&prompt.root; <userinput>/usr/local/sbin/apachectl restart</userinput></screen>
< 
<       <para>To restart <application>Apache</application> without
< 	aborting current connections, run:</para>
< 
<       <screen>&prompt.root; <userinput>/usr/local/sbin/apachectl graceful</userinput></screen>
< 
<       <para>Additional information available at
< 	&man.apachectl.8; manual page.</para>
< 
<       <para>To launch <application>Apache</application> at system
---
>       <para>To launch <application>Apache 2.2</application> at system
4481,4484d4384
<       <programlisting>apache_enable="YES"</programlisting>
< 
<       <para>or for <application>Apache</application> 2.2:</para>
< 
4493,4596c4393,4394
<       <programlisting>apache_flags=""</programlisting>
< 
<       <para>Now that the web server is running, you can view your web
<         site by pointing a web browser to
<         <literal>http://localhost/</literal>.  The default web page
<         that is displayed is
<         <filename>/usr/local/www/data/index.html</filename>.</para>
< 
<     </sect2>
< 
<     <sect2>
<       <title>Virtual Hosting</title>
< 
<       <para><application>Apache</application> supports two different
< 	types of Virtual Hosting. The first method is Name-based
< 	Virtual Hosting. Name-based virtual hosting uses the clients
< 	HTTP/1.1 headers to figure out the hostname. This allows many
< 	different domains to share the same IP address.</para>
< 
<       <para>To setup <application>Apache</application> to use
<         Name-based Virtual Hosting add an entry like the following to
<         your <filename>httpd.conf</filename>:</para>
< 
<       <programlisting>NameVirtualHost *</programlisting>
< 
<       <para>If your webserver was named <hostid role="fqdn">www.domain.tld</hostid> and
<         you wanted to setup a virtual domain for
<         <hostid role="fqdn">www.someotherdomain.tld</hostid> then you would add
<         the following entries to
<         <filename>httpd.conf</filename>:</para>
< 
<       <screen>&lt;VirtualHost *&gt;
< ServerName www.domain.tld
< DocumentRoot /www/domain.tld
< &lt;/VirtualHost&gt;
< 
< &lt;VirtualHost *&gt;
< ServerName www.someotherdomain.tld
< DocumentRoot /www/someotherdomain.tld
< &lt;/VirtualHost&gt;</screen>
< 
<       <para>Replace the addresses with the addresses you want to use
<         and the path to the documents with what you are using.</para>
< 
<       <para>For more information about setting up virtual hosts,
<         please consult the official <application>Apache</application>
<         documentation at: <ulink
<         url="http://httpd.apache.org/docs/vhosts/"></ulink>.</para>
< 
<     </sect2>
< 
<     <sect2>
<       <title>Apache Modules</title>
< 
<       <indexterm><primary>Apache</primary>
< 	<secondary>modules</secondary></indexterm>
< 
<       <para>There are many different <application>Apache</application> modules available to add
<         functionality to the basic server.  The FreeBSD Ports
<         Collection provides an easy way to install
<         <application>Apache</application> together with some of the
<         more popular add-on modules.</para>
< 
<       <sect3>
<         <title>mod_ssl</title>
< 
< 	<indexterm><primary>web servers</primary>
<           <secondary>secure</secondary></indexterm>
< 	<indexterm><primary>SSL</primary></indexterm>
< 	<indexterm><primary>cryptography</primary></indexterm>
< 
<         <para>The <application>mod_ssl</application> module uses the OpenSSL library to provide
<           strong cryptography via the Secure Sockets Layer (SSL v2/v3)
<           and Transport Layer Security (TLS v1) protocols.  This
<           module provides everything necessary to request a signed
<           certificate from a trusted certificate signing authority so
<           that you can run a secure web server on &os;.</para>
< 
< 	<para>If you have not yet installed
< 	  <application>Apache</application>, then a version of <application>Apache</application>
< 	  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/apache22</filename> port,
< 	  where it is enabled by default.</para>
< 
< <!-- XXX add more information about configuring mod_ssl here. -->
< <!-- Generating keys, getting the key signed, setting up your secure -->
< <!-- web server! -->
<       </sect3>
< 
<       <sect3>
<         <title>Language Bindings</title>
< 
<         <para>There are Apache modules for most major scripting
<           languages.  These modules typically make it possible to
<           write <application>Apache</application> modules entirely in
<           a scripting language.  They are also often used as a
<           persistent interpreter embedded into the server that avoids
<           the overhead of starting an external interpreter and the
<           startup-time penalty for dynamic websites, as described in
<           the next section.</para>
<       </sect3>
<     </sect2>
---
>       <programlisting>apache22_flags=""</programlisting>
>       </sect2>
4695,4705c4493,4494
<           <para><application>mod_perl</application> is available a few
<             different ways.  To use <application>mod_perl</application>
<             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.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
<             <filename role="package">www/apache13-modperl</filename>.
<             <application>mod_perl</application> 2.0 is available in
---
>           <para><application>mod_perl</application> 2.0 only works with
>             <application>Apache</application> 2.X, and is available in
Index: handbook/security/chapter.sgml
===================================================================
RCS file: /usr/local/ncvs/doc/en_US.ISO8859-1/books/handbook/security/chapter.sgml,v
retrieving revision 1.340
diff -r1.340 chapter.sgml
2354c2354
<       <filename role="package">www/apache13-ssl</filename>, and
---
>       <filename role="package">www/apache22</filename>, and
>Release-Note:
>Audit-Trail:

From: Jason Helfman <jhelfman@e-e.com>
To: bug-followup@freebsd.org
Cc:  
Subject: Re: docs/162494: books/porters-handbook,handbook: follow
 deprecatation of apache13 in documentation
Date: Sat, 12 Nov 2011 22:20:41 -0800

 --17pEHd4RhPHOinZp
 Content-Type: text/plain; charset=us-ascii; format=flowed
 Content-Disposition: inline
 
 better diff format attached.
 -jgh
 
 -- 
 Jason Helfman
 System Administrator
 experts-exchange.com
 http://www.experts-exchange.com/M_4830110.html
 E4AD 7CF1 1396 27F6 79DD  4342 5E92 AD66 8C8C FBA5
 
 --17pEHd4RhPHOinZp
 Content-Type: text/plain; charset=us-ascii
 Content-Disposition: attachment; filename="patch.txt"
 
 Index: porters-handbook/book.sgml
 ===================================================================
 RCS file: /usr/local/ncvs/doc/en_US.ISO8859-1/books/porters-handbook/book.sgml,v
 retrieving revision 1.1119
 diff -u -r1.1119 book.sgml
 --- porters-handbook/book.sgml	4 Nov 2011 14:28:43 -0000	1.1119
 +++ porters-handbook/book.sgml	8 Nov 2011 01:29:11 -0000
 @@ -14766,8 +14766,8 @@
  	      <listitem>
  		<para>does not work with some other currently installed
  		  port (for instance, the port depends on
 -		  <filename role="package">www/apache21</filename> but
 -		  <filename role="package">www/apache13</filename>
 +		  <filename role="package">www/apache20</filename> but
 +		  <filename role="package">www/apache22</filename>
  		  is installed)</para>
  	      </listitem>
  	    </itemizedlist>
 Index: handbook/config/chapter.sgml
 ===================================================================
 RCS file: /usr/local/ncvs/doc/en_US.ISO8859-1/books/handbook/config/chapter.sgml,v
 retrieving revision 1.247
 diff -u -r1.247 chapter.sgml
 --- handbook/config/chapter.sgml	15 Jun 2011 13:44:49 -0000	1.247
 +++ handbook/config/chapter.sgml	8 Nov 2011 01:29:11 -0000
 @@ -352,7 +352,7 @@
        may be necessary to configure the software in a manner which
        will allow it to be started upon system initialization.  Services,
        such as <filename role="package">mail/postfix</filename> or
 -      <filename role="package">www/apache13</filename> are just two
 +      <filename role="package">www/apache22</filename> are just two
        of the many software packages which may be started during system
        initialization.  This section explains the procedures available
        for starting third party software.</para>
 Index: handbook/mac/chapter.sgml
 ===================================================================
 RCS file: /usr/local/ncvs/doc/en_US.ISO8859-1/books/handbook/mac/chapter.sgml,v
 retrieving revision 1.75
 diff -u -r1.75 chapter.sgml
 --- handbook/mac/chapter.sgml	29 Sep 2009 14:20:43 -0000	1.75
 +++ handbook/mac/chapter.sgml	8 Nov 2011 01:29:11 -0000
 @@ -1651,7 +1651,7 @@
        so will result in errors.  While at it, ensure that the
        <filename role="package">net-mngt/nagios-plugins</filename>,
        <filename role="package">net-mngt/nagios</filename>, and
 -      <filename role="package">www/apache13</filename> ports are all
 +      <filename role="package">www/apache22</filename> ports are all
        installed, configured, and working correctly.</para>
  
      <sect2>
 Index: handbook/network-servers/chapter.sgml
 ===================================================================
 RCS file: /usr/local/ncvs/doc/en_US.ISO8859-1/books/handbook/network-servers/chapter.sgml,v
 retrieving revision 1.138
 diff -u -r1.138 chapter.sgml
 --- handbook/network-servers/chapter.sgml	18 Oct 2011 14:10:18 -0000	1.138
 +++ handbook/network-servers/chapter.sgml	11 Nov 2011 21:23:14 -0000
 @@ -4346,17 +4346,17 @@
          included on your FreeBSD installation media.  If you did not
          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/apache22</filename> port.</para>
  
        <para>Once <application>Apache</application> has been installed
          successfully, it must be configured.</para>
  
 -      <note><para>This section covers version 1.3.X of the
 +      <note><para>This section covers version 2.2.X of the
          <application>Apache HTTP Server</application> as that is the
 -        most widely used version for &os;.  <application>Apache</application>&nbsp;2.X introduces many
 -        new technologies but they are not discussed here.  For more
 -        information about <application>Apache</application>&nbsp;2.X, please see <ulink
 +        most widely used version for &os;.  <application>Apache
 +        </application>&nbsp;2.X introduces many new technologies but
 +        they are not discussed here.  For more information about
 +        <application>Apache</application>&nbsp;2.X, please see <ulink
          url="http://httpd.apache.org/"></ulink>.</para></note>
  
      </sect2>
 @@ -4369,119 +4369,19 @@
  
        <para>The main <application>Apache HTTP Server</application> configuration file is
  	installed as
 -	<filename>/usr/local/etc/apache/httpd.conf</filename> on &os;.
 +	<filename>/usr/local/etc/apache22/httpd.conf</filename> on &os;.
  	This file is a typical &unix; text configuration file with
  	comment lines beginning with the <literal>#</literal>
  	character.  A comprehensive description of all possible
 -	configuration options is outside the scope of this book, so
 -	only the most frequently modified directives will be described
 -	here.</para>
 -
 -      <variablelist>
 -	<varlistentry>
 -	  <term><literal>ServerRoot "/usr/local"</literal></term>
 -
 -	  <listitem>
 -	    <para>This specifies the default directory hierarchy for
 -	    the <application>Apache</application> installation.  Binaries are stored in the
 -	    <filename class="directory">bin</filename> and
 -	    <filename class="directory">sbin</filename> subdirectories
 -	    of the server root, and configuration files are stored in
 -	    <filename class="directory">etc/apache</filename>.</para>
 -	  </listitem>
 -	</varlistentry>
 -
 -	<varlistentry>
 -	  <term><literal>ServerAdmin you@your.address</literal></term>
 -
 -	  <listitem>
 -	    <para>The address to which problems with the server should
 -	      be emailed.  This address appears on some
 -	      server-generated pages, such as error documents.</para>
 -	  </listitem>
 -	</varlistentry>
 -
 -	<varlistentry>
 -	  <term><literal>ServerName www.example.com</literal></term>
 -
 -	  <listitem>
 -	    <para><literal>ServerName</literal> allows you to set a host name which is
 -	      sent back to clients for your server if it is different
 -	      to the one that the host is configured with (i.e., use <hostid>www</hostid>
 -	      instead of the host's real name).</para>
 -	  </listitem>
 -	</varlistentry>
 -
 -	<varlistentry>
 -	  <term><literal>DocumentRoot "/usr/local/www/data"</literal></term>
 -
 -	  <listitem>
 -	    <para><literal>DocumentRoot</literal>: The directory out of which you will
 -	      serve your documents. By default, all requests are taken
 -	      from this directory, but symbolic links and aliases may
 -	      be used to point to other locations.</para>
 -	  </listitem>
 -	</varlistentry>
 -      </variablelist>
 -
 -      <para>It is always a good idea to make backup copies of your
 -	<application>Apache</application> configuration file before making changes.  Once you are
 -	satisfied with your initial configuration you are ready to
 -	start running <application>Apache</application>.</para>
 +	configuration options is outside the scope of this book, however
 +	the <ulink url="http://httpd.apache.org/docs/2.2/">Apache HTTP Server
 +	Documentation</ulink> is a great resource for configuring your
 +	web server.</para>
  
 -<!-- sect3 for performance tuning directives?  maxservers minservers -->
 -<!-- etc..?? -->
 -
 -<!-- Advanced configuration section.
 -
 -Performance tuning directives.
 -
 -Log file format -->
 -
 -    </sect2>
 -
 -    <sect2>
 -      <title>Running <application>Apache</application></title>
 -
 -      <indexterm><primary>Apache</primary>
 -	<secondary>starting or stopping</secondary></indexterm>
 -
 -      <para><application>Apache</application> does not run from the
 -        <application>inetd</application> super server as many other
 -        network servers do.  It is configured to run standalone for
 -        better performance for incoming HTTP requests from client web
 -        browsers.  A shell script wrapper is included to make
 -        starting, stopping, and restarting the server as simple as
 -        possible.  To start up <application>Apache</application> for
 -        the first time, just run:</para>
 -
 -      <screen>&prompt.root; <userinput>/usr/local/sbin/apachectl start</userinput></screen>
 -
 -      <para>You can stop the server at any time by typing:</para>
 -
 -      <screen>&prompt.root; <userinput>/usr/local/sbin/apachectl stop</userinput></screen>
 -
 -      <para>After making changes to the configuration file for any
 -      reason, you will need to restart the server:</para>
 -
 -      <screen>&prompt.root; <userinput>/usr/local/sbin/apachectl restart</userinput></screen>
 -
 -      <para>To restart <application>Apache</application> without
 -	aborting current connections, run:</para>
 -
 -      <screen>&prompt.root; <userinput>/usr/local/sbin/apachectl graceful</userinput></screen>
 -
 -      <para>Additional information available at
 -	&man.apachectl.8; manual page.</para>
 -
 -      <para>To launch <application>Apache</application> at system
 +      <para>To launch <application>Apache 2.2</application> at system
          startup, add the following line to
          <filename>/etc/rc.conf</filename>:</para>
  
 -      <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
 @@ -4490,110 +4390,8 @@
  	may specify them with an additional line in
  	<filename>rc.conf</filename>:</para>
  
 -      <programlisting>apache_flags=""</programlisting>
 -
 -      <para>Now that the web server is running, you can view your web
 -        site by pointing a web browser to
 -        <literal>http://localhost/</literal>.  The default web page
 -        that is displayed is
 -        <filename>/usr/local/www/data/index.html</filename>.</para>
 -
 -    </sect2>
 -
 -    <sect2>
 -      <title>Virtual Hosting</title>
 -
 -      <para><application>Apache</application> supports two different
 -	types of Virtual Hosting. The first method is Name-based
 -	Virtual Hosting. Name-based virtual hosting uses the clients
 -	HTTP/1.1 headers to figure out the hostname. This allows many
 -	different domains to share the same IP address.</para>
 -
 -      <para>To setup <application>Apache</application> to use
 -        Name-based Virtual Hosting add an entry like the following to
 -        your <filename>httpd.conf</filename>:</para>
 -
 -      <programlisting>NameVirtualHost *</programlisting>
 -
 -      <para>If your webserver was named <hostid role="fqdn">www.domain.tld</hostid> and
 -        you wanted to setup a virtual domain for
 -        <hostid role="fqdn">www.someotherdomain.tld</hostid> then you would add
 -        the following entries to
 -        <filename>httpd.conf</filename>:</para>
 -
 -      <screen>&lt;VirtualHost *&gt;
 -ServerName www.domain.tld
 -DocumentRoot /www/domain.tld
 -&lt;/VirtualHost&gt;
 -
 -&lt;VirtualHost *&gt;
 -ServerName www.someotherdomain.tld
 -DocumentRoot /www/someotherdomain.tld
 -&lt;/VirtualHost&gt;</screen>
 -
 -      <para>Replace the addresses with the addresses you want to use
 -        and the path to the documents with what you are using.</para>
 -
 -      <para>For more information about setting up virtual hosts,
 -        please consult the official <application>Apache</application>
 -        documentation at: <ulink
 -        url="http://httpd.apache.org/docs/vhosts/"></ulink>.</para>
 -
 -    </sect2>
 -
 -    <sect2>
 -      <title>Apache Modules</title>
 -
 -      <indexterm><primary>Apache</primary>
 -	<secondary>modules</secondary></indexterm>
 -
 -      <para>There are many different <application>Apache</application> modules available to add
 -        functionality to the basic server.  The FreeBSD Ports
 -        Collection provides an easy way to install
 -        <application>Apache</application> together with some of the
 -        more popular add-on modules.</para>
 -
 -      <sect3>
 -        <title>mod_ssl</title>
 -
 -	<indexterm><primary>web servers</primary>
 -          <secondary>secure</secondary></indexterm>
 -	<indexterm><primary>SSL</primary></indexterm>
 -	<indexterm><primary>cryptography</primary></indexterm>
 -
 -        <para>The <application>mod_ssl</application> module uses the OpenSSL library to provide
 -          strong cryptography via the Secure Sockets Layer (SSL v2/v3)
 -          and Transport Layer Security (TLS v1) protocols.  This
 -          module provides everything necessary to request a signed
 -          certificate from a trusted certificate signing authority so
 -          that you can run a secure web server on &os;.</para>
 -
 -	<para>If you have not yet installed
 -	  <application>Apache</application>, then a version of <application>Apache</application>
 -	  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/apache22</filename> port,
 -	  where it is enabled by default.</para>
 -
 -<!-- XXX add more information about configuring mod_ssl here. -->
 -<!-- Generating keys, getting the key signed, setting up your secure -->
 -<!-- web server! -->
 -      </sect3>
 -
 -      <sect3>
 -        <title>Language Bindings</title>
 -
 -        <para>There are Apache modules for most major scripting
 -          languages.  These modules typically make it possible to
 -          write <application>Apache</application> modules entirely in
 -          a scripting language.  They are also often used as a
 -          persistent interpreter embedded into the server that avoids
 -          the overhead of starting an external interpreter and the
 -          startup-time penalty for dynamic websites, as described in
 -          the next section.</para>
 -      </sect3>
 -    </sect2>
 +      <programlisting>apache22_flags=""</programlisting>
 +      </sect2>
  
      <sect2>
        <title>Dynamic Websites</title>
 @@ -4692,17 +4490,8 @@
  	  overhead of starting an external interpreter and the penalty
  	  of Perl start-up time.</para>
  
 -          <para><application>mod_perl</application> is available a few
 -            different ways.  To use <application>mod_perl</application>
 -            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.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
 -            <filename role="package">www/apache13-modperl</filename>.
 -            <application>mod_perl</application> 2.0 is available in
 +          <para><application>mod_perl</application> 2.0 only works with
 +            <application>Apache</application> 2.X, and is available in
              <filename role="package">www/mod_perl2</filename>.</para>
          </sect3>
  
 Index: handbook/security/chapter.sgml
 ===================================================================
 RCS file: /usr/local/ncvs/doc/en_US.ISO8859-1/books/handbook/security/chapter.sgml,v
 retrieving revision 1.340
 diff -u -r1.340 chapter.sgml
 --- handbook/security/chapter.sgml	15 Jun 2011 22:34:36 -0000	1.340
 +++ handbook/security/chapter.sgml	8 Nov 2011 01:29:11 -0000
 @@ -2351,7 +2351,7 @@
      <para>Some uses of <application>OpenSSL</application> may include
        encrypted authentication of mail clients, web based transactions
        such as credit card payments and more.  Many ports such as
 -      <filename role="package">www/apache13-ssl</filename>, and
 +      <filename role="package">www/apache22</filename>, and
        <filename role="package">mail/claws-mail</filename>
        will offer compilation support for building with
        <application>OpenSSL</application>.</para>
 
 --17pEHd4RhPHOinZp--
Responsible-Changed-From-To: freebsd-doc->gjb 
Responsible-Changed-By: gjb 
Responsible-Changed-When: Fri Dec 9 02:41:30 UTC 2011 
Responsible-Changed-Why:  
I'll take a look at this. 


http://www.freebsd.org/cgi/query-pr.cgi?pr=162494 
State-Changed-From-To: open->patched 
State-Changed-By: gjb 
State-Changed-When: Tue Jan 31 14:15:18 UTC 2012 
State-Changed-Why:  
Committed the majority of the updates.  I am not sure we should 
entirely remove the details from the network-servers chapter.  I'll 
take a look at the details and changes between apache13 and apache22 
there. 


http://www.freebsd.org/cgi/query-pr.cgi?pr=162494 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: docs/162494: commit references a PR
Date: Tue, 31 Jan 2012 14:15:16 +0000 (UTC)

 gjb         2012-01-31 14:15:00 UTC
 
   FreeBSD doc repository
 
   Modified files:
     en_US.ISO8859-1/books/handbook/config chapter.sgml 
     en_US.ISO8859-1/books/handbook/mac chapter.sgml 
     en_US.ISO8859-1/books/handbook/security chapter.sgml 
     en_US.ISO8859-1/books/porters-handbook book.sgml 
   Log:
   Replace references to www/apache13 with www/apache22.
   A follow up to the network-servers chapter will be committed sometime
   soon.
   
   PR:             162494
   Submitted by:   jgh (original version)
   
   Revision  Changes    Path
   1.250     +1 -1      doc/en_US.ISO8859-1/books/handbook/config/chapter.sgml
   1.76      +1 -1      doc/en_US.ISO8859-1/books/handbook/mac/chapter.sgml
   1.345     +1 -1      doc/en_US.ISO8859-1/books/handbook/security/chapter.sgml
   1.1158    +2 -2      doc/en_US.ISO8859-1/books/porters-handbook/book.sgml
 _______________________________________________
 cvs-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/cvs-all
 To unsubscribe, send any mail to "cvs-all-unsubscribe@freebsd.org"
 
State-Changed-From-To: patched->closed 
State-Changed-By: gjb 
State-Changed-When: Fri Feb 3 05:30:27 UTC 2012 
State-Changed-Why:  
Updated documentation will be reflected in the Handbook after the next build. 


http://www.freebsd.org/cgi/query-pr.cgi?pr=162494 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: docs/162494: commit references a PR
Date: Fri,  3 Feb 2012 05:30:30 +0000 (UTC)

 gjb         2012-02-03 05:30:16 UTC
 
   FreeBSD doc repository
 
   Modified files:
     en_US.ISO8859-1/books/handbook/network-servers chapter.sgml 
   Log:
   Update network-servers to reflect apache13 -> apache22 changes.
   
   PR:             162494
   Submitted by:   jgh
   
   Revision  Changes    Path
   1.139     +65 -74    doc/en_US.ISO8859-1/books/handbook/network-servers/chapter.sgml
 _______________________________________________
 cvs-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/cvs-all
 To unsubscribe, send any mail to "cvs-all-unsubscribe@freebsd.org"
 
>Unformatted:
