From owner-svn-doc-all@FreeBSD.ORG  Sat Jun  8 15:43:44 2013
Return-Path: <owner-svn-doc-all@FreeBSD.ORG>
Delivered-To: svn-doc-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by hub.freebsd.org (Postfix) with ESMTP id 062CF619;
 Sat,  8 Jun 2013 15:43:44 +0000 (UTC)
 (envelope-from pluknet@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id EC40511F0;
 Sat,  8 Jun 2013 15:43:43 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r58FhhVc007731;
 Sat, 8 Jun 2013 15:43:43 GMT (envelope-from pluknet@svn.freebsd.org)
Received: (from pluknet@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r58FhhoJ007730;
 Sat, 8 Jun 2013 15:43:43 GMT (envelope-from pluknet@svn.freebsd.org)
Message-Id: <201306081543.r58FhhoJ007730@svn.freebsd.org>
From: Sergey Kandaurov <pluknet@FreeBSD.org>
Date: Sat, 8 Jun 2013 15:43:43 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r41877 - head/en_US.ISO8859-1/books/porters-handbook
X-SVN-Group: doc-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-doc-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the entire doc trees \(except for &quot;
 user&quot; , &quot; projects&quot; , and &quot; translations&quot;
 \)" <svn-doc-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-doc-all>,
 <mailto:svn-doc-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-doc-all>
List-Post: <mailto:svn-doc-all@freebsd.org>
List-Help: <mailto:svn-doc-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-doc-all>,
 <mailto:svn-doc-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 08 Jun 2013 15:43:44 -0000

Author: pluknet
Date: Sat Jun  8 15:43:43 2013
New Revision: 41877
URL: http://svnweb.freebsd.org/changeset/doc/41877

Log:
  - Adjust apache versions
  - Remove deprecated (and dead) USE_APACHE2
  
  PR:		docs/177484
  Submitted by:	ohauer

Modified:
  head/en_US.ISO8859-1/books/porters-handbook/book.xml

Modified: head/en_US.ISO8859-1/books/porters-handbook/book.xml
==============================================================================
--- head/en_US.ISO8859-1/books/porters-handbook/book.xml	Sat Jun  8 15:31:51 2013	(r41876)
+++ head/en_US.ISO8859-1/books/porters-handbook/book.xml	Sat Jun  8 15:43:43 2013	(r41877)
@@ -7373,8 +7373,8 @@ USE_QT4=	moc_build qmake_build rcc_build
 		<entry><makevar>USE_APACHE</makevar></entry>
 		<entry>The port requires Apache.  Possible values:
 		  <literal>yes</literal> (gets any version),
-		  <literal>20</literal>, <literal>22</literal>,
-		  <literal>20-22</literal>, <literal>20+</literal>,
+		  <literal>22</literal>, <literal>24</literal>,
+		  <literal>22-24</literal>, <literal>22+</literal>,
 		  etc.  The default APACHE version is
 		  <literal>22</literal>.  More details are available
 		  in <filename>ports/Mk/bsd.apache.mk</filename> and
@@ -7383,12 +7383,6 @@ USE_QT4=	moc_build qmake_build rcc_build
 	      </row>
 
 	      <row>
-		<entry><makevar>WITH_APACHE2</makevar></entry>
-		<entry>This variable is deprecated and should
-		  not be used any more.</entry>
-	      </row>
-
-	      <row>
 		<entry><makevar>APXS</makevar></entry>
 		<entry>Full path to the <command>apxs</command>
 		  binary.  Can be overridden in your port.</entry>
@@ -7406,8 +7400,8 @@ USE_QT4=	moc_build qmake_build rcc_build
 		  (read-only variable).  This variable is only
 		  available after inclusion of
 		  <filename>bsd.port.pre.mk</filename>.  Possible
-		  values: <literal>20</literal>,
-		  <literal>22</literal>.</entry>
+		  values: <literal>22</literal>,
+		  <literal>24</literal>.</entry>
 	      </row>
 
 	      <row>