From owner-svn-doc-head@FreeBSD.ORG  Sun Dec  8 16:22:13 2013
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 07493829;
 Sun,  8 Dec 2013 16:22:13 +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))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id CCA711E40;
 Sun,  8 Dec 2013 16:22:12 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rB8GMCk9044814;
 Sun, 8 Dec 2013 16:22:12 GMT (envelope-from wblock@svn.freebsd.org)
Received: (from wblock@localhost)
 by svn.freebsd.org (8.14.7/8.14.7/Submit) id rB8GMCxa044812;
 Sun, 8 Dec 2013 16:22:12 GMT (envelope-from wblock@svn.freebsd.org)
Message-Id: <201312081622.rB8GMCxa044812@svn.freebsd.org>
From: Warren Block <wblock@FreeBSD.org>
Date: Sun, 8 Dec 2013 16:22:12 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r43300 - 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-head@freebsd.org
X-Mailman-Version: 2.1.17
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: Sun, 08 Dec 2013 16:22:13 -0000

Author: wblock
Date: Sun Dec  8 16:22:12 2013
New Revision: 43300
URL: http://svnweb.freebsd.org/changeset/doc/43300

Log:
  Add "twisted" entry to uses.xml, remove Zope entry from main book.
  Modified version of patch supplied.
  
  Submitted by:	Marcus von Appen <mva@FreeBSD.org> in -doc

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

Modified: head/en_US.ISO8859-1/books/porters-handbook/book.xml
==============================================================================
--- head/en_US.ISO8859-1/books/porters-handbook/book.xml	Sun Dec  8 16:07:06 2013	(r43299)
+++ head/en_US.ISO8859-1/books/porters-handbook/book.xml	Sun Dec  8 16:22:12 2013	(r43300)
@@ -7887,21 +7887,6 @@ _DOCSDIR=	.
 		distribution).</entry>
 	    </row>
 
-	    <row>
-	      <entry><varname>USE_TWISTED</varname></entry>
-	      <entry>Add dependency on twistedCore.  The list of
-		required components can be specified as a value of
-		this variable.  Example:
-		<literal>web lore pair flow</literal></entry>
-	    </row>
-
-	    <row>
-	      <entry><varname>USE_ZOPE</varname></entry>
-	      <entry>Add dependency on Zope, a web application
-		platform.  Change Python dependency to Python 2.7.
-		Set <varname>ZOPEBASEDIR</varname> containing a
-		directory with Zope installation.</entry>
-	    </row>
 	  </tbody>
 	</tgroup>
       </table>

Modified: head/en_US.ISO8859-1/books/porters-handbook/uses.xml
==============================================================================
--- head/en_US.ISO8859-1/books/porters-handbook/uses.xml	Sun Dec  8 16:07:06 2013	(r43299)
+++ head/en_US.ISO8859-1/books/porters-handbook/uses.xml	Sun Dec  8 16:22:12 2013	(r43300)
@@ -387,6 +387,35 @@
 </row>
 
 <row>
+  <entry><literal>twisted</literal></entry>
+  <entry>(none), <literal>ARGS</literal></entry>
+
+  <entry>Add a dependency on <application>twistedCore</application>.
+    The list of required components can be specified as a value of
+    this variable. <literal>ARGS</literal> can be one of:
+
+    <itemizedlist>
+      <listitem>
+	<para><literal>build</literal>: add
+	  <application>twistedCore</application> or any specified
+	  component as build dependency.</para>
+      </listitem>
+
+      <listitem>
+	<para><literal>run</literal>: add
+	  <application>twistedCore</application> or any specified
+	  component as run dependency.</para>
+      </listitem>
+    </itemizedlist>
+
+    Besides <literal>build</literal> and <literal>run</literal>, one
+    or more other supported <application>twisted</application>
+    components can be specified.  Supported values are listed in
+    <filename>Uses/twisted.mk</filename>.
+  </entry>
+</row>
+
+<row>
   <entry><literal>uidfix</literal></entry>
   <entry>(none)</entry>
   <entry>Changes some default behavior (mostly variables) of the build