From owner-svn-doc-head@FreeBSD.ORG  Mon May 12 14:41:46 2014
Return-Path: <owner-svn-doc-head@FreeBSD.ORG>
Delivered-To: svn-doc-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 901C6F21;
 Mon, 12 May 2014 14:41:46 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 623872CBD;
 Mon, 12 May 2014 14:41:46 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s4CEfkkY070924;
 Mon, 12 May 2014 14:41:46 GMT (envelope-from rene@svn.freebsd.org)
Received: (from rene@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s4CEfkMX070923;
 Mon, 12 May 2014 14:41:46 GMT (envelope-from rene@svn.freebsd.org)
Message-Id: <201405121441.s4CEfkMX070923@svn.freebsd.org>
From: Rene Ladan <rene@FreeBSD.org>
Date: Mon, 12 May 2014 14:41:46 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r44815 - head/en_US.ISO8859-1/books/handbook/security
X-SVN-Group: doc-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-doc-head@freebsd.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: SVN commit messages for the doc tree for head
 <svn-doc-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-doc-head>,
 <mailto:svn-doc-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-doc-head/>
List-Post: <mailto:svn-doc-head@freebsd.org>
List-Help: <mailto:svn-doc-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-doc-head>,
 <mailto:svn-doc-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 12 May 2014 14:41:46 -0000

Author: rene
Date: Mon May 12 14:41:45 2014
New Revision: 44815
URL: http://svnweb.freebsd.org/changeset/doc/44815

Log:
  Mention that OpenSSL is provided both by the base system and as a port,
  describe the knobs to set to select either version.
  
  This was formerly part of a section in the Porters Handbook about knobs,
  which was removed in r44808
  
  Reviewed by:	mat

Modified:
  head/en_US.ISO8859-1/books/handbook/security/chapter.xml

Modified: head/en_US.ISO8859-1/books/handbook/security/chapter.xml
==============================================================================
--- head/en_US.ISO8859-1/books/handbook/security/chapter.xml	Mon May 12 14:18:11 2014	(r44814)
+++ head/en_US.ISO8859-1/books/handbook/security/chapter.xml	Mon May 12 14:41:45 2014	(r44815)
@@ -1825,12 +1825,27 @@ kadmind5_server_enable="YES"</programlis
       <package>www/apache24</package> and
       <package>databases/postgresql91-server</package>, include a
       compile option for building with
-      <application>OpenSSL</application>.  If selected, the port will
-      add support using the <package>security/openssl</package> port.
-      To instead have the port compile against the built in version of
-      <application>OpenSSL</application>, include
-      <varname>WITH_OPENSSL_BASE</varname> when compiling in
-      <application>OpenSSL</application> support.</para>
+      <application>OpenSSL</application>.</para>
+
+    <para>&os; provides two versions of
+      <application>OpenSSL</application>: one in the base system and
+      one in the Ports Collection.  Users can choose which version to
+      use by default for other ports using the following knobs:</para>
+
+    <itemizedlist>
+      <listitem>
+	<para>WITH_OPENSSL_PORT: when set, the port will use
+	  <application>OpenSSL</application> from the
+	  <package>security/openssl</package> port, even if the
+	  version in the base system is up to date or newer.</para>
+      </listitem>
+
+      <listitem>
+	<para>WITH_OPENSSL_BASE: when set, the port will compile
+	  against <application>OpenSSL</application> provided by the
+	  base system.</para>
+      </listitem>
+    </itemizedlist>
 
     <para>Another common use of <application>OpenSSL</application> is
       to provide certificates for use with software applications.