From owner-svn-doc-head@FreeBSD.ORG Sun Dec 8 02:23:49 2013 Return-Path: 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 572DA259; Sun, 8 Dec 2013 02:23:49 +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 42DE4193F; Sun, 8 Dec 2013 02:23:49 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rB82NnCU040148; Sun, 8 Dec 2013 02:23:49 GMT (envelope-from eadler@svn.freebsd.org) Received: (from eadler@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rB82Nn7i040147; Sun, 8 Dec 2013 02:23:49 GMT (envelope-from eadler@svn.freebsd.org) Message-Id: <201312080223.rB82Nn7i040147@svn.freebsd.org> From: Eitan Adler Date: Sun, 8 Dec 2013 02:23:49 +0000 (UTC) To: doc-committers@freebsd.org, svn-doc-all@freebsd.org, svn-doc-head@freebsd.org Subject: svn commit: r43292 - head/en_US.ISO8859-1/articles/committers-guide 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 List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 08 Dec 2013 02:23:49 -0000 Author: eadler Date: Sun Dec 8 02:23:48 2013 New Revision: 43292 URL: http://svnweb.freebsd.org/changeset/doc/43292 Log: Misc fixes to the merging section of the committer's guide: - add xml:id to section header - remove period of title - correctly capitalize title - adding missing ',' Reported by: lint^W wblock Modified: head/en_US.ISO8859-1/articles/committers-guide/article.xml Modified: head/en_US.ISO8859-1/articles/committers-guide/article.xml ============================================================================== --- head/en_US.ISO8859-1/articles/committers-guide/article.xml Sat Dec 7 23:00:33 2013 (r43291) +++ head/en_US.ISO8859-1/articles/committers-guide/article.xml Sun Dec 8 02:23:48 2013 (r43292) @@ -1121,11 +1121,12 @@ fact it had not been. - - Selecting the Source and Target for stable/10 and - newer. + + Selecting the Source and Target for + <literal>stable/10</literal> and Newer - Starting with the stable/10 branch all merges should be + Starting with the stable/10 + branch, all merges should be merged to and committed from the root of the branch. All merges should look like: @@ -1137,11 +1138,9 @@ occurs. - - - - Selecting the Source and Target for stable/9 and - older. + + Selecting the Source and Target for + <literal>stable/9</literal> and Older Because of mergeinfo propagation, it is important to choose the source and target for the merge carefully to From owner-svn-doc-head@FreeBSD.ORG Sun Dec 8 15:43:22 2013 Return-Path: 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 A627F28F; Sun, 8 Dec 2013 15:43:22 +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 91D831B41; Sun, 8 Dec 2013 15:43:22 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rB8FhM48030241; Sun, 8 Dec 2013 15:43:22 GMT (envelope-from wblock@svn.freebsd.org) Received: (from wblock@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rB8FhMr8030240; Sun, 8 Dec 2013 15:43:22 GMT (envelope-from wblock@svn.freebsd.org) Message-Id: <201312081543.rB8FhMr8030240@svn.freebsd.org> From: Warren Block Date: Sun, 8 Dec 2013 15:43:22 +0000 (UTC) To: doc-committers@freebsd.org, svn-doc-all@freebsd.org, svn-doc-head@freebsd.org Subject: svn commit: r43298 - head/en_US.ISO8859-1/books/fdp-primer/docbook-markup 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 List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 08 Dec 2013 15:43:22 -0000 Author: wblock Date: Sun Dec 8 15:43:22 2013 New Revision: 43298 URL: http://svnweb.freebsd.org/changeset/doc/43298 Log: Correct example showing markup of ports to use tag. Modified: head/en_US.ISO8859-1/books/fdp-primer/docbook-markup/chapter.xml Modified: head/en_US.ISO8859-1/books/fdp-primer/docbook-markup/chapter.xml ============================================================================== --- head/en_US.ISO8859-1/books/fdp-primer/docbook-markup/chapter.xml Sun Dec 8 08:02:51 2013 (r43297) +++ head/en_US.ISO8859-1/books/fdp-primer/docbook-markup/chapter.xml Sun Dec 8 15:43:22 2013 (r43298) @@ -1594,20 +1594,17 @@ This is the file called 'foo2' To include the name of a program from the &os; Ports Collection in the document, use the - filename tag with the - role attribute set to - package. Since ports can be installed in + package tag. Since ports can be installed in any number of locations, only include the category and the port name; do not include /usr/ports. - <tag>filename</tag> Tag with - <literal>package</literal> Role + <tag>package</tag> Tag Usage: - paraInstall the filename role="package"net/wiresharkfilename port to view network traffic.para + paraInstall the packagenet/wiresharkpackage port to view network traffic.para Appearance: From owner-svn-doc-head@FreeBSD.ORG Sun Dec 8 16:07:07 2013 Return-Path: Delivered-To: svn-doc-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 3AC1E593; Sun, 8 Dec 2013 16:07:07 +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 26B1A1D6D; Sun, 8 Dec 2013 16:07:07 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rB8G77JG037958; Sun, 8 Dec 2013 16:07:07 GMT (envelope-from wblock@svn.freebsd.org) Received: (from wblock@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rB8G770D037957; Sun, 8 Dec 2013 16:07:07 GMT (envelope-from wblock@svn.freebsd.org) Message-Id: <201312081607.rB8G770D037957@svn.freebsd.org> From: Warren Block Date: Sun, 8 Dec 2013 16:07:06 +0000 (UTC) To: doc-committers@freebsd.org, svn-doc-all@freebsd.org, svn-doc-head@freebsd.org Subject: svn commit: r43299 - head/en_US.ISO8859-1/books/fdp-primer/docbook-markup 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 List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 08 Dec 2013 16:07:07 -0000 Author: wblock Date: Sun Dec 8 16:07:06 2013 New Revision: 43299 URL: http://svnweb.freebsd.org/changeset/doc/43299 Log: Whitespace-only fixes, translators please ignore. Modified: head/en_US.ISO8859-1/books/fdp-primer/docbook-markup/chapter.xml Modified: head/en_US.ISO8859-1/books/fdp-primer/docbook-markup/chapter.xml ============================================================================== --- head/en_US.ISO8859-1/books/fdp-primer/docbook-markup/chapter.xml Sun Dec 8 15:43:22 2013 (r43298) +++ head/en_US.ISO8859-1/books/fdp-primer/docbook-markup/chapter.xml Sun Dec 8 16:07:06 2013 (r43299) @@ -183,14 +183,16 @@ &man.ls.1; &man.ls.1; Usage: &man.ls.1; is the manual page - for <command>ls</command>. + for + <command>ls</command>. &man.cp.1; &man.cp.1; Usage: The manual page for - <command>cp</command> is &man.cp.1;. + <command>cp</command> is + &man.cp.1;. @@ -272,8 +274,8 @@ &url.articles.committers-guide; Usage: A link to the <link xlink:href="&url.articles.committers-guide;"Committer's - Guide</link> - article. + Guide</link> + article. From owner-svn-doc-head@FreeBSD.ORG Sun Dec 8 16:22:13 2013 Return-Path: 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 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 List-Unsubscribe: , List-Archive: List-Post: List-Help: List-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 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). - - USE_TWISTED - Add dependency on twistedCore. The list of - required components can be specified as a value of - this variable. Example: - web lore pair flow - - - - USE_ZOPE - Add dependency on Zope, a web application - platform. Change Python dependency to Python 2.7. - Set ZOPEBASEDIR containing a - directory with Zope installation. - 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 @@ + twisted + (none), ARGS + + Add a dependency on twistedCore. + The list of required components can be specified as a value of + this variable. ARGS can be one of: + + + + build: add + twistedCore or any specified + component as build dependency. + + + + run: add + twistedCore or any specified + component as run dependency. + + + + Besides build and run, one + or more other supported twisted + components can be specified. Supported values are listed in + Uses/twisted.mk. + + + + uidfix (none) Changes some default behavior (mostly variables) of the build From owner-svn-doc-head@FreeBSD.ORG Sun Dec 8 16:29:38 2013 Return-Path: Delivered-To: svn-doc-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 46D559C7; Sun, 8 Dec 2013 16:29:38 +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 3260A1E6F; Sun, 8 Dec 2013 16:29:38 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rB8GTcCD045624; Sun, 8 Dec 2013 16:29:38 GMT (envelope-from wblock@svn.freebsd.org) Received: (from wblock@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rB8GTcaY045623; Sun, 8 Dec 2013 16:29:38 GMT (envelope-from wblock@svn.freebsd.org) Message-Id: <201312081629.rB8GTcaY045623@svn.freebsd.org> From: Warren Block Date: Sun, 8 Dec 2013 16:29:38 +0000 (UTC) To: doc-committers@freebsd.org, svn-doc-all@freebsd.org, svn-doc-head@freebsd.org Subject: svn commit: r43301 - 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 List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 08 Dec 2013 16:29:38 -0000 Author: wblock Date: Sun Dec 8 16:29:37 2013 New Revision: 43301 URL: http://svnweb.freebsd.org/changeset/doc/43301 Log: Convert old into new tags. Modified: head/en_US.ISO8859-1/books/porters-handbook/uses.xml 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:22:12 2013 (r43300) +++ head/en_US.ISO8859-1/books/porters-handbook/uses.xml Sun Dec 8 16:29:37 2013 (r43301) @@ -28,8 +28,7 @@ bison (none), build, run, both - Implies that the port uses devel/bison in one way or another. By + Implies that the port uses devel/bison in one way or another. By default, with no arguments or with the build argument, it implies bison as a build-time dependency, run implies a run-time dependency, @@ -42,7 +41,7 @@ (none) Prevents the port from installing charset.alias. This should be installed only - by converters/libiconv. + by converters/libiconv. CHARSETFIX_MAKEFILEIN can be set to a path relative to WRKSRC if charset.alias is not installed by @@ -101,7 +100,7 @@ Implies that the port uses the update-desktop-database from - devel/desktop-file-utils. An + devel/desktop-file-utils. An extra post-install step will be run without interfering with any post-install steps already in the port Makefile. Lines will be inserted into the @@ -144,8 +143,7 @@ fmake (none) - Implies that the port uses devel/fmake as build-time + Implies that the port uses devel/fmake as build-time dependency. @@ -163,7 +161,7 @@ (none), lib, build, run Implies that the port uses - devel/gettext in one way or + devel/gettext in one way or another. By default, with no arguments or with the lib argument, implies gettext with build-time and run-time @@ -175,8 +173,7 @@ gmake (none) - Implies that the port uses devel/gmake as build-time + Implies that the port uses devel/gmake as build-time dependency. @@ -187,7 +184,7 @@ Implies that the port uses iconv functions, either from the port - converters/libiconv as a + converters/libiconv as a build-time and run-time dependency, or from the base system on 10-CURRENT after a native iconv was committed in 254273. By default, with no arguments or with @@ -202,8 +199,7 @@ imake (none) - Implies that the port uses devel/imake as build-time + Implies that the port uses devel/imake as build-time dependency. @@ -238,11 +234,11 @@ motif (none) Implies that the ports uses - devel/open-motif as a library + devel/open-motif as a library dependency. End users can set WANT_LESSTIF for the dependency to be on - devel/lesstif instead of - devel/open-motif. + devel/lesstif instead of + devel/open-motif. @@ -301,8 +297,7 @@ (none), build, run, both - Implies that the port uses devel/pkgconf in one way or another. + Implies that the port uses devel/pkgconf in one way or another. With no arguments or with the build argument, it implies pkg-config as a build-time dependency; run implies a run-time dependency; @@ -313,11 +308,9 @@ pure (none), ffi - Implies that the port uses lang/pure in one way or another, + Implies that the port uses lang/pure in one way or another, but largely is used for building related pure ports. - With the ffi argument, it implies devel/pure-ffi + With the ffi argument, it implies devel/pure-ffi as a run-time dependency. @@ -325,8 +318,7 @@ qmail (none), build, run, both, vars - Implies that the port uses mail/qmail in one way or another. + Implies that the port uses mail/qmail in one way or another. With the build argument, it implies qmail as a build-time dependency. run implies a run-time dependency. Using no @@ -359,7 +351,7 @@ Implies that the port uses update-mime-database from - misc/shared-mime-info. This + misc/shared-mime-info. This uses will automatically add a post-install step in such a way that the port itself still can specify there own post-install step if needed. It also insert lines into the plist for package install @@ -462,7 +454,7 @@ zenoss (none) Implies the port uses - net-mgmt/zenoss in one way or + net-mgmt/zenoss in one way or another, but largely is used for building zenoss related zenpack ports. @@ -471,7 +463,7 @@ zope (none) Implies that the port uses - www/zope in one way or another, + www/zope in one way or another, but is largely used for building zope related ports. ZOPE_VERSION can be used by a port to indicate that a specific version of zope shall be used. From owner-svn-doc-head@FreeBSD.ORG Sun Dec 8 18:04:02 2013 Return-Path: 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 4BB45B5C; Sun, 8 Dec 2013 18:04:02 +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 359F51365; Sun, 8 Dec 2013 18:04:02 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rB8I42MF081307; Sun, 8 Dec 2013 18:04:02 GMT (envelope-from wblock@svn.freebsd.org) Received: (from wblock@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rB8I4296081305; Sun, 8 Dec 2013 18:04:02 GMT (envelope-from wblock@svn.freebsd.org) Message-Id: <201312081804.rB8I4296081305@svn.freebsd.org> From: Warren Block Date: Sun, 8 Dec 2013 18:04:02 +0000 (UTC) To: doc-committers@freebsd.org, svn-doc-all@freebsd.org, svn-doc-head@freebsd.org Subject: svn commit: r43302 - 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 List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 08 Dec 2013 18:04:02 -0000 Author: wblock Date: Sun Dec 8 18:04:01 2013 New Revision: 43302 URL: http://svnweb.freebsd.org/changeset/doc/43302 Log: Whitespace-only fixes, translators please ignore. 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:29:37 2013 (r43301) +++ head/en_US.ISO8859-1/books/porters-handbook/book.xml Sun Dec 8 18:04:01 2013 (r43302) @@ -9,11 +9,18 @@ $FreeBSD$ --> - - FreeBSD Porter's Handbook + + + + + FreeBSD Porter's Handbook - The FreeBSD Documentation Project + + The FreeBSD Documentation Project + $FreeBSD$ @@ -129,9 +136,10 @@ &prompt.root; echo DEVELOPER=yes >> /etc/make.conf - This setting enables the developer mode that - displays deprecation warnings and activates some further quality - checks on calling the make command. + This setting enables the developer mode + that displays deprecation warnings and activates some further + quality checks on calling the make + command. @@ -361,16 +369,16 @@ PLIST_DIRS= lib/X11/oneko The port can be deinstalled properly using the - deinstall target. This verifies - that the deinstall script works correctly. + deinstall target. This + verifies that the deinstall script works correctly. Make sure that make package can be run as a normal user (that is, not as - root). If that fails, - NEED_ROOT=yes must be added to the - port Makefile. + root). If that + fails, NEED_ROOT=yes must be added to + the port Makefile. @@ -413,11 +421,13 @@ PLIST_DIRS= lib/X11/onekoMake certain no warnings are shown in any of the stages. - Thorough automated testing can be done with ports-mgmt/tinderbox or - ports-mgmt/poudriere from the Ports Collection. - These applications maintain + Thorough automated testing can be done with + ports-mgmt/tinderbox or + ports-mgmt/poudriere from the Ports + Collection. These applications maintain jails where all of the steps shown above - can be tested without affecting the state of the host system. + can be tested without affecting the state of the host + system. @@ -455,7 +465,8 @@ PLIST_DIRS= lib/X11/onekoInclude your oneko.shar file in a bug report and send it with the &man.send-pr.1; program (see - Bug + Bug Reports and General Commentary for more information about &man.send-pr.1;). Be sure to classify the bug report as category ports and class @@ -485,12 +496,14 @@ PLIST_DIRS= lib/X11/onekoAfter you have submitted your port, please be patient. Sometimes it can take a few months before a port is included in &os;, although it might only take a few days. You can - view the list of ports + view the list of ports PRs waiting to be committed to &os;. Once we have looked at your port, we will get back to you if necessary, and put it in the tree. Your name will also - be added to the list of Additional + be added to the list of Additional FreeBSD Contributors and other files. @@ -518,20 +531,20 @@ PLIST_DIRS= lib/X11/oneko - The fetch target is run. The - fetch target is responsible for - making sure that the tarball exists locally in + The fetch target is run. + The fetch target is responsible + for making sure that the tarball exists locally in DISTDIR. If fetch cannot find the required files in DISTDIR it will look up the URL MASTER_SITES, which is set in the - Makefile, as well as our FTP mirrors - where we put distfiles as backup. It will then - attempt to fetch the named distribution file with - FETCH, assuming that the requesting - site has direct access to the Internet. If that succeeds, - it will save the file in DISTDIR for - future use and proceed. + Makefile, as well as our FTP mirrors where we put + distfiles as backup. It will then attempt to fetch the + named distribution file with FETCH, + assuming that the requesting site has direct access to the + Internet. If that succeeds, it will save the file in + DISTDIR for future use and + proceed. @@ -555,8 +568,8 @@ PLIST_DIRS= lib/X11/oneko - The configure target is run. - This can do any one of many different things. + The configure target is + run. This can do any one of many different things. @@ -582,11 +595,12 @@ PLIST_DIRS= lib/X11/oneko - The stage target is run. This - puts the final set of built files into a temporary directory - (STAGEDIR, see ). The hierarchy of this directory - mirrors that of the system on which the package will be - installed. + The stage target is run. + This puts the final set of built files into a temporary + directory (STAGEDIR, see + ). The hierarchy of this + directory mirrors that of the system on which the package + will be installed. @@ -680,8 +694,8 @@ PLIST_DIRS= lib/X11/onekoftp.FreeBSD.org; however, this is the least-preferred solution. The distfile must be placed into ~/public_distfiles/ of someone's - freefall account. Ask the person who commits - your port to do this. This person will also set + freefall account. Ask the person who + commits your port to do this. This person will also set MASTER_SITES to MASTER_SITE_LOCAL and MASTER_SITE_SUBDIR to their @@ -843,9 +857,9 @@ PLIST_DIRS= lib/X11/onekoUSES= dos2unix DOS2UNIX_REGEX= .*\.([ch]|cpp) - A similar option is DOS2UNIX_GLOB, which - invokes find for each element listed in - it. + A similar option is DOS2UNIX_GLOB, + which invokes find for each element listed + in it. USES= dos2unix DOS2UNIX_GLOB= *.c *.cpp *.h @@ -854,8 +868,8 @@ DOS2UNIX_GLOB= *.c *.cpp *.h.orig extension, and then modify the original one. The makepatch target - will write out an appropriate patch file to the files directory of the - port. + will write out an appropriate patch file to the + files directory of the port. @@ -1327,9 +1341,10 @@ PORTEPOCH= 1 - If the port can be built with different hardcoded defaults - (usually part of the directory name in a family of - ports), the + If the port can be built with different + hardcoded + defaults (usually part of the directory name in + a family of ports), the -compiled.specifics part should state the compiled-in defaults (the hyphen is optional). Examples are paper size and font @@ -1581,7 +1596,9 @@ PORTEPOCH= 1 afterstep* - Ports to support the AfterStep + + Ports to support the AfterStep window manager. @@ -1925,7 +1942,9 @@ PORTEPOCH= 1 palm - Software support for the Palm™ + + Software support for the Palm™ series. @@ -1954,7 +1973,9 @@ PORTEPOCH= 1 plan9* - Various programs from Plan9. + + Various programs from Plan9. @@ -1985,21 +2006,26 @@ PORTEPOCH= 1 python* - Software related to the Python + + Software related to the Python language. ruby* - Software related to the Ruby + Software related to the Ruby language. rubygems* - Ports of RubyGems + + Ports of RubyGems packages. @@ -2163,7 +2189,8 @@ PORTEPOCH= 1 zope* - Zope + Zope support. @@ -2283,15 +2310,16 @@ PORTEPOCH= 1 human languages), or preferably both. The rationale for this is that such a change creates a - fair - amount of work for both the committers and also - for all users who track changes to the Ports Collection. In + fair + amount of work for both the committers and also for + all users who track changes to the Ports Collection. In addition, proposed category changes just naturally seem to attract controversy. (Perhaps this is because there is no - clear consensus on when a category is too - big, nor whether categories should lend themselves - to browsing (and thus what number of categories would be an - ideal number), and so forth.) + clear consensus on when a category is + too big, nor whether categories should lend + themselves to browsing (and thus what number of categories + would be an ideal number), and so forth.) Here is the procedure: @@ -2356,8 +2384,9 @@ PORTEPOCH= 1 If that PR is approved, a committer will need to - follow the rest of the procedure that is - outlined in the Committer's Guide. + follow the rest of the procedure that is outlined + in the Committer's Guide. @@ -2812,9 +2841,12 @@ EXTRACT_ONLY= source.tar.gzsource2.tar.gz, which must be downloaded from two different sites. The port's Makefile would include lines like - . + . + + - Simplified Use of <literal>MASTER_SITES:n</literal> with One File Per Site @@ -2830,9 +2862,12 @@ DISTFILES= source1.tar.gz:source1 \ should be downloaded from ftp.example2.com. The Makefile would then be written like - . + . + + - Simplified Use of <literal>MASTER_SITES:n</literal> with More Than One File Per Site @@ -2872,9 +2907,11 @@ DISTFILES= source1.tar.gz:source1 \ postfixing purposes since they yield special meaning: default, all and ALL (they are used internally in - item ). + item ). Furthermore, DEFAULT is a special - purpose word (check item ). + purpose word (check item ). @@ -2891,7 +2928,8 @@ DISTFILES= source1.tar.gz:source1 \ elements with DEFAULT, you are just being redundant unless you want to have an element belonging to both DEFAULT and other - groups at the same time (check item ). + groups at the same time (check item ). The following examples are equivalent but the first one is preferred: @@ -2960,9 +2998,8 @@ DISTFILES= source1.tar.gz:source1 \ be terminated with the forward slash / character. If any elements belong to any groups, the group postfix - :n - must come right after the terminator - /. The + :n must come right after the + terminator /. The MASTER_SITES:n mechanism relies on the existence of the terminator / to avoid confusing elements @@ -2974,15 +3011,18 @@ DISTFILES= source1.tar.gz:source1 \ required before in both MASTER_SITE_SUBDIR and PATCH_SITE_SUBDIR elements, if - the postfix immediate preceding character is not - a / then :n + the postfix immediate preceding character is not a + / then :n will be considered a valid part of the element instead of a group postfix even if an element is postfixed with :n. See both - - and . + + and . - + Detailed Use of <literal>MASTER_SITES:n</literal> in @@ -3004,7 +3044,9 @@ DISTFILES= source1.tar.gz:source1 \ </itemizedlist> </example> - <example xml:id="ports-master-sites-n-example-detailed-use-complete-example-master-sites"> + <example + xml:id="ports-master-sites-n-example-detailed-use-complete-example-master-sites"> + <title>Detailed Use of <literal>MASTER_SITES:n</literal> with Comma Operator, Multiple Files, Multiple Sites and @@ -3199,9 +3241,12 @@ MASTER_SITE_SUBDIR= directory-trial:1 di <filename>bsd.sites.mk</filename>, e.g., <varname>MASTER_SITE_SOURCEFORGE</varname>?</para> - <para>See <xref linkend="ports-master-sites-n-example-detailed-use-master-site-sourceforge"/>.</para> + <para>See <xref + linkend="ports-master-sites-n-example-detailed-use-master-site-sourceforge"/>.</para> + + <example + xml:id="ports-master-sites-n-example-detailed-use-master-site-sourceforge"> - <example xml:id="ports-master-sites-n-example-detailed-use-master-site-sourceforge"> <title>Detailed Use of <literal>MASTER_SITES:n</literal> with <varname>MASTER_SITE_SOURCEFORGE</varname> @@ -3222,9 +3267,12 @@ DISTFILES= something.tar.gz:sourceforge< All examples were done with MASTER* variables but they work exactly the same for PATCH* ones as - can be seen in . + can be seen in . + + - Simplified Use of <literal>MASTER_SITES:n</literal> with <varname>PATCH_SITES</varname> @@ -3244,27 +3292,30 @@ PATCHFILES= patch1:test All current ports remain the same. The MASTER_SITES:n feature code is only activated if there are elements postfixed with - :n like - elements according to the aforementioned syntax rules, - especially as shown in item . + :n like elements according to the + aforementioned syntax rules, especially as shown in + item . - + The port targets remain the same: checksum, makesum, patch, configure, - build, etc. With the obvious - exceptions of do-fetch, + build, etc. With the + obvious exceptions of + do-fetch, fetch-list, master-sites and patch-sites. - do-fetch: deploys the - new grouping postfixed + do-fetch: deploys + the new grouping postfixed DISTFILES and PATCHFILES with their matching group elements within both @@ -3272,13 +3323,14 @@ PATCHFILES= patch1:test PATCH_SITES which use matching group elements within both MASTER_SITE_SUBDIR and - PATCH_SITE_SUBDIR. Check . + PATCH_SITE_SUBDIR. Check . fetch-list: works - like old fetch-list with - the exception that it groups just like + like old fetch-list + with the exception that it groups just like do-fetch. @@ -3286,10 +3338,10 @@ PATCHFILES= patch1:test master-sites and patch-sites: (incompatible with older versions) only return the - elements of group DEFAULT; in + elements of group DEFAULT; in fact, they execute targets - master-sites-default and - patch-sites-default + master-sites-default + and patch-sites-default respectively. Furthermore, using target either @@ -3299,7 +3351,8 @@ PATCHFILES= patch1:test MASTER_SITES or PATCH_SITES. Also, directly checking is not guaranteed to work in any - future versions. Check item + future versions. Check item for more information on these new port targets. @@ -3320,20 +3373,21 @@ PATCHFILES= patch1:test within MASTER_SITES and PATCH_SITES respectively. For instance, both - master-sites-DEFAULT and - patch-sites-DEFAULT will - return the elements of group + master-sites-DEFAULT + and patch-sites-DEFAULT + will return the elements of group DEFAULT, master-sites-test and - patch-sites-test of group - test, and thereon. + patch-sites-test of + group test, and thereon. - + There are new targets master-sites-all and - patch-sites-all which do - the work of the old + patch-sites-all which + do the work of the old master-sites and patch-sites ones. They return the elements of all groups as if they all @@ -3343,7 +3397,7 @@ PATCHFILES= patch1:test MASTER_SITE_OVERRIDE as there are groups defined within either DISTFILES or - PATCHFILES; respectively for + PATCHFILES; respectively for master-sites-all and patch-sites-all. @@ -3397,7 +3451,9 @@ PATCHFILES= patch1:test add the source distfiles to DISTFILES when PACKAGE_BUILDING is defined. - + + Use of <varname>ALWAYS_KEEP_DISTFILES</varname> @@ -3419,8 +3475,9 @@ ALWAYS_KEEP_DISTFILES= yes <varname>MAINTAINER</varname> - Set your mail-address here. Please. :-) + Set your mail-address here. Please. + + :-) Note that only a single address without the comment part is allowed as a MAINTAINER value. The @@ -3430,9 +3487,10 @@ ALWAYS_KEEP_DISTFILES= yes bsd.port.mk. The maintainer is responsible for keeping the port up to - date, and ensuring the port works correctly. - For a detailed description of the responsibilities of a port - maintainer, refer to the The + date, and ensuring the port works correctly. For a detailed + description of the responsibilities of a port maintainer, + refer to the The challenge for port maintainers section. Changes to the port will be sent to the maintainer of a @@ -3597,8 +3655,8 @@ ALWAYS_KEEP_DISTFILES= yes The dependency is checked twice, once from within the build target and then from within - the install target. Also, the name - of the dependency is put into the package so that + the install target. Also, the + name of the dependency is put into the package so that &man.pkg.add.1; will automatically install it if it is not on the user's system. @@ -3651,8 +3709,8 @@ ALWAYS_KEEP_DISTFILES= yes The dependency is checked from within the - install target. Also, the name of - the dependency is put into the package so that + install target. Also, the name + of the dependency is put into the package so that &man.pkg.add.1; will automatically install it if it is not on the user's system. The target part can be omitted if it is the same as @@ -3794,7 +3852,8 @@ ALWAYS_KEEP_DISTFILES= yes USES= feature[:arguments] - For the complete list of such values, please see . + For the complete list of such values, please see + . USES cannot be assigned after @@ -3983,7 +4042,8 @@ ALWAYS_KEEP_DISTFILES= yes Problems Caused by Automatic Dependencies Dependencies must be declared either explicitly or by - using the OPTIONS framework. + using the + OPTIONS framework. Using other methods like automatic detection complicates indexing, which causes problems for port and package management. @@ -4079,7 +4139,8 @@ LIB_DEPENDS= libbar.so:${PORTSDIR}/foo/b In the sole Makefile, you can use MASTERDIR to specify the directory where the rest of the files are. Also, use a variable as part of - PKGNAMESUFFIX + PKGNAMESUFFIX so the packages will have different names. This will be best demonstrated by an example. This is @@ -4132,11 +4193,11 @@ MASTERDIR= ${.CURDIR}/../xdvi300 If your port anchors its man tree somewhere other than PREFIX, you can use MANDIRS to specify those directories. Note - that the files corresponding to manual pages should be placed in - pkg-plist along with the rest of the files. - The purpose of MANDIRS is to enable automatic - compression of manual pages, therefore the file names should be - suffixed with .gz. + that the files corresponding to manual pages should be placed + in pkg-plist along with the rest of the + files. The purpose of MANDIRS is to enable + automatic compression of manual pages, therefore the file + names should be suffixed with .gz. @@ -4187,7 +4248,8 @@ MASTERDIR= ${.CURDIR}/../xdvi300 These variables are designed to be set by the system administrator. There are many that are standardized in - the ports/KNOBS + the ports/KNOBS file. When creating a port, do not make knob names specific @@ -4246,10 +4308,11 @@ MASTERDIR= ${.CURDIR}/../xdvi300 Knob Naming - Porters should use like-named knobs, both - for the benefit of end-users and to help keep the number - of knob names down. A list of popular knob names can be - found in the KNOBS + Porters should use like-named knobs, both for the + benefit of end-users and to help keep the number of knob + names down. A list of popular knob names can be found in + the KNOBS file. Knob names should reflect what the knob is and does. @@ -4962,16 +5025,15 @@ PORTVERSION= 1.0 Use the macros provided in bsd.port.mk to ensure correct modes of - files in the port's *-install targets. - Set ownership directly in + files in the port's *-install + targets. Set ownership directly in pkg-plist with the corresponding - entries, such as @owner - owner and @group - group. These - operators work until being overridden, or until the end of - pkg-plist, so do not forget to reset them - after they are no longer needed. The default - ownership is root:wheel. + entries, such as @owner owner and + @group group. These operators work until + being overridden, or until the end of + pkg-plist, so do not forget to reset + them after they are no longer needed. The default ownership + is root:wheel. @@ -5046,14 +5108,14 @@ PORTVERSION= 1.0 Installing a Whole Tree of Files Sometimes, a large number of - files must be installed while preserving their hierarchical organization. For example, - copying over a whole directory tree from - WRKSRC to a target directory under - PREFIX. Note that + files must be installed while preserving their hierarchical + organization. For example, copying over a whole directory + tree from WRKSRC to a target directory + under PREFIX. Note that PREFIX, EXAMPLESDIR, - DATADIR, and other path varialbes must always be - prepended with STAGEDIR to respect - staging (see ). + DATADIR, and other path varialbes must + always be prepended with STAGEDIR to + respect staging (see ). Two macros exist for this situation. The advantage of using these macros instead of cp is that @@ -5097,9 +5159,10 @@ PORTVERSION= 1.0 ${COPYTREE_SHARE} . ${STAGEDIR}${EXAMPLESDIR} "! -name Makefile") These macros do not add the installed files - to pkg-plist. They must be added manually. - For optional documentation - (PORTDOCS, see ) and examples + to pkg-plist. They must be added + manually. For optional documentation + (PORTDOCS, see + ) and examples (PORTEXAMPLES), the %%PORTDOCS%% or %%PORTEXAMPLES%% prefixes must be @@ -5126,9 +5189,10 @@ PORTVERSION= 1.0 Since only the files listed in pkg-plist are installed, it is safe to always install documentation to STAGEDIR - (see ). Hence .if - blocks are only needed when the installed files are - large enough to cause significant I/O overhead. + (see ). Hence + .if blocks are only needed when the + installed files are large enough to cause significant I/O + overhead. post-install: ${MKDIR} ${STAGEDIR}${DOCSDIR} @@ -5274,19 +5338,20 @@ PORTVERSION= 1.0 Staging - bsd.port.mk expects ports to work with - a stage directory. This means that a - port should not install files directly to the regular - destination directories (that is, under - PREFIX, for example) but instead into a - separate directory from which the package is then built. In - many cases, this does not require root privileges, making it - possible to build packages as an unprivileged user. With - staging, the port is built and installed into the stage - directory, STAGEDIR. A package is created - from the stage directory and then installed on the system. Automake tools refer to - this concept as DESTDIR, but in &os;, - DESTDIR has a different meaning (see ). + bsd.port.mk expects ports to work + with a stage directory. This means that a port + should not install files directly to the regular destination + directories (that is, under PREFIX, for + example) but instead into a separate directory from which the + package is then built. In many cases, this does not require + root privileges, making it possible to build packages as an + unprivileged user. With staging, the port is built and + installed into the stage directory, + STAGEDIR. A package is created from the + stage directory and then installed on the system. Automake + tools refer to this concept as DESTDIR, but + in &os;, DESTDIR has a different meaning + (see ). When a port still requires system-wide privileges in order to run the package target, this @@ -5296,38 +5361,40 @@ PORTVERSION= 1.0 NEED_ROOT= yes Meta ports, or ports that do not install files themselves - but only depend on other ports, should avoid - needlessly extracting the &man.mtree.8; to the stage directory. - This is the basic directory layout - of the package, and these empty directories will be seens as - orphans. To prevent &man.mtree.8; extraction, add this line: + but only depend on other ports, should avoid needlessly + extracting the &man.mtree.8; to the stage directory. This is + the basic directory layout of the package, and these empty + directories will be seens as orphans. To prevent + &man.mtree.8; extraction, add this line: NO_MTREE= yes Staging is enabled by prepending the - STAGEDIR variable to paths used in - the pre-install, + STAGEDIR variable to paths used in the + pre-install, do-install, and - post-install targets (see the examples - through the book). Typically, this includes + post-install targets (see the + examples through the book). Typically, this includes PREFIX, ETCDIR, DATADIR, EXAMPLESDIR, - MANPREFIX, DOCSDIR, and so on. - Directories should be created as part of the + MANPREFIX, DOCSDIR, and + so on. Directories should be created as part of the post-install target. Avoid using absolute paths whenever possible. - When creating a symlink, STAGEDIR should - be prepended to the target path only. For example: + When creating a symlink, STAGEDIR + should be prepended to the target path only. For + example: ${LN} -sf libfoo.so.42 ${STAGEDIR}${PREFIX}/lib/libfoo.so The source path - ${PREFIX}/lib/libfoo.so.42 looks - fine but could, in fact, be incorrect. Absolute paths can - point to a wrong location, like when a remote - file system has been mounted with NFS under a non-root mount point. - Relative paths are less fragile, and often much shorter. + ${PREFIX}/lib/libfoo.so.42 looks fine but + could, in fact, be incorrect. Absolute paths can point to a + wrong location, like when a remote file system has been + mounted with NFS under a non-root mount + point. Relative paths are less fragile, and often much + shorter. Ports that install kernel modules must prepend the STAGEDIR variable to @@ -5605,9 +5672,10 @@ IGNORE= may not be redistributed because set. If your port's source Makefile has - something else than all as the main - build target, set ALL_TARGET accordingly. - Same goes for install and + something else than all as the + main build target, set ALL_TARGET + accordingly. Same goes for + install and INSTALL_TARGET. @@ -6138,7 +6206,8 @@ PLIST_SUB+= NLS="@comment " top-level hierarchy name. For example, the recommended value for p5-Module-Name is Module. The top-level hierarchy can be - examined at cpan.org. + examined at cpan.org. This keeps the port working when the author of the module changes. @@ -6260,8 +6329,8 @@ PLIST_SUB+= NLS="@comment " Ports of Perl modules which do not have an official - website should link to cpan.org in the WWW - line of pkg-descr. The + website should link to cpan.org in + the WWW line of pkg-descr. The preferred URL form is http://search.cpan.org/dist/Module-Name/ (including the trailing slash). @@ -6284,10 +6353,10 @@ PLIST_SUB+= NLS="@comment " For Perl ports that install manual pages, the macro - PERL5_MANx (where - x ranges from 1 to - 9) can be used inside - pkg-plist. For example, + PERL5_MANx + (where x ranges from + 1 to 9) can be used + inside pkg-plist. For example, lib/perl5/5.14/man/man3/AnyEvent::I3.3.gz @@ -6441,7 +6510,8 @@ USE_XORG= x11 xpm Desktop Entries - Desktop entries (a + Desktop entries (a Freedesktop standard) provide a way to automatically adjust desktop features when a new program is installed, without requiring user intervention. For @@ -6465,7 +6535,8 @@ USE_XORG= x11 xpm include those files in pkg-plist and install them in the $LOCALBASE/share/applications - directory. The INSTALL_DATA + directory. The INSTALL_DATA macro is useful for installing these files. @@ -6496,7 +6567,8 @@ USE_XORG= x11 xpm DESKTOP_ENTRIES= "NAME" "COMMENT" "ICON" "COMMAND" "CATEGORY" StartupNotify The list of possible categories is available on the - Freedesktop + Freedesktop website. StartupNotify indicates whether the application is compatible with startup notifications. These are @@ -6526,8 +6598,8 @@ USE_XORG= x11 xpm Using GNOME The FreeBSD/GNOME project uses its own set of variables to - define which GNOME components a particular port uses. A - comprehensive + define which GNOME components a particular port uses. A comprehensive list of these variables exists within the FreeBSD/GNOME project's homepage. @@ -6863,8 +6935,9 @@ PLIST_SUB+= QT_INCDIR_REL=${QT_INCDIR_RE QMAKE_PRO - Name of the project .pro file. - The default is empty (using autodetection). + Name of the project .pro + file. The default is empty (using + autodetection). @@ -7490,11 +7563,12 @@ USE_QT4= moc_build qmake_build rcc_build All the features that have been presented in this section are implemented in bsd.java.mk. If you ever think that your port needs more sophisticated - Java support, please first have a look at the bsd.java.mk - SVN log as it usually takes some time - to document the latest features. Then, if you think the - support you are lacking would be beneficial to many other - Java ports, feel free to discuss it on the &a.java;. + Java support, please first have a look at the bsd.java.mk + SVN log as it usually takes some time to document + the latest features. Then, if you think the support you are + lacking would be beneficial to many other Java ports, feel + free to discuss it on the &a.java;. Although there is a java category for PRs, it refers to the JDK porting effort from the &os; Java @@ -7531,7 +7605,8 @@ USE_QT4= moc_build qmake_build rcc_build etc. The default APACHE version is 22. More details are available in ports/Mk/bsd.apache.mk and - at wiki.freebsd.org/Apache/. *** DIFF OUTPUT TRUNCATED AT 1000 LINES *** From owner-svn-doc-head@FreeBSD.ORG Sun Dec 8 19:16:14 2013 Return-Path: Delivered-To: svn-doc-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 495D257D; Sun, 8 Dec 2013 19:16:14 +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 2916D182B; Sun, 8 Dec 2013 19:16:14 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rB8JGEVb008642; Sun, 8 Dec 2013 19:16:14 GMT (envelope-from wblock@svn.freebsd.org) Received: (from wblock@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rB8JGD7n008638; Sun, 8 Dec 2013 19:16:13 GMT (envelope-from wblock@svn.freebsd.org) Message-Id: <201312081916.rB8JGD7n008638@svn.freebsd.org> From: Warren Block Date: Sun, 8 Dec 2013 19:16:13 +0000 (UTC) To: doc-committers@freebsd.org, svn-doc-all@freebsd.org, svn-doc-head@freebsd.org Subject: svn commit: r43303 - 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 List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 08 Dec 2013 19:16:14 -0000 Author: wblock Date: Sun Dec 8 19:16:13 2013 New Revision: 43303 URL: http://svnweb.freebsd.org/changeset/doc/43303 Log: Miscellaneous fixes included punctuation, adding missing articles, removing some instances of "you", corrections for clarity. 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 Sun Dec 8 18:04:01 2013 (r43302) +++ head/en_US.ISO8859-1/books/porters-handbook/book.xml Sun Dec 8 19:16:13 2013 (r43303) @@ -138,8 +138,7 @@ This setting enables the developer mode that displays deprecation warnings and activates some further - quality checks on calling the make - command. + quality checks on calling make. @@ -2551,7 +2550,7 @@ MASTER_SITE_SUBDIR= makeMASTER_SITES= SF/stardict/WyabdcRealPeopleTTS/${PORTVERSION} - This can be also written as + This can also be written as MASTER_SITES= SF MASTER_SITE_SUBDIR= stardict/WyabdcRealPeopleTTS/${PORTVERSION} @@ -3927,7 +3926,7 @@ ALWAYS_KEEP_DISTFILES= yes installed when default C/C++ compiler is Clang); or yes (means always use stable, modern GCC from lang/gcc port). - The exact version can be also specified, with a + The exact version can also be specified, with a value such as 4.7. The minimal required version can be specified as 4.6+. The GCC from the base @@ -5293,11 +5292,11 @@ PORTVERSION= 1.0 PORTDATA and PORTEXAMPLES, respectively. - You can also use the pkg-message - file to display messages upon installation. See + The contents of pkg-message + are displayed upon installation. See the section on using - pkg-message for details. The - pkg-message file does not need to be + pkg-message for details. + pkg-message does not need to be added to pkg-plist. @@ -7150,7 +7149,7 @@ USE_QT4= qmake_build - smokekde + smokekde KDE SMOKE libraries @@ -7981,8 +7980,7 @@ _DOCSDIR= . (cd ${STAGEDIR}${PREFIX} \ && ${PYTHON_CMD} ${PYTHON_LIBDIR}/compileall.py \ - -d ${PREFIX} -f ${PYTHONPREFIX_SITELIBDIR:S;${PREFIX}/;;}) - + -d ${PREFIX} -f ${PYTHONPREFIX_SITELIBDIR:S;${PREFIX}/;;}) This recompiles the sources with a path relative to the stage directory, and prepends the value of @@ -9817,8 +9815,8 @@ post-patch: USE_MYSQL - If variable is set to yes, add - dependency on + If the variable is set to yes, add + a dependency on the databases/mysql55-client port. An associated variable, WANT_MYSQL_VER, may be set to @@ -9866,7 +9864,7 @@ post-patch: framework. Details on its usage can be found in the rc.d Handbook chapter. Detailed explanation of - available commands is provided in &man.rc.8; and + the available commands is provided in &man.rc.8; and &man.rc.subr.8;. Finally, there is an article on practical aspects of @@ -10850,7 +10848,7 @@ as .putsy.conf and edit it.Handbook. - This will have the added benefit of tracking all the ports' + This will have the added benefit of tracking all the port's dependencies. The next step is to see if there is an update already @@ -10942,17 +10940,17 @@ as .putsy.conf and edit it. - Before you &man.send-pr.1;, you should review the Before using &man.send-pr.1;, review the Writing the problem report section in the Problem - Reports article; it contains far more information about how to + Reports article. It contains far more information about how to write useful problem reports. - If your upgrade is motivated by security concerns or a + If the upgrade is motivated by security concerns or a serious fault in the currently committed port, please notify the &a.portmgr; to request immediate rebuilding and - redistribution of your port's package. Unsuspecting users + redistribution of the port's package. Unsuspecting users of &man.pkg.add.1; will otherwise continue to install the old version via pkg_add -r for several weeks. @@ -10964,7 +10962,7 @@ as .putsy.conf and edit it. - Now that you have done all that, you will want to read about + Now that you have done all that, read about how to keep up-to-date in . @@ -11223,12 +11221,12 @@ as .putsy.conf and edit it. - Given the huge number of ports in the tree a security + Given the huge number of ports in the tree, a security advisory cannot be issued on each incident without creating a flood and losing the attention of the audience when it comes to really serious matters. Therefore security vulnerabilities found in ports are recorded in - the FreeBSD + the &os; VuXML database. The Security Officer Team members also monitor it for issues requiring their intervention. @@ -11240,15 +11238,15 @@ as .putsy.conf and edit it.FreeBSD + xlink:href="http://www.freebsd.org/security/#how">&os; Security Information page. - The VuXML database is an XML document. Its source file + The VuXML database is an XML document. Its source file vuln.xml is kept right inside the port security/vuxml. Therefore the file's full pathname will be PORTSDIR/security/vuxml/vuln.xml. Each - time you discover a security vulnerability in a port please + time you discover a security vulnerability in a port, please add an entry for it to that file. Until you are familiar with VuXML, the best thing you can do is to find an existing entry fitting your case, then copy it and use it as a @@ -11258,7 +11256,7 @@ as .putsy.conf and edit it. A Short Introduction to VuXML - The full-blown XML format is complex, and far beyond the + The full-blown XML format is complex, and far beyond the scope of this book. However, to gain basic insight on the structure of a VuXML entry you need only the notion of tags. XML tag names are enclosed in angle brackets. Each opening @@ -11458,13 +11456,13 @@ as .putsy.conf and edit it. This is a FreeBSD + xlink:href="http://www.freebsd.org/security/#adv">&os; security advisory. This is a FreeBSD + xlink:href="http://www.freebsd.org/support.html#gnats">&os; problem report. @@ -11641,9 +11639,9 @@ Reference: <http://www.freebsd.org/po Introduction - Here is a list of common dos and don'ts that you encounter - during the porting process. You should check your own port - against this list, but you can also check ports in the Here is a list of common dos and don'ts that are encountered + during the porting process. Check the port + against this list, but also check ports in the PR database that others have submitted. Submit any comments on ports you check as described in __FreeBSD__ is defined to be 9. - - #if __FreeBSD__ >= 9 + #if __FreeBSD__ >= 9 # if __FreeBSD_version >= 901000 /* 9.1+ release specific code here */ # endif #endif - @@ -11981,9 +11977,9 @@ exec %%LOCALBASE%%/bin/java -jar %%DATAD <filename>README.html</filename> - Do not include the README.html file. - This file is not part of the SVN collection but is generated - using the make readme command. + README.html is not part of the port, + but generated by make readme. Do not + include this file in patches or commits. If make readme fails, make sure that From owner-svn-doc-head@FreeBSD.ORG Sun Dec 8 19:22:46 2013 Return-Path: Delivered-To: svn-doc-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 5C7AB82F; Sun, 8 Dec 2013 19:22: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)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 4862918A3; Sun, 8 Dec 2013 19:22:46 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rB8JMkLb011875; Sun, 8 Dec 2013 19:22:46 GMT (envelope-from wblock@svn.freebsd.org) Received: (from wblock@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rB8JMksa011874; Sun, 8 Dec 2013 19:22:46 GMT (envelope-from wblock@svn.freebsd.org) Message-Id: <201312081922.rB8JMksa011874@svn.freebsd.org> From: Warren Block Date: Sun, 8 Dec 2013 19:22:46 +0000 (UTC) To: doc-committers@freebsd.org, svn-doc-all@freebsd.org, svn-doc-head@freebsd.org Subject: svn commit: r43304 - 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 List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 08 Dec 2013 19:22:46 -0000 Author: wblock Date: Sun Dec 8 19:22:45 2013 New Revision: 43304 URL: http://svnweb.freebsd.org/changeset/doc/43304 Log: Make the Uses table less confusing by aligning entries to the top. 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 Sun Dec 8 19:16:13 2013 (r43303) +++ head/en_US.ISO8859-1/books/porters-handbook/book.xml Sun Dec 8 19:22:45 2013 (r43304) @@ -12612,7 +12612,7 @@ pre-install: - + &values.uses; From owner-svn-doc-head@FreeBSD.ORG Sun Dec 8 19:43:25 2013 Return-Path: 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 8364416E; Sun, 8 Dec 2013 19:43:25 +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 659D619FD; Sun, 8 Dec 2013 19:43:25 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rB8JhPl9019466; Sun, 8 Dec 2013 19:43:25 GMT (envelope-from wblock@svn.freebsd.org) Received: (from wblock@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rB8JhPo7019465; Sun, 8 Dec 2013 19:43:25 GMT (envelope-from wblock@svn.freebsd.org) Message-Id: <201312081943.rB8JhPo7019465@svn.freebsd.org> From: Warren Block Date: Sun, 8 Dec 2013 19:43:25 +0000 (UTC) To: doc-committers@freebsd.org, svn-doc-all@freebsd.org, svn-doc-head@freebsd.org Subject: svn commit: r43305 - 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 List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 08 Dec 2013 19:43:25 -0000 Author: wblock Date: Sun Dec 8 19:43:24 2013 New Revision: 43305 URL: http://svnweb.freebsd.org/changeset/doc/43305 Log: Remove redundant language including 682 uses of the word "implied", change new tags to use role="port", miscellanous fixes. Modified: head/en_US.ISO8859-1/books/porters-handbook/uses.xml Modified: head/en_US.ISO8859-1/books/porters-handbook/uses.xml ============================================================================== --- head/en_US.ISO8859-1/books/porters-handbook/uses.xml Sun Dec 8 19:22:45 2013 (r43304) +++ head/en_US.ISO8859-1/books/porters-handbook/uses.xml Sun Dec 8 19:43:24 2013 (r43305) @@ -31,10 +31,10 @@ (none), build, run, both - Implies that the port uses devel/bison in - one way or another. By default, with no arguments or with the + Uses devel/bison + By default, with no arguments or with the build argument, it implies - bison as a build-time dependency, + bison is a build-time dependency, run implies a run-time dependency, and both implies both run-time and build-time dependencies. @@ -47,7 +47,7 @@ Prevents the port from installing charset.alias. This should be installed only - by converters/libiconv. + by converters/libiconv. CHARSETFIX_MAKEFILEIN can be set to a path relative to WRKSRC if charset.alias is not installed by @@ -59,7 +59,7 @@ (none), outsource - The port will use CMake for + Uses CMake for configuring and building. With the outsource argument, an out-of-source build will be performed. For more information see . @@ -124,9 +124,9 @@ (none) - Implies that the port uses the + Uses update-desktop-database from - devel/desktop-file-utils. An extra + devel/desktop-file-utils. An extra post-install step will be run without interfering with any post-install steps already in the port Makefile. Lines will be inserted into the @@ -154,7 +154,7 @@ (none) - The port has files with line endings in DOS format which need + The port has files with line endings in DOS format which need to be converted. Three variables can be set to control which files will be converted. The default is to convert all files, including binaries. @@ -182,7 +182,7 @@ (none) - Implies that the port uses devel/fmake as + Uses devel/fmake as a build-time dependency. @@ -191,7 +191,7 @@ (none) - Implies the port will depend on the FUSE library and handle + The port will depend on the FUSE library and handle the dependency on the kernel module depending on the version of &os;. @@ -202,11 +202,11 @@ (none), lib, build, run - Implies that the port uses devel/gettext - in one way or another. By default, with no arguments or with the + Uses devel/gettext. + By default, with no arguments or with the lib argument, implies gettext with build-time and run-time - dependencies, build implies a build-time + dependencies. build implies a build-time dependency, and run implies a run-time dependency. @@ -216,7 +216,7 @@ (none) - Implies that the port uses devel/gmake as + Uses devel/gmake as a build-time dependency. @@ -226,15 +226,15 @@ (none), lib, build, patch - Implies that the port uses iconv + Uses iconv functions, either from the port - converters/libiconv as a build-time and + converters/libiconv as a build-time and run-time dependency, or from the base system on 10-CURRENT after a native iconv was committed in 254273. By default, with no arguments or with the lib argument, implies iconv with build-time and run-time - dependencies, build implies a build-time + dependencies. build implies a build-time dependency, and patch implies a patch-time dependency. For more information see . @@ -245,7 +245,7 @@ (none) - Implies that the port uses devel/imake as + Uses devel/imake as build-time dependency. @@ -299,11 +299,11 @@ (none) - Implies that the ports uses - devel/open-motif as a library dependency. End + Uses + devel/open-motif as a library dependency. End users can set WANT_LESSTIF for the dependency - to be on devel/lesstif instead of - devel/open-motif. + to be on devel/lesstif instead of + devel/open-motif. @@ -312,7 +312,7 @@ (none), base, port - Implies that the port uses + Uses ncurses, and causes some useful variables to be set. @@ -333,8 +333,8 @@ (none) - Implies a dependency on Perl. The - following variables can be set: + Depends on Perl. + These variables can be set: @@ -384,11 +384,11 @@ (none), build, run, both - Implies that the port uses devel/pkgconf - in one way or another. With no arguments or with the + Uses devel/pkgconf. + With no arguments or with the build argument, it implies - pkg-config as a build-time dependency; - run implies a run-time dependency; and + pkg-config as a build-time dependency. + run implies a run-time dependency and both implies both run-time and build-time dependencies. @@ -398,10 +398,10 @@ (none), ffi - Implies that the port uses lang/pure in - one way or another, but largely is used for building related pure + Uses lang/pure. + Largely used for building related pure ports. With the ffi argument, it implies - devel/pure-ffi as a run-time + devel/pure-ffi as a run-time dependency. @@ -411,8 +411,8 @@ (none), build, run, both, vars - Implies that the port uses mail/qmail in - one way or another. With the build argument, + Uses mail/qmail. + With the build argument, it implies qmail as a build-time dependency. run implies a run-time dependency. Using no argument or the both argument implies both @@ -425,7 +425,7 @@ (none), norecursive - The port will use QMake for + Uses QMake for configuring. For more information see . @@ -435,7 +435,7 @@ (none), port - Implies that the port uses + Uses readline as library dependency, and sets CPPFLAGS and LDFLAGS as necessary. @@ -446,9 +446,9 @@ (none) - Implies that the port uses + Uses update-mime-database from - misc/shared-mime-info. This uses will + misc/shared-mime-info. This uses will automatically add a post-install step in such a way that the port itself still can specify there own post-install step if needed. It also insert lines into the plist for package install and @@ -551,7 +551,7 @@ - The following variables can be adjusted: + These variables can be adjusted: @@ -581,9 +581,9 @@ (none) - Implies the port uses net-mgmt/zenoss in - one way or another, but largely is used for building zenoss - related zenpack ports. + Uses net-mgmt/zenoss. + Largely used for building zenoss + related zenpack ports. @@ -591,8 +591,8 @@ (none) - Implies that the port uses www/zope in one - way or another, but is largely used for building zope related + Uses www/zope. + Mostly used for building zope related ports. ZOPE_VERSION can be used by a port to - indicate that a specific version of zope shall be used. + indicate that a specific version of zope shall be used. From owner-svn-doc-head@FreeBSD.ORG Sun Dec 8 20:01:08 2013 Return-Path: Delivered-To: svn-doc-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 1619D65A; Sun, 8 Dec 2013 20:01:08 +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 02C031AF6; Sun, 8 Dec 2013 20:01:08 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rB8K17EC027107; Sun, 8 Dec 2013 20:01:07 GMT (envelope-from eadler@svn.freebsd.org) Received: (from eadler@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rB8K171d027106; Sun, 8 Dec 2013 20:01:07 GMT (envelope-from eadler@svn.freebsd.org) Message-Id: <201312082001.rB8K171d027106@svn.freebsd.org> From: Eitan Adler Date: Sun, 8 Dec 2013 20:01:07 +0000 (UTC) To: doc-committers@freebsd.org, svn-doc-all@freebsd.org, svn-doc-head@freebsd.org Subject: svn commit: r43306 - head/en_US.ISO8859-1/articles/committers-guide 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 List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 08 Dec 2013 20:01:08 -0000 Author: eadler Date: Sun Dec 8 20:01:07 2013 New Revision: 43306 URL: http://svnweb.freebsd.org/changeset/doc/43306 Log: Document the "Dogs of FreeBSD" page. Modified: head/en_US.ISO8859-1/articles/committers-guide/article.xml Modified: head/en_US.ISO8859-1/articles/committers-guide/article.xml ============================================================================== --- head/en_US.ISO8859-1/articles/committers-guide/article.xml Sun Dec 8 19:43:24 2013 (r43305) +++ head/en_US.ISO8859-1/articles/committers-guide/article.xml Sun Dec 8 20:01:07 2013 (r43306) @@ -2101,9 +2101,12 @@ ControlPersist yes Once you get access to the wiki, you may add yourself to the How We - Got Here and + Got Here, Irc - Nicks pages. + Nicks and, + Dogs + of FreeBSD pages. From owner-svn-doc-head@FreeBSD.ORG Sun Dec 8 20:03:50 2013 Return-Path: Delivered-To: svn-doc-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id B2C5F6DD; Sun, 8 Dec 2013 20:03:50 +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 9E8121B04; Sun, 8 Dec 2013 20:03:50 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rB8K3oKT027522; Sun, 8 Dec 2013 20:03:50 GMT (envelope-from eadler@svn.freebsd.org) Received: (from eadler@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rB8K3ouY027521; Sun, 8 Dec 2013 20:03:50 GMT (envelope-from eadler@svn.freebsd.org) Message-Id: <201312082003.rB8K3ouY027521@svn.freebsd.org> From: Eitan Adler Date: Sun, 8 Dec 2013 20:03:50 +0000 (UTC) To: doc-committers@freebsd.org, svn-doc-all@freebsd.org, svn-doc-head@freebsd.org Subject: svn commit: r43307 - head/en_US.ISO8859-1/articles/committers-guide 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 List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 08 Dec 2013 20:03:50 -0000 Author: eadler Date: Sun Dec 8 20:03:50 2013 New Revision: 43307 URL: http://svnweb.freebsd.org/changeset/doc/43307 Log: Fix, odd comma Modified: head/en_US.ISO8859-1/articles/committers-guide/article.xml Modified: head/en_US.ISO8859-1/articles/committers-guide/article.xml ============================================================================== --- head/en_US.ISO8859-1/articles/committers-guide/article.xml Sun Dec 8 20:01:07 2013 (r43306) +++ head/en_US.ISO8859-1/articles/committers-guide/article.xml Sun Dec 8 20:03:50 2013 (r43307) @@ -2103,7 +2103,7 @@ ControlPersist yes How We Got Here, Irc - Nicks and, + Nicks, and Dogs of FreeBSD pages. From owner-svn-doc-head@FreeBSD.ORG Sun Dec 8 20:14:18 2013 Return-Path: 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 2D961C89 for ; Sun, 8 Dec 2013 20:14:18 +0000 (UTC) Received: from mail-qc0-x231.google.com (mail-qc0-x231.google.com [IPv6:2607:f8b0:400d:c01::231]) (using TLSv1 with cipher ECDHE-RSA-RC4-SHA (128/128 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id DA8661CCA for ; Sun, 8 Dec 2013 20:14:17 +0000 (UTC) Received: by mail-qc0-f177.google.com with SMTP id m20so2046690qcx.36 for ; Sun, 08 Dec 2013 12:14:17 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=eitanadler.com; s=0xdeadbeef; h=mime-version:sender:in-reply-to:references:from:date:message-id :subject:to:cc:content-type; bh=CvBuFOn8WALtQqMDAU23+X2MrbDfV3tAHAh0j58U5p8=; b=lcElC+MqnR9Luy5MnCk8IZoZBflk04BG4EZyEx1A2QcyFCE/3XsCC1xuKpJ8l7oT9F ejS/mhe9FosBoihhJ9Ue7ZtKVpw/Sj1A2ZHsmp66GDJQvf2fzJOQn14krMcveO1Jni2o e+0J1rdvrhu6Nl4y5mPsNPxpQU6OAz85T5VrA= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:sender:in-reply-to:references:from :date:message-id:subject:to:cc:content-type; bh=CvBuFOn8WALtQqMDAU23+X2MrbDfV3tAHAh0j58U5p8=; b=YEBOICtX72czvoiI0uhjjAA7EmhoJWLdJ6W8H8Deeoo01S3axn/AO4SF08VFFnDT1j kjdkWMZ1hdb156ioQdCqtTlUMMt2uASqHPD5J14oz3gImtMGwwUfLcYlvR1IV0gn9gtY aVUK6zEo2CAXcm7819ULP91tHdjN5Fghmb8m9HHQV54eAG4GQQrTDCD2yhPEKTNH9bz6 hKPmshl4gFLCcvXmWdB9s+4iEAEXosP1yPcR3iWneaBhWBzc92cG+QeUtnsgr87uUjJC pndOdALjuH4YuHP8qYYqutVeBmLIg9rcsDkp2gS27iQZZUYtDfmsHKNG6m9sB8/vYztT xvYQ== X-Gm-Message-State: ALoCoQn4JuHwgBMwcATVEf2OS2ShWxu2hT+3Nlyh3kfNOYv8KepI55nm8vg4YWKaTdT6yinYgcXG X-Received: by 10.224.26.140 with SMTP id e12mr28177542qac.54.1386533656739; Sun, 08 Dec 2013 12:14:16 -0800 (PST) MIME-Version: 1.0 Sender: lists@eitanadler.com Received: by 10.96.86.42 with HTTP; Sun, 8 Dec 2013 12:13:45 -0800 (PST) In-Reply-To: <201312081922.rB8JMksa011874@svn.freebsd.org> References: <201312081922.rB8JMksa011874@svn.freebsd.org> From: Eitan Adler Date: Sun, 8 Dec 2013 15:13:45 -0500 X-Google-Sender-Auth: ipw6XgyfYUdSpsICPiDZBqDyxW8 Message-ID: Subject: Re: svn commit: r43304 - head/en_US.ISO8859-1/books/porters-handbook To: Warren Block Content-Type: text/plain; charset=UTF-8 Cc: svn-doc-head@freebsd.org, svn-doc-all@freebsd.org, doc-committers@freebsd.org 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 List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 08 Dec 2013 20:14:18 -0000 On Sun, Dec 8, 2013 at 2:22 PM, Warren Block wrote: > Author: wblock > Date: Sun Dec 8 19:22:45 2013 > New Revision: 43304 > URL: http://svnweb.freebsd.org/changeset/doc/43304 > > Log: > Make the Uses table less confusing by aligning entries to the top. > > 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 Sun Dec 8 19:16:13 2013 (r43303) > +++ head/en_US.ISO8859-1/books/porters-handbook/book.xml Sun Dec 8 19:22:45 2013 (r43304) > @@ -12612,7 +12612,7 @@ pre-install: > > > > - > + Shouldn't this be done in CSS, not in the tbody element? -- Eitan Adler Source, Ports, Doc committer Bugmeister, Ports Security teams From owner-svn-doc-head@FreeBSD.ORG Sun Dec 8 20:39:08 2013 Return-Path: Delivered-To: svn-doc-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id D866645C; Sun, 8 Dec 2013 20:39:07 +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 C331F1E07; Sun, 8 Dec 2013 20:39:07 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rB8Kd7dR039267; Sun, 8 Dec 2013 20:39:07 GMT (envelope-from wblock@svn.freebsd.org) Received: (from wblock@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rB8Kd7Rk039266; Sun, 8 Dec 2013 20:39:07 GMT (envelope-from wblock@svn.freebsd.org) Message-Id: <201312082039.rB8Kd7Rk039266@svn.freebsd.org> From: Warren Block Date: Sun, 8 Dec 2013 20:39:07 +0000 (UTC) To: doc-committers@freebsd.org, svn-doc-all@freebsd.org, svn-doc-head@freebsd.org Subject: svn commit: r43308 - 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 List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 08 Dec 2013 20:39:08 -0000 Author: wblock Date: Sun Dec 8 20:39:07 2013 New Revision: 43308 URL: http://svnweb.freebsd.org/changeset/doc/43308 Log: Set all the tags to . Replace SVN with Subversion. Rewrite some sentences to avoid "you" and for clarity. Replace many instances of FreeBSD with &os;. 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 Sun Dec 8 20:03:50 2013 (r43307) +++ head/en_US.ISO8859-1/books/porters-handbook/book.xml Sun Dec 8 20:39:07 2013 (r43308) @@ -15,11 +15,11 @@ xml:lang="en"> - FreeBSD Porter's Handbook + &os; Porter's Handbook - The FreeBSD Documentation Project + The &os; Documentation Project @@ -40,7 +40,7 @@ 2011 2012 2013 - The FreeBSD Documentation + The &os; Documentation Project @@ -59,13 +59,13 @@ Introduction - The FreeBSD ports collection is the way almost everyone - installs applications ("ports") on FreeBSD. Like everything - else about FreeBSD, it is primarily a volunteer effort. + The &os; Ports Collection is the way almost everyone + installs applications ("ports") on &os;. Like everything + else about &os;, it is primarily a volunteer effort. It is important to keep this in mind when reading this document. - In FreeBSD, anyone may submit a new port, or volunteer + In &os;, anyone may submit a new port, or volunteer to maintain an existing port if it is unmaintained—you do not need any special commit privileges to do so. @@ -78,7 +78,7 @@ upgrading an existing one? Great! What follows are some guidelines for creating a new port for - FreeBSD. If you want to upgrade an existing port, you should + &os;. If you want to upgrade an existing port, you should read this and then read . When this document is not sufficiently detailed, you should @@ -124,7 +124,7 @@ The following assumes that the software compiled out-of-the-box, i.e., there was absolutely no change required - for the port to work on your FreeBSD box. If you needed to + for the port to work on your &os; box. If you needed to change something, you will have to refer to the next section too. @@ -168,7 +168,7 @@ COMMENT= Cat chasing a mouse all over th See if you can figure it out. Do not worry about the contents of the $FreeBSD$ - line, it will be filled in automatically by SVN when the port + line, it will be filled in automatically by Subversion when the port is imported to our main ports tree. You can find a more detailed example in the sample Makefile @@ -421,8 +421,8 @@ PLIST_DIRS= lib/X11/oneko Thorough automated testing can be done with - ports-mgmt/tinderbox or - ports-mgmt/poudriere from the Ports + ports-mgmt/tinderbox or + ports-mgmt/poudriere from the Ports Collection. These applications maintain jails where all of the steps shown above can be tested without affecting the state of the host @@ -435,7 +435,7 @@ PLIST_DIRS= lib/X11/onekoPlease use portlint to see if your port conforms to our guidelines. The - ports-mgmt/portlint + ports-mgmt/portlint program is part of the ports collection. In particular, you may want to check if the Makefile is in the @@ -503,7 +503,7 @@ PLIST_DIRS= lib/X11/onekoAdditional - FreeBSD Contributors and other files. + &os; Contributors and other files. @@ -787,7 +787,7 @@ PLIST_DIRS= lib/X11/onekopatch-ab etc, always mention the path and file name in patch names. - Do not put RCS strings in patches. SVN will mangle them + Do not put RCS strings in patches. Subversion will mangle them when we put the files into the ports tree, and when we check them out again, they will come out different and the patch will fail. RCS strings are surrounded by dollar @@ -818,7 +818,7 @@ PLIST_DIRS= lib/X11/onekoSubversion repository but makes it hard to find out what exactly caused the problem and what you changed at all. @@ -1067,7 +1067,7 @@ DOS2UNIX_GLOB= *.c *.cpp *.h <varname>PORTEPOCH</varname> - From time to time a software vendor or FreeBSD porter + From time to time a software vendor or &os; porter will do something silly and release a version of their software which is actually numerically less than the previous version. An example of this is a port which goes @@ -1122,7 +1122,7 @@ DOS2UNIX_GLOB= *.c *.cpp *.hPORTVERSION can often preempt it becoming necessary if a future release of the software should change the version structure. However, care is - needed by FreeBSD porters when a vendor release is made + needed by &os; porters when a vendor release is made without an official version number — such as a code snapshot release. The temptation is to label the release with the release date, which will cause @@ -1152,7 +1152,7 @@ PORTVERSION= 0.10 gtkmumble-0.10. A security hole is discovered which requires a local - FreeBSD patch. PORTREVISION is bumped + &os; patch. PORTREVISION is bumped accordingly. PORTNAME= gtkmumble @@ -1284,7 +1284,7 @@ PORTEPOCH= 1 - FreeBSD strives to support the native language of + &os; strives to support the native language of its users. The language- part should be a two letter abbreviation of the natural language defined by ISO-639 if the port is specific to a @@ -1693,7 +1693,7 @@ PORTEPOCH= 1 docs* - Meta-ports for FreeBSD documentation. + Meta-ports for &os; documentation. @@ -1987,7 +1987,7 @@ PORTEPOCH= 1 ports-mgmt Ports for managing, installing and developing - FreeBSD ports and packages. + &os; ports and packages. @@ -2803,7 +2803,7 @@ EXTRACT_ONLY= source.tar.gz In the next sections, information will follow on the - FreeBSD implementation of this idea. We improved a bit on + &os; implementation of this idea. We improved a bit on OpenBSD's concept. @@ -3613,7 +3613,7 @@ ALWAYS_KEEP_DISTFILES= yes When URLs listing the available versions differ from the download URLs. For example, to limit distfile version checks to the download page for the - databases/pgtune + databases/pgtune port, add: PORTSCOUT= site:http://pgfoundry.org/frs/?group_id=1000416 @@ -3735,7 +3735,7 @@ ALWAYS_KEEP_DISTFILES= yes ports/Mk/bsd.*.mk to augment initial build dependencies. For example, USES= gmake adds - devel/gmake to + devel/gmake to BUILD_DEPENDS. To prevent such additional dependencies from polluting RUN_DEPENDS, take care to assign with @@ -4027,7 +4027,7 @@ ALWAYS_KEEP_DISTFILES= yes The ports building technology does not tolerate circular dependencies. If you introduce one, you will have someone, - somewhere in the world, whose FreeBSD installation will + somewhere in the world, whose &os; installation will break almost immediately, with many others quickly to follow. These can really be hard to detect; if in doubt, before you make that change, make sure you have done the @@ -4107,7 +4107,7 @@ LIB_DEPENDS= libbar.so:${PORTSDIR}/foo/b For more control over dependencies in some cases, WANT_ variables are available to more precisely specify what is needed. For example, consider the - mail/squirrelmail port. + mail/squirrelmail port. This port needs some PHP modules, which are listed in the USE_PHP variable: @@ -4159,7 +4159,7 @@ RESOLUTION?= 300 @${FALSE} .endif - japanese/xdvi300 also + japanese/xdvi300 also has all the regular patches, package files, etc. If you type make there, it will take the default value for the resolution (300) and build the port normally. @@ -4211,7 +4211,7 @@ MASTERDIR= ${.CURDIR}/../xdvi300 uses a different location. However, this is not recommended. These entries contain just the path relative to PREFIX/INFO_PATH. - For example, lang/gcc34 + For example, lang/gcc34 installs info files to PREFIX/INFO_PATH/gcc34, and INFO will be something like @@ -4296,7 +4296,7 @@ MASTERDIR= ${.CURDIR}/../xdvi300 WITH_OPENSSL_PORT Installs the version of OpenSSL from - security/openssl, even + security/openssl, even if the base is up to date. @@ -5436,10 +5436,10 @@ PORTVERSION= 1.0 Please double-check, often this is not necessary at all or can be avoided through -rpath or setting LD_RUN_PATH during linking (see - lang/moscow_ml for an + lang/moscow_ml for an example), or through a shell-wrapper which sets LD_LIBRARY_PATH before invoking the binary, - like www/seamonkey + like www/seamonkey does. When installing 32-bit libraries on 64-bit system, use @@ -5466,7 +5466,7 @@ PORTVERSION= 1.0 It is your responsibility as a porter to read the licensing terms of the software and make sure that the - FreeBSD project will not be held accountable for violating + &os; project will not be held accountable for violating them by redistributing the source or compiled binaries either via FTP/HTTP or CD-ROM. If in doubt, please contact the &a.ports;. @@ -5810,7 +5810,7 @@ IGNORE= may not be redistributed because exported to the PLIST_SUB and should be used if port installs *.cmake files depending on the build type (see - deskutils/strigi for an + deskutils/strigi for an example). Please note that some projects may define their own build profiles and/or force particular build type by setting CMAKE_BUILD_TYPE in @@ -6099,7 +6099,7 @@ CMAKE_SOURCE_PATH= ${WRKSRC}/subp If your port requires gettext, set USES= gettext, and your port will inherit a dependency on - devel/gettext. Other + devel/gettext. Other values for gettext usage are listed in . @@ -6189,7 +6189,7 @@ PLIST_SUB+= NLS="@comment " in PORTSDIR/Templates/BSD.local.dist. The directories for many other languages are governed by the - devel/gettext port. + devel/gettext port. Consult its pkg-plist and see whether the port is going to install a message catalog file for a unique language. @@ -6445,9 +6445,9 @@ USE_XORG= x11 xpm USES= motif in the Makefile. Default Motif implementation is - x11-toolkits/open-motif. + x11-toolkits/open-motif. Users can choose - x11-toolkits/lesstif + x11-toolkits/lesstif instead by setting WANT_LESSTIF variable. @@ -6596,11 +6596,11 @@ USE_XORG= x11 xpm Using GNOME - The FreeBSD/GNOME project uses its own set of variables to + The &os;/GNOME project uses its own set of variables to define which GNOME components a particular port uses. A comprehensive list of these variables exists within the - FreeBSD/GNOME project's homepage. + &os;/GNOME project's homepage. @@ -6981,7 +6981,7 @@ USE_QT4= qmake_build Sometimes data such as icons or .desktop files are by default installed into directories which are not scanned by XDG-compatible applications. - editors/texmaker is + editors/texmaker is an example for this - look at patch-texmaker.pro in the files directory of that port for a @@ -7206,7 +7206,7 @@ USE_QT4= moc_build qmake_build rcc_build various vendors, and in several versions. If your port must use one of these versions, you can define which one. The most current version, and &os; default is - java/openjdk6. + java/openjdk6. Variables Which May be Set by Ports That Use @@ -7564,7 +7564,7 @@ USE_QT4= moc_build qmake_build rcc_build If you ever think that your port needs more sophisticated Java support, please first have a look at the <link xlink:href="http://svnweb.FreeBSD.org/ports/head/Mk/bsd.java.mk?view=markup">bsd.java.mk - SVN log</link> as it usually takes some time to document + <application>Subversion</application> log</link> as it usually takes some time to document the latest features. Then, if you think the support you are lacking would be beneficial to many other Java ports, feel free to discuss it on the &a.java;.</para> @@ -8216,52 +8216,52 @@ _DOCSDIR= . <para>The <varname>USE_SDL</varname> variable is used to autoconfigure the dependencies for ports which use an SDL - based library like <package>devel/sdl12</package> and - <package>graphics/sdl_image</package>.</para> + based library like <package role="port">devel/sdl12</package> and + <package role="port">graphics/sdl_image</package>.</para> <para>The following SDL libraries for version 1.2 are recognized at the moment:</para> <itemizedlist> <listitem> - <para>sdl: <package>devel/sdl12</package></para> + <para>sdl: <package role="port">devel/sdl12</package></para> </listitem> <listitem> - <para>console: <package>devel/sdl_console</package></para> + <para>console: <package role="port">devel/sdl_console</package></para> </listitem> <listitem> - <para>gfx: <package>graphics/sdl_gfx</package></para> + <para>gfx: <package role="port">graphics/sdl_gfx</package></para> </listitem> <listitem> - <para>image: <package>graphics/sdl_image</package></para> + <para>image: <package role="port">graphics/sdl_image</package></para> </listitem> <listitem> - <para>mixer: <package>audio/sdl_mixer</package></para> + <para>mixer: <package role="port">audio/sdl_mixer</package></para> </listitem> <listitem> - <para>mm: <package>devel/sdlmm</package></para> + <para>mm: <package role="port">devel/sdlmm</package></para> </listitem> <listitem> - <para>net: <package>net/sdl_net</package></para> + <para>net: <package role="port">net/sdl_net</package></para> </listitem> <listitem> <para>pango: - <package>x11-toolkits/sdl_pango</package></para> + <package role="port">x11-toolkits/sdl_pango</package></para> </listitem> <listitem> - <para>sound: <package>audio/sdl_sound</package></para> + <para>sound: <package role="port">audio/sdl_sound</package></para> </listitem> <listitem> - <para>ttf: <package>graphics/sdl_ttf</package></para> + <para>ttf: <package role="port">graphics/sdl_ttf</package></para> </listitem> </itemizedlist> @@ -8270,41 +8270,41 @@ _DOCSDIR= . <itemizedlist> <listitem> - <para>sdl: <package>devel/sdl20</package></para> + <para>sdl: <package role="port">devel/sdl20</package></para> </listitem> <listitem> - <para>gfx: <package>graphics/sdl2_gfx</package></para> + <para>gfx: <package role="port">graphics/sdl2_gfx</package></para> </listitem> <listitem> - <para>image: <package>graphics/sdl2_image</package></para> + <para>image: <package role="port">graphics/sdl2_image</package></para> </listitem> <listitem> - <para>mixer: <package>audio/sdl2_mixer</package></para> + <para>mixer: <package role="port">audio/sdl2_mixer</package></para> </listitem> <listitem> - <para>net: <package>net/sdl2_net</package></para> + <para>net: <package role="port">net/sdl2_net</package></para> </listitem> <listitem> - <para>ttf: <package>graphics/sdl2_ttf</package></para> + <para>ttf: <package role="port">graphics/sdl2_ttf</package></para> </listitem> </itemizedlist> <para>Therefore, if a port has a dependency on - <package>net/sdl_net</package> and - <package>audio/sdl_mixer</package>, + <package role="port">net/sdl_net</package> and + <package role="port">audio/sdl_mixer</package>, the syntax will be:</para> <programlisting>USE_SDL= net mixer</programlisting> <para>The dependency - <package>devel/sdl12</package>, which is - required by <package>net/sdl_net</package> - and <package>audio/sdl_mixer</package>, is + <package role="port">devel/sdl12</package>, which is + required by <package role="port">net/sdl_net</package> + and <package role="port">audio/sdl_mixer</package>, is automatically added as well.</para> <para>If you use <varname>USE_SDL</varname> with entries using @@ -8448,17 +8448,17 @@ USE_SDL+= mixer <tbody> <row> <entry><literal>2.4</literal></entry> - <entry><package>x11-toolkits/wxgtk24</package></entry> + <entry><package role="port">x11-toolkits/wxgtk24</package></entry> </row> <row> <entry><literal>2.6</literal></entry> - <entry><package>x11-toolkits/wxgtk26</package></entry> + <entry><package role="port">x11-toolkits/wxgtk26</package></entry> </row> <row> <entry><literal>2.8</literal></entry> - <entry><package>x11-toolkits/wxgtk28</package></entry> + <entry><package role="port">x11-toolkits/wxgtk28</package></entry> </row> </tbody> </tgroup> @@ -9026,17 +9026,17 @@ PLIST_SUB+= VERSION="${VER_STR}" <tbody> <row> <entry><literal>4.0</literal></entry> - <entry><package>lang/lua4</package></entry> + <entry><package role="port">lang/lua4</package></entry> </row> <row> <entry><literal>5.0</literal></entry> - <entry><package>lang/lua50</package></entry> + <entry><package role="port">lang/lua50</package></entry> </row> <row> <entry><literal>5.1</literal></entry> - <entry><package>lang/lua</package></entry> + <entry><package role="port">lang/lua</package></entry> </row> </tbody> </tgroup> @@ -9495,7 +9495,7 @@ CFLAGS+= -DLUA_VERSION_STRING="${VER_STR <para>After 2013-10-08 (<revnumber>254273</revnumber>), &os;  10-CURRENT and newer versions have a native <command>iconv</command> in the operating system. On earlier - versions, <package>converters/libiconv</package> was used as a + versions, <package role="port">converters/libiconv</package> was used as a dependency.</para> <para>For software that needs <command>iconv</command>, define @@ -9503,7 +9503,7 @@ CFLAGS+= -DLUA_VERSION_STRING="${VER_STR 10-CURRENT on 2013-08-13 (<revnumber>254273</revnumber>) do not have a native <command>iconv</command>. On these earlier versions, a dependency on - <package>converters/libiconv</package> will be added + <package role="port">converters/libiconv</package> will be added automatically.</para> <para>When a port defines <literal>USES=iconv</literal>, these @@ -9569,7 +9569,7 @@ CFLAGS+= -DLUA_VERSION_STRING="${VER_STR <para>These two examples automatically populate the variables with the correct value for systems using - <package>converters/libiconv</package> or the + <package role="port">converters/libiconv</package> or the native <command>iconv</command> respectively:</para> <example xml:id="iconv-simple-use"> @@ -9636,49 +9636,49 @@ post-patch: <para>The <varname>USE_XFCE</varname> variable is used to autoconfigure the dependencies for ports which use an Xfce based library or application like - <package>x11-toolkits/libxfce4gui</package> - and <package>x11-wm/xfce4-panel</package>.</para> + <package role="port">x11-toolkits/libxfce4gui</package> + and <package role="port">x11-wm/xfce4-panel</package>.</para> <para>The following Xfce libraries and applications are recognized at the moment:</para> <itemizedlist> <listitem> - <para>libexo: <package>x11/libexo</package></para> + <para>libexo: <package role="port">x11/libexo</package></para> </listitem> <listitem> <para>libgui: - <package>x11-toolkits/libxfce4gui</package></para> + <package role="port">x11-toolkits/libxfce4gui</package></para> </listitem> <listitem> - <para>libutil: <package>x11/libxfce4util</package></para> + <para>libutil: <package role="port">x11/libxfce4util</package></para> </listitem> <listitem> - <para>libmcs: <package>x11/libxfce4mcs</package></para> + <para>libmcs: <package role="port">x11/libxfce4mcs</package></para> </listitem> <listitem> <para>mcsmanager: - <package>sysutils/xfce4-mcs-manager</package></para> + <package role="port">sysutils/xfce4-mcs-manager</package></para> </listitem> <listitem> - <para>panel: <package>x11-wm/xfce4-panel</package></para> + <para>panel: <package role="port">x11-wm/xfce4-panel</package></para> </listitem> <listitem> - <para>thunar: <package>x11-fm/thunar</package></para> + <para>thunar: <package role="port">x11-fm/thunar</package></para> </listitem> <listitem> - <para>wm: <package>x11-wm/xfce4-wm</package></para> + <para>wm: <package role="port">x11-wm/xfce4-wm</package></para> </listitem> <listitem> - <para>xfdev: <package>dev/xfce4-dev-tools</package></para> + <para>xfdev: <package role="port">dev/xfce4-dev-tools</package></para> </listitem> </itemizedlist> @@ -9698,7 +9698,7 @@ post-patch: </itemizedlist> <para>Therefore, if a port has a dependency on - <package>sysutils/xfce4-mcs-manager</package> + <package role="port">sysutils/xfce4-mcs-manager</package> and requires the special CPPFLAGS in its configure environment, the syntax will be:</para> @@ -9804,7 +9804,7 @@ post-patch: <entry><varname>USE_BDB</varname></entry> <entry>If variable is set to <literal>yes</literal>, add dependency on - <package>databases/db41</package> + <package role="port">databases/db41</package> port. The variable may also be set to values: 40, 41, 42, 43, 44, 46, 47, 48, or 51. You can declare a range of acceptable values, @@ -9817,7 +9817,7 @@ post-patch: <entry><varname>USE_MYSQL</varname></entry> <entry>If the variable is set to <literal>yes</literal>, add a dependency on the - <package>databases/mysql55-client</package> port. An + <package role="port">databases/mysql55-client</package> port. An associated variable, <varname>WANT_MYSQL_VER</varname>, may be set to values such as 323, 40, 41, 50, 51, 52, 55, or @@ -9827,7 +9827,7 @@ post-patch: <row> <entry><varname>USE_PGSQL</varname></entry> <entry>If set to <literal>yes</literal>, add dependency - on <package>databases/postgresql90-client</package> + on <package role="port">databases/postgresql90-client</package> port. An associated variable, <varname>WANT_PGSQL_VER</varname>, may be set to values such as 83, 84, 90, 91 or 92. You can declare @@ -9841,7 +9841,7 @@ post-patch: <entry><varname>USE_SQLITE</varname></entry> <entry>If variable is set to <literal>yes</literal>, add dependency on - <package>databases/sqlite3</package> + <package role="port">databases/sqlite3</package> port. The variable may also be set to values: 3, 2.</entry> </row> @@ -10029,7 +10029,7 @@ run_rc_command "$1"</programlisting> <step> <para>Make sure there is no - <literal>KEYWORD: FreeBSD</literal> present. This has + <literal>KEYWORD: &os;</literal> present. This has not been necessary or desirable for years. It is also an indication that the new script was copy/pasted from an old script, so extra caution should be given to the @@ -10717,7 +10717,7 @@ as .putsy.conf and edit it.</programlist <title>Port ToolsThe - ports-mgmt/porttools + ports-mgmt/porttools program is part of the Ports Collection.port is the front-end script, which can @@ -10825,7 +10825,7 @@ as .putsy.conf and edit it.Tinderbox using - ports-mgmt/tinderbox port. + ports-mgmt/tinderbox port. Be sure to read supplied documentation since the configuration is not trivial. @@ -10862,7 +10862,7 @@ as .putsy.conf and edit it.However, sometimes people forget to put the name of the port into the Synopsis field in an unambiguous fashion. In that case, you can try the - FreeBSD Ports Monitoring System + &os; Ports Monitoring System (also known as portsmon). This system attempts to classify port PRs by portname. To search for PRs about a particular port, use the . - Using <literal>SVN</literal> to Make Patches + Using <application>Subversion</application> to Make Patches - If you can, please submit a &man.svn.1; diff — they + When possible, please submit a &man.svn.1; diff. They are easier to handle than diffs between - new and old directories. Plus it is easier for - you to see what you have changed and to update your diff if - something is modified in the Ports Collection from when you - started to work on it until you submit your changes, or if the - committer asks you to fix something. + new and old directories. It is easier + to see what has changed, and to update the diff if + something was modified in the Ports Collection since you + began work on it, or if the + committer asks for something to be fixed. &prompt.user; cd ~/my_wrkdir &prompt.user; svn co https://svn0.us-west.FreeBSD.org/ports/head/dns/pdnsd @@ -10991,7 +10991,7 @@ as .putsy.conf and edit it. svn0.us-west.FreeBSD.org - is a public SVN server. Select the + is a public Subversion server. Select the closest mirror and verify the mirror server certificate from the list of Subversion @@ -11016,7 +11016,7 @@ as .putsy.conf and edit it. This will try to merge the differences between your - patch and current SVN; watch the output carefully. The + patch and current repository version; watch the output carefully. The letter in front of each file name indicates what was done with it. See for a complete list. @@ -11024,7 +11024,7 @@ as .putsy.conf and edit it.
- <literal>SVN</literal> Update File Prefixes + <application>Subversion</application> Update File Prefixes @@ -11055,17 +11055,17 @@ as .putsy.conf and edit it.
- If you get C as a result of - svn update it means something changed in - the SVN repository and &man.svn.1; was not able to merge your - local changes and those from the repository. It is always a + If C is displayed as a result of + svn update, it means something changed in + the Subversion repository and &man.svn.1; was not able to merge the + local changes with those from the repository. It is always a good idea to inspect the changes anyway, since &man.svn.1; does not know anything about how a port should be, so it might (and probably will) merge things that do not make sense. The last step is to make a unified &man.diff.1; - of the files against SVN: + of the changes: &prompt.user; svn diff > ../`basename ${PWD}`.diff @@ -11243,7 +11243,7 @@ as .putsy.conf and edit it.The VuXML database is an XML document. Its source file vuln.xml is kept right inside the port - security/vuxml. Therefore the file's + security/vuxml. Therefore the file's full pathname will be PORTSDIR/security/vuxml/vuln.xml. Each time you discover a security vulnerability in a port, please @@ -11543,10 +11543,10 @@ as .putsy.conf and edit it.As a prerequisite, you need to install fresh versions of the ports - ports-mgmt/portaudit, - ports-mgmt/portaudit-db, + ports-mgmt/portaudit, + ports-mgmt/portaudit-db, and - security/vuxml. + security/vuxml. To run packaudit you must have @@ -11587,8 +11587,8 @@ as .putsy.conf and edit it. You will need at least one of the following packages installed: - textproc/libxml2, - textproc/jade. + textproc/libxml2, + textproc/jade. Now rebuild the portaudit database @@ -11891,7 +11891,7 @@ exec %%LOCALBASE%%/bin/java -jar %%DATAD CXX= g++ Both CC and CXX - variables can be defined on FreeBSD systems in + variables can be defined on &os; systems in /etc/make.conf. The first example defines a value if it was not previously set in /etc/make.conf, preserving any @@ -11925,7 +11925,7 @@ exec %%LOCALBASE%%/bin/java -jar %%DATAD CFLAGS= -Wall -Werror The CFLAGS variable is defined on - FreeBSD systems in /etc/make.conf. The + &os; systems in /etc/make.conf. The first example appends additional flags to the CFLAGS variable, preserving any system-wide definitions. The second example clobbers anything previously @@ -12052,7 +12052,7 @@ exec %%LOCALBASE%%/bin/java -jar %%DATAD FORBIDDEN is used for ports that contain a security vulnerability or induce grave concern - regarding the security of a FreeBSD system with a given + regarding the security of a &os; system with a given port installed (e.g., a reputably insecure program or a program that provides easily exploitable services). Ports should be marked as FORBIDDEN @@ -12060,7 +12060,7 @@ exec %%LOCALBASE%%/bin/java -jar %%DATAD vulnerability and there is no released upgrade. Ideally ports should be upgraded as soon as possible when a security vulnerability is discovered so as to reduce the - number of vulnerable FreeBSD hosts (we like being known + number of vulnerable &os; hosts (we like being known for being secure), however sometimes there is a noticeable time gap between disclosure of a vulnerability and an updated release of the vulnerable @@ -12096,8 +12096,8 @@ exec %%LOCALBASE%%/bin/java -jar %%DATAD does not work with some other currently installed port (for instance, the port depends on - www/apache20 but - www/apache22 is + www/apache20 but + www/apache22 is installed) @@ -12476,7 +12476,7 @@ pre-install: change it back again. FreshPorts also has a sanity test feature which - automatically tests each commit to the FreeBSD ports tree. If + automatically tests each commit to the &os; ports tree. If subscribed to this service, you will be notified of any errors which FreshPorts detects during sanity testing of your commits. @@ -12568,7 +12568,7 @@ pre-install: The &os; Ports Monitoring System Another handy resource is the - FreeBSD Ports + &os; Ports Monitoring System (also known as portsmon). This system comprises a database that processes information from several sources and From owner-svn-doc-head@FreeBSD.ORG Sun Dec 8 21:55:13 2013 Return-Path: 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 86CEE768; Sun, 8 Dec 2013 21:55:13 +0000 (UTC) Received: from wonkity.com (wonkity.com [67.158.26.137]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 0178E1293; Sun, 8 Dec 2013 21:55:12 +0000 (UTC) Received: from wonkity.com (localhost [127.0.0.1]) by wonkity.com (8.14.7/8.14.7) with ESMTP id rB8LtBYR071385; Sun, 8 Dec 2013 14:55:11 -0700 (MST) (envelope-from wblock@wonkity.com) Received: from localhost (wblock@localhost) by wonkity.com (8.14.7/8.14.7/Submit) with ESMTP id rB8LtB89071382; Sun, 8 Dec 2013 14:55:11 -0700 (MST) (envelope-from wblock@wonkity.com) Date: Sun, 8 Dec 2013 14:55:11 -0700 (MST) From: Warren Block To: Eitan Adler Subject: Re: svn commit: r43304 - head/en_US.ISO8859-1/books/porters-handbook In-Reply-To: Message-ID: References: <201312081922.rB8JMksa011874@svn.freebsd.org> User-Agent: Alpine 2.00 (BSF 1167 2008-08-23) MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII; format=flowed X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.4.3 (wonkity.com [127.0.0.1]); Sun, 08 Dec 2013 14:55:12 -0700 (MST) Cc: svn-doc-head@freebsd.org, svn-doc-all@freebsd.org, doc-committers@freebsd.org, Warren Block 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 List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 08 Dec 2013 21:55:13 -0000 On Sun, 8 Dec 2013, Eitan Adler wrote: > On Sun, Dec 8, 2013 at 2:22 PM, Warren Block wrote: >> Author: wblock >> Date: Sun Dec 8 19:22:45 2013 >> New Revision: 43304 >> URL: http://svnweb.freebsd.org/changeset/doc/43304 >> >> Log: >> Make the Uses table less confusing by aligning entries to the top. >> >> 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 Sun Dec 8 19:16:13 2013 (r43303) >> +++ head/en_US.ISO8859-1/books/porters-handbook/book.xml Sun Dec 8 19:22:45 2013 (r43304) >> @@ -12612,7 +12612,7 @@ pre-install: >> >> >> >> - >> + > > Shouldn't this be done in CSS, not in the tbody element? By setting it in the XML source, the rendering is left up to the toolchain. If it is only set in CSS, only the HTML rendered version will appear that way. From owner-svn-doc-head@FreeBSD.ORG Sun Dec 8 22:15:16 2013 Return-Path: Delivered-To: svn-doc-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 93759B7B; Sun, 8 Dec 2013 22:15:16 +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 73CDE13AB; Sun, 8 Dec 2013 22:15:16 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rB8MFGcL074912; Sun, 8 Dec 2013 22:15:16 GMT (envelope-from wblock@svn.freebsd.org) Received: (from wblock@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rB8MFGRS074911; Sun, 8 Dec 2013 22:15:16 GMT (envelope-from wblock@svn.freebsd.org) Message-Id: <201312082215.rB8MFGRS074911@svn.freebsd.org> From: Warren Block Date: Sun, 8 Dec 2013 22:15:16 +0000 (UTC) To: doc-committers@freebsd.org, svn-doc-all@freebsd.org, svn-doc-head@freebsd.org Subject: svn commit: r43309 - head/en_US.ISO8859-1/books/fdp-primer/docbook-markup 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 List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 08 Dec 2013 22:15:16 -0000 Author: wblock Date: Sun Dec 8 22:15:15 2013 New Revision: 43309 URL: http://svnweb.freebsd.org/changeset/doc/43309 Log: Improve examples of filename and package tag use. Modified: head/en_US.ISO8859-1/books/fdp-primer/docbook-markup/chapter.xml Modified: head/en_US.ISO8859-1/books/fdp-primer/docbook-markup/chapter.xml ============================================================================== --- head/en_US.ISO8859-1/books/fdp-primer/docbook-markup/chapter.xml Sun Dec 8 20:39:07 2013 (r43308) +++ head/en_US.ISO8859-1/books/fdp-primer/docbook-markup/chapter.xml Sun Dec 8 22:15:15 2013 (r43309) @@ -1558,28 +1558,30 @@ This is the file called 'foo2' Files, Directories, Extensions To refer to the name of a file, a directory, or a file - extension, use filename. + extension, use filename. For directory names, set + the class attribute to + directory. <tag>filename</tag> Usage: - paraThe XML source for the Handbook in English is - found in filename class="directory"/usr/doc/en_US.ISO8859-1/books/handbook/filename. The first - file is called filenamebook.xmlfilename in that - directory. There is also a filenameMakefilefilename - and a number of files with a filename.entfilename - extension.para + paraThe source for the Handbook in English is found in + filename + class="directory"/usr/doc/en_US.ISO8859-1/books/handbook/filename. + The main file is called filenamebook.xmlfilename. + There is also a filenameMakefilefilename and a + number of files with a filename.entfilename extension.para Appearance: - The XML source for the Handbook in English can be - found in /usr/doc/en/handbook/. The - first file is called handbook.xml in - that directory. There is also a - Makefile and a number of files with a - .ent extension. + The source for the Handbook in English is found in + usr/doc/en_US.ISO8859-1/books/handbook/. + The main file is called book.xml. + There is also a Makefile and a number + of files with a .ent extension. @@ -1596,22 +1598,35 @@ This is the file called 'foo2' To include the name of a program from the &os; Ports Collection in the document, use the - package tag. Since ports can be installed in + package tag. Since the Ports Collection can be installed in any number of locations, only include the category and the port name; do not include /usr/ports. + By default, package refers to a binary package. + To refer to a port that will be built from source, set the + role attribute to + port. + <tag>package</tag> Tag Usage: - paraInstall the packagenet/wiresharkpackage port to view network traffic.para + paraInstall the packagenet/wiresharkpackage binary + package to view network traffic.para + +parapackage role="port"net/wiresharkpackage can also be + built and installed from the Ports Collection.para Appearance: - Install the net/wireshark port to + Install the net/wireshark binary + package to view network traffic. + + net/wireshark can also be + built and installed from the Ports Collection. @@ -2330,7 +2345,7 @@ IMAGES+= fig3.png names in the IMAGES variable in the Makefile, and including the directory name in the imagedata - element in the document document. + element in the document. For example, if the book has chapter1/fig1.png, then From owner-svn-doc-head@FreeBSD.ORG Sun Dec 8 22:25:42 2013 Return-Path: Delivered-To: svn-doc-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 60B2EC5D; Sun, 8 Dec 2013 22:25:42 +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 4C39E146A; Sun, 8 Dec 2013 22:25:42 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rB8MPgMw078397; Sun, 8 Dec 2013 22:25:42 GMT (envelope-from wblock@svn.freebsd.org) Received: (from wblock@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rB8MPgAI078396; Sun, 8 Dec 2013 22:25:42 GMT (envelope-from wblock@svn.freebsd.org) Message-Id: <201312082225.rB8MPgAI078396@svn.freebsd.org> From: Warren Block Date: Sun, 8 Dec 2013 22:25:42 +0000 (UTC) To: doc-committers@freebsd.org, svn-doc-all@freebsd.org, svn-doc-head@freebsd.org Subject: svn commit: r43310 - head/en_US.ISO8859-1/books/fdp-primer/docbook-markup 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 List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 08 Dec 2013 22:25:42 -0000 Author: wblock Date: Sun Dec 8 22:25:41 2013 New Revision: 43310 URL: http://svnweb.freebsd.org/changeset/doc/43310 Log: Fix "Describing Makefiles" example, maketarget->buildtarget and makevar->varname. Modified: head/en_US.ISO8859-1/books/fdp-primer/docbook-markup/chapter.xml Modified: head/en_US.ISO8859-1/books/fdp-primer/docbook-markup/chapter.xml ============================================================================== --- head/en_US.ISO8859-1/books/fdp-primer/docbook-markup/chapter.xml Sun Dec 8 22:15:15 2013 (r43309) +++ head/en_US.ISO8859-1/books/fdp-primer/docbook-markup/chapter.xml Sun Dec 8 22:25:41 2013 (r43310) @@ -1925,37 +1925,37 @@ This is the file called 'foo2' Two elements exist to describe parts of - Makefiles, maketarget - and makevar. + Makefiles, buildtarget + and varname. - maketarget identifies a build target + buildtarget identifies a build target exported by a Makefile that can be given as a parameter to make. - makevar identifies a variable that can be + varname identifies a variable that can be set (in the environment, on the command line with make, or within the Makefile) to influence the process. - <tag>maketarget</tag> and - <tag>makevar</tag> + <tag>buildtarget</tag> and + <tag>varname</tag> Usage: paraTwo common targets in a filenameMakefilefilename - are maketargetallmaketarget and - maketargetcleanmaketarget.para + are buildtargetallbuildtarget and + buildtargetcleanbuildtarget.para -paraTypically, invoking maketargetallmaketarget will +paraTypically, invoking buildtargetallbuildtarget will rebuild the application, and invoking - maketargetcleanmaketarget will remove the temporary + buildtargetcleanbuildtarget will remove the temporary files (filename.ofilename for example) created by the build process.para -paramaketargetcleanmaketarget may be controlled by a - number of variables, including makevarCLOBBERmakevar - and makevarRECURSEmakevar.para +parabuildtargetcleanbuildtarget may be controlled by a + number of variables, including varnameCLOBBERvarname + and varnameRECURSEvarname.para Appearance: From owner-svn-doc-head@FreeBSD.ORG Sun Dec 8 22:56:22 2013 Return-Path: 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 8088C4C0; Sun, 8 Dec 2013 22:56:22 +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 61F7E164E; Sun, 8 Dec 2013 22:56:22 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rB8MuMQ1089698; Sun, 8 Dec 2013 22:56:22 GMT (envelope-from wblock@svn.freebsd.org) Received: (from wblock@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rB8MuMG5089697; Sun, 8 Dec 2013 22:56:22 GMT (envelope-from wblock@svn.freebsd.org) Message-Id: <201312082256.rB8MuMG5089697@svn.freebsd.org> From: Warren Block Date: Sun, 8 Dec 2013 22:56:22 +0000 (UTC) To: doc-committers@freebsd.org, svn-doc-all@freebsd.org, svn-doc-head@freebsd.org Subject: svn commit: r43311 - head/en_US.ISO8859-1/books/fdp-primer/docbook-markup 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 List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 08 Dec 2013 22:56:22 -0000 Author: wblock Date: Sun Dec 8 22:56:21 2013 New Revision: 43311 URL: http://svnweb.freebsd.org/changeset/doc/43311 Log: Correct old hostid tag examples to show the new systemitem tag. Merge the username example into the same section. Modified: head/en_US.ISO8859-1/books/fdp-primer/docbook-markup/chapter.xml Modified: head/en_US.ISO8859-1/books/fdp-primer/docbook-markup/chapter.xml ============================================================================== --- head/en_US.ISO8859-1/books/fdp-primer/docbook-markup/chapter.xml Sun Dec 8 22:25:41 2013 (r43310) +++ head/en_US.ISO8859-1/books/fdp-primer/docbook-markup/chapter.xml Sun Dec 8 22:56:21 2013 (r43311) @@ -1688,7 +1688,8 @@ This is the file called 'foo2' - Hosts, Domains, IP Addresses, and So Forth + Hosts, Domains, IP Addresses, User Names, and Other + System Items &os; Extension @@ -1698,30 +1699,25 @@ This is the file called 'foo2' DTD. - Identification information for networked computers (hosts) - can be marked up in several ways, depending on the nature of - the information. All of them use hostid as - the element, with the role attribute - selecting the type of the marked up information. + Information for system items is marked up + with systemitem. The class + attribute is used to identify the particular type of + information shown. - No role attribute, or - role="hostname" + class="systemname" - With no role attribute (i.e., - hostid.../hostid) + With class="systemname" the marked up information is the simple hostname, such as freefall or - wcarchive. The hostname can be - explicitly specified with - role="hostname". + wcarchive. - role="domainname" + class="domainname" The text is a domain name, such as @@ -1732,7 +1728,7 @@ This is the file called 'foo2' - role="fqdn" + class="fqdomainname" The text is a Fully Qualified Domain Name, with @@ -1741,7 +1737,7 @@ This is the file called 'foo2' - role="ipaddr" + class="ipaddr" The text is an IP address, @@ -1750,16 +1746,7 @@ This is the file called 'foo2' - role="ip6addr" - - - The text is an IPv6 - address. - - - - - role="netmask" + class="netmask" The text is a network mask, which might be @@ -1770,7 +1757,7 @@ This is the file called 'foo2' - role="mac" + class="etheraddress" The text is an Ethernet MAC @@ -1781,30 +1768,33 @@ This is the file called 'foo2' - <tag>hostid</tag> and Roles + <tag>systemitem</tag> and Classes Usage: paraThe local machine can always be referred to by the - name hostidlocalhosthostid, which will have the IP - address hostid role="ipaddr"127.0.0.1hostid.para + name systemitem class="systemname"localhostsystemitem, which will have the IP + address systemitem class="ipaddr"127.0.0.1systemitem.para -paraThe hostid role="domainname"FreeBSD.orghostid +paraThe systemitem class="domainname"FreeBSD.orgsystemitem domain contains a number of different hosts, including - hostid role="fqdn"freefall.FreeBSD.orghostid and - hostid role="fqdn"bento.FreeBSD.orghostid.para + systemitem class="fqdomainname"freefall.FreeBSD.orgsystemitem and + systemitem class="fqdomainname"bento.FreeBSD.orgsystemitem.para paraWhen adding an acronymIPacronym alias to an interface (using commandifconfigcommand) emphasisalwaysemphasis use a netmask of - hostid role="netmask"255.255.255.255hostid (which can + systemitem class="netmask"255.255.255.255systemitem (which can also be expressed as - hostid role="netmask"0xffffffffhostid).para + systemitem class="netmask"0xffffffffsystemitem).para paraThe acronymMACacronym address uniquely identifies every network card in existence. A typical acronymMACacronym address looks like - hostid role="mac"08:00:20:87:ef:d0hostid.para + systemitem class="etheraddress"08:00:20:87:ef:d0systemitem.para + +paraTo carry out most system administration functions + requires logging in as systemitem class="username"rootsystemitem.para Appearance: @@ -1832,33 +1822,6 @@ This is the file called 'foo2' every network card in existence. A typical MAC address looks like 08:00:20:87:ef:d0. - - - - - Usernames - - - &os; Extension - - These elements are part of the &os; extension to - DocBook, and do not exist in the original DocBook - DTD. - - - To refer to a specific username, such as - root or bin, use - username. - - - <tag>username</tag> - - Usage: - - paraTo carry out most system administration functions - requires logging in as usernamerootusername.para - - Appearance: To carry out most system administration functions requires logging in as From owner-svn-doc-head@FreeBSD.ORG Mon Dec 9 10:53:49 2013 Return-Path: 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 10C55AEB; Mon, 9 Dec 2013 10:53:49 +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 F05EA1D2E; Mon, 9 Dec 2013 10:53:48 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rB9ArmSo053338; Mon, 9 Dec 2013 10:53:48 GMT (envelope-from pgj@svn.freebsd.org) Received: (from pgj@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rB9Armb3053336; Mon, 9 Dec 2013 10:53:48 GMT (envelope-from pgj@svn.freebsd.org) Message-Id: <201312091053.rB9Armb3053336@svn.freebsd.org> From: Gabor Pali Date: Mon, 9 Dec 2013 10:53:48 +0000 (UTC) To: doc-committers@freebsd.org, svn-doc-all@freebsd.org, svn-doc-head@freebsd.org Subject: svn commit: r43312 - in head: en_US.ISO8859-1/htdocs/news/status share/xml 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 List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 09 Dec 2013 10:53:49 -0000 Author: pgj Date: Mon Dec 9 10:53:48 2013 New Revision: 43312 URL: http://svnweb.freebsd.org/changeset/doc/43312 Log: - Publish the EuroBSDcon 2013 Developer Summit report Modified: head/en_US.ISO8859-1/htdocs/news/status/status.xml head/share/xml/news.xml Modified: head/en_US.ISO8859-1/htdocs/news/status/status.xml ============================================================================== --- head/en_US.ISO8859-1/htdocs/news/status/status.xml Sun Dec 8 22:56:21 2013 (r43311) +++ head/en_US.ISO8859-1/htdocs/news/status/status.xml Mon Dec 9 10:53:48 2013 (r43312) @@ -58,6 +58,8 @@

2013

    +
  • EuroBSDcon 2013 Developer + Summit Special
  • July, 2013 - September, 2013
  • April, 2013 - Modified: head/share/xml/news.xml ============================================================================== --- head/share/xml/news.xml Sun Dec 8 22:56:21 2013 (r43311) +++ head/share/xml/news.xml Mon Dec 9 10:53:48 2013 (r43312) @@ -34,6 +34,17 @@ 12 + 9 + + + EuroBSDcon 2013 Developer Summit Report +

    A special status report on the EuroBSDcon 2013 &os; Developer Summit + is now available with 13 entries.

    + + + + 3 From owner-svn-doc-head@FreeBSD.ORG Mon Dec 9 15:09:28 2013 Return-Path: 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 C91902F7; Mon, 9 Dec 2013 15:09:28 +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 B4EC211B5; Mon, 9 Dec 2013 15:09:28 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rB9F9Snp054340; Mon, 9 Dec 2013 15:09:28 GMT (envelope-from emaste@svn.freebsd.org) Received: (from emaste@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rB9F9Sjs054339; Mon, 9 Dec 2013 15:09:28 GMT (envelope-from emaste@svn.freebsd.org) Message-Id: <201312091509.rB9F9Sjs054339@svn.freebsd.org> From: Ed Maste Date: Mon, 9 Dec 2013 15:09:28 +0000 (UTC) To: doc-committers@freebsd.org, svn-doc-all@freebsd.org, svn-doc-head@freebsd.org Subject: svn commit: r43313 - head/en_US.ISO8859-1/articles/committers-guide 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 List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 09 Dec 2013 15:09:28 -0000 Author: emaste (src committer) Date: Mon Dec 9 15:09:28 2013 New Revision: 43313 URL: http://svnweb.freebsd.org/changeset/doc/43313 Log: Remove reference to CVS from Subversion Primer opening paragraph The last of the three trees switched from CVS over a year ago, and detailed notes on the dates and revision numbers of the three switchovers appear later on. Reviewed by: gjb Modified: head/en_US.ISO8859-1/articles/committers-guide/article.xml Modified: head/en_US.ISO8859-1/articles/committers-guide/article.xml ============================================================================== --- head/en_US.ISO8859-1/articles/committers-guide/article.xml Mon Dec 9 10:53:48 2013 (r43312) +++ head/en_US.ISO8859-1/articles/committers-guide/article.xml Mon Dec 9 15:09:28 2013 (r43313) @@ -267,11 +267,8 @@ Subversion Primer It is assumed that you are already familiar with the basic - operation of the version control systems in use. Traditionally - this was CVS. Subversion is used for the src - tree as of May 2008, the doc/www tree as of - May 2012 and the ports tree as of July - 2012. + operation of Subversion. If not, start by reading the + Subversion Book. There is a list of things missing in Subversion when compared to From owner-svn-doc-head@FreeBSD.ORG Mon Dec 9 15:14:02 2013 Return-Path: Delivered-To: svn-doc-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 2A09E4B9; Mon, 9 Dec 2013 15:14:02 +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 15C081233; Mon, 9 Dec 2013 15:14:02 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rB9FE1mm057499; Mon, 9 Dec 2013 15:14:01 GMT (envelope-from ryusuke@svn.freebsd.org) Received: (from ryusuke@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rB9FE13e057497; Mon, 9 Dec 2013 15:14:01 GMT (envelope-from ryusuke@svn.freebsd.org) Message-Id: <201312091514.rB9FE13e057497@svn.freebsd.org> From: Ryusuke SUZUKI Date: Mon, 9 Dec 2013 15:14:01 +0000 (UTC) To: doc-committers@freebsd.org, svn-doc-all@freebsd.org, svn-doc-head@freebsd.org Subject: svn commit: r43314 - head/ja_JP.eucJP/share/xml 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 List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 09 Dec 2013 15:14:02 -0000 Author: ryusuke Date: Mon Dec 9 15:14:01 2013 New Revision: 43314 URL: http://svnweb.freebsd.org/changeset/doc/43314 Log: - Merge the following from the English version: r43279 -> r43312 head/ja_JP.eucJP/share/xml/news.xml Modified: head/ja_JP.eucJP/share/xml/news.xml Modified: head/ja_JP.eucJP/share/xml/news.xml ============================================================================== --- head/ja_JP.eucJP/share/xml/news.xml Mon Dec 9 15:09:28 2013 (r43313) +++ head/ja_JP.eucJP/share/xml/news.xml Mon Dec 9 15:14:01 2013 (r43314) @@ -20,7 +20,7 @@ the contents of will be preferred over <p>. $FreeBSD$ - Original revision: r43279 + Original revision: r43312 --> <news> <cvs:keyword xmlns:cvs="http://www.FreeBSD.org/XML/CVS"> @@ -34,6 +34,17 @@ <name>12</name> <day> + <name>9</name> + + <event> + <title>EuroBSDcon 2013 Developer Summit レポート +

    EuroBSDcon 2013 &os; Developer Summit のスペシャルレポート + (13 エントリ) が公開されました。

    +     +     + + 3 @@ -440,7 +451,7 @@ 2 - BSDCan 2013 DevSummit リポート + BSDCan 2013 DevSummit レポート

    BSDCan 2013 &os; 開発者サミットのスペシャルレポート (6 エントリ) が 公開 From owner-svn-doc-head@FreeBSD.ORG Mon Dec 9 15:37:30 2013 Return-Path: Delivered-To: svn-doc-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id E40551CA; Mon, 9 Dec 2013 15:37:30 +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 D00FF1445; Mon, 9 Dec 2013 15:37:30 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rB9FbU6X065096; Mon, 9 Dec 2013 15:37:30 GMT (envelope-from gjb@svn.freebsd.org) Received: (from gjb@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rB9FbU89065095; Mon, 9 Dec 2013 15:37:30 GMT (envelope-from gjb@svn.freebsd.org) Message-Id: <201312091537.rB9FbU89065095@svn.freebsd.org> From: Glen Barber Date: Mon, 9 Dec 2013 15:37:30 +0000 (UTC) To: doc-committers@freebsd.org, svn-doc-all@freebsd.org, svn-doc-head@freebsd.org Subject: svn commit: r43315 - head/en_US.ISO8859-1/articles/committers-guide 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 List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 09 Dec 2013 15:37:31 -0000 Author: gjb Date: Mon Dec 9 15:37:30 2013 New Revision: 43315 URL: http://svnweb.freebsd.org/changeset/doc/43315 Log: Make it clear that merges to releng/N.M branches should originate from the corresponding stable/N branch. Reviewed by: gavin Sponsored by: The FreeBSD Foundation Modified: head/en_US.ISO8859-1/articles/committers-guide/article.xml Modified: head/en_US.ISO8859-1/articles/committers-guide/article.xml ============================================================================== --- head/en_US.ISO8859-1/articles/committers-guide/article.xml Mon Dec 9 15:14:01 2013 (r43314) +++ head/en_US.ISO8859-1/articles/committers-guide/article.xml Mon Dec 9 15:37:30 2013 (r43315) @@ -1133,6 +1133,12 @@ Note that checkout should be a complete checkout of the branch to which the merge occurs. + + Merges to releng/ branches should + always be merged from the corresponding + stable/ branch. For example: + + &prompt.user; svn merge -c r123456 ^/stable/10 releng/10.0 From owner-svn-doc-head@FreeBSD.ORG Mon Dec 9 16:04:08 2013 Return-Path: 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 D332D7A7; Mon, 9 Dec 2013 16:04:08 +0000 (UTC) Received: from wonkity.com (wonkity.com [67.158.26.137]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 86F6A1684; Mon, 9 Dec 2013 16:04:08 +0000 (UTC) Received: from wonkity.com (localhost [127.0.0.1]) by wonkity.com (8.14.7/8.14.7) with ESMTP id rB9G46X8078182; Mon, 9 Dec 2013 09:04:06 -0700 (MST) (envelope-from wblock@wonkity.com) Received: from localhost (wblock@localhost) by wonkity.com (8.14.7/8.14.7/Submit) with ESMTP id rB9G46ro078179; Mon, 9 Dec 2013 09:04:06 -0700 (MST) (envelope-from wblock@wonkity.com) Date: Mon, 9 Dec 2013 09:04:06 -0700 (MST) From: Warren Block To: Glen Barber Subject: Re: svn commit: r43315 - head/en_US.ISO8859-1/articles/committers-guide In-Reply-To: <201312091537.rB9FbU89065095@svn.freebsd.org> Message-ID: References: <201312091537.rB9FbU89065095@svn.freebsd.org> User-Agent: Alpine 2.00 (BSF 1167 2008-08-23) MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII; format=flowed X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.4.3 (wonkity.com [127.0.0.1]); Mon, 09 Dec 2013 09:04:07 -0700 (MST) Cc: svn-doc-head@freebsd.org, svn-doc-all@freebsd.org, doc-committers@freebsd.org 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 List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 09 Dec 2013 16:04:08 -0000 On Mon, 9 Dec 2013, Glen Barber wrote: > Author: gjb > Date: Mon Dec 9 15:37:30 2013 > New Revision: 43315 > URL: http://svnweb.freebsd.org/changeset/doc/43315 > > Log: > Make it clear that merges to releng/N.M branches should originate from > the corresponding stable/N branch. > > Reviewed by: gavin > Sponsored by: The FreeBSD Foundation > > Modified: > head/en_US.ISO8859-1/articles/committers-guide/article.xml > > Modified: head/en_US.ISO8859-1/articles/committers-guide/article.xml > ============================================================================== > --- head/en_US.ISO8859-1/articles/committers-guide/article.xml Mon Dec 9 15:14:01 2013 (r43314) > +++ head/en_US.ISO8859-1/articles/committers-guide/article.xml Mon Dec 9 15:37:30 2013 (r43315) > @@ -1133,6 +1133,12 @@ > Note that checkout should > be a complete checkout of the branch to which the merge > occurs. > + > + Merges to releng/ branches should > + always be merged from the corresponding > + stable/ branch. For example: Maybe that would be a little clearer with s/be merged/originate/ ? > + > + &prompt.user; svn merge -c r123456 ^/stable/10 releng/10.0 > > > > From owner-svn-doc-head@FreeBSD.ORG Mon Dec 9 16:10:05 2013 Return-Path: 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 BB0BCC41; Mon, 9 Dec 2013 16:10:05 +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 A7FF016DF; Mon, 9 Dec 2013 16:10:05 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rB9GA5GJ077042; Mon, 9 Dec 2013 16:10:05 GMT (envelope-from gjb@svn.freebsd.org) Received: (from gjb@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rB9GA5Fh077041; Mon, 9 Dec 2013 16:10:05 GMT (envelope-from gjb@svn.freebsd.org) Message-Id: <201312091610.rB9GA5Fh077041@svn.freebsd.org> From: Glen Barber Date: Mon, 9 Dec 2013 16:10:05 +0000 (UTC) To: doc-committers@freebsd.org, svn-doc-all@freebsd.org, svn-doc-head@freebsd.org Subject: svn commit: r43316 - head/en_US.ISO8859-1/articles/committers-guide 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 List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 09 Dec 2013 16:10:05 -0000 Author: gjb Date: Mon Dec 9 16:10:05 2013 New Revision: 43316 URL: http://svnweb.freebsd.org/changeset/doc/43316 Log: Clarify the releng/ merge sentence. Submitted by: wblock Sponsored by: The FreeBSD Foundation Modified: head/en_US.ISO8859-1/articles/committers-guide/article.xml Modified: head/en_US.ISO8859-1/articles/committers-guide/article.xml ============================================================================== --- head/en_US.ISO8859-1/articles/committers-guide/article.xml Mon Dec 9 15:37:30 2013 (r43315) +++ head/en_US.ISO8859-1/articles/committers-guide/article.xml Mon Dec 9 16:10:05 2013 (r43316) @@ -1135,7 +1135,7 @@ occurs. Merges to releng/ branches should - always be merged from the corresponding + always originate from the corresponding stable/ branch. For example: &prompt.user; svn merge -c r123456 ^/stable/10 releng/10.0 From owner-svn-doc-head@FreeBSD.ORG Mon Dec 9 16:10:34 2013 Return-Path: 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 E3972CAE; Mon, 9 Dec 2013 16:10:34 +0000 (UTC) Received: from mail0.glenbarber.us (mail0.glenbarber.us [208.86.227.67]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id B482F16EB; Mon, 9 Dec 2013 16:10:34 +0000 (UTC) Received: from glenbarber.us (unknown [IPv6:2001:470:8:1205:5604:a6ff:fe3a:96ea]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) (Authenticated sender: gjb) by mail0.glenbarber.us (Postfix) with ESMTPSA id 1BB421EFB0; Mon, 9 Dec 2013 16:10:33 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.8.3 mail0.glenbarber.us 1BB421EFB0 Authentication-Results: mail0.glenbarber.us; dkim=none reason="no signature"; dkim-adsp=none Date: Mon, 9 Dec 2013 11:10:31 -0500 From: Glen Barber To: Warren Block Subject: Re: svn commit: r43315 - head/en_US.ISO8859-1/articles/committers-guide Message-ID: <20131209161031.GP1894@glenbarber.us> References: <201312091537.rB9FbU89065095@svn.freebsd.org> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="h9WqFG8zn/Mwlkpe" Content-Disposition: inline In-Reply-To: X-Operating-System: FreeBSD 11.0-CURRENT amd64 User-Agent: Mutt/1.5.22 (2013-10-16) Cc: svn-doc-head@freebsd.org, svn-doc-all@freebsd.org, doc-committers@freebsd.org 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 List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 09 Dec 2013 16:10:35 -0000 --h9WqFG8zn/Mwlkpe Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Mon, Dec 09, 2013 at 09:04:06AM -0700, Warren Block wrote: > >+ Merges to releng/ branches should > >+ always be merged from the corresponding > >+ stable/ branch. For example: >=20 > Maybe that would be a little clearer with s/be merged/originate/ ? Updated in r43316. Thanks. Glen --h9WqFG8zn/Mwlkpe Content-Type: application/pgp-signature -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.22 (FreeBSD) iQIcBAEBCAAGBQJSpet3AAoJELls3eqvi17QIzsP/jIuMa0PtlOI262eBv0TG9Ib 4cTwW4nLx7C8pfdpAyUcTKnnavNUTSfZ9bgZp3mGgSe5bO9QMTdNQtriG9o3WF3e yzLNtzcD1AneC48nw2xBlLMro8SS5mqIOtY0m3pE63vBOygNP5BrLgMOeFv/vrgr 1uMUWV1GfxNW4vn3tll/1vYOfL6M0Qq3V1BNYL2OuFk9Ju2AvPAPtc6wf+vFxUZ5 nlKuFIo1e9ssbs0U9RO78eLCyWfOM+t/wBNaxvUbljUyxCqLsh5IP1QeM9hTAaSg D+wCe8o51my4Uj9F560Ipxoqa+v/ykmySHy1kQCnReT2yuq3sACn/vawOpqqW6Al EHseJjODZ1E7Vk9pyht6BLT3zgMlRX/YIiz4WkmZr2GqoAMosTMWXEYI5HBpAfoP f+6QWvLu8+WX7UlbdripfWtCLV2KNJoDfFPwIBxnHpngjc6cKH8cZQq8V20a8t4N +R93SIg8MKwK2qZ50x+9lOZSbzHYa3lejdIX5/Z87SXisWxPnDoir9vmyToqxZHm 12T2bpzsGRitYZORHbvZ1thHF85YcVU5cLXqfsM1t3Udw4QX/AXpJt++jX8JTSFY heUhaEraLsJQIm1J2VdXo+igoCjE81UUwxHpk5wB3ouVa3yLUraOjhDqv03vGnO+ H/AGSoncxlH8Neh5qYKu =Ty7C -----END PGP SIGNATURE----- --h9WqFG8zn/Mwlkpe-- From owner-svn-doc-head@FreeBSD.ORG Mon Dec 9 16:25:25 2013 Return-Path: Delivered-To: svn-doc-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 63624218; Mon, 9 Dec 2013 16:25:25 +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 4F4031852; Mon, 9 Dec 2013 16:25:25 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rB9GPPNX083506; Mon, 9 Dec 2013 16:25:25 GMT (envelope-from gjb@svn.freebsd.org) Received: (from gjb@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rB9GPPHo083505; Mon, 9 Dec 2013 16:25:25 GMT (envelope-from gjb@svn.freebsd.org) Message-Id: <201312091625.rB9GPPHo083505@svn.freebsd.org> From: Glen Barber Date: Mon, 9 Dec 2013 16:25:25 +0000 (UTC) To: doc-committers@freebsd.org, svn-doc-all@freebsd.org, svn-doc-head@freebsd.org Subject: svn commit: r43317 - head/en_US.ISO8859-1/articles/committers-guide 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 List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 09 Dec 2013 16:25:25 -0000 Author: gjb Date: Mon Dec 9 16:25:24 2013 New Revision: 43317 URL: http://svnweb.freebsd.org/changeset/doc/43317 Log: Fix build. Pointyhat: gjb Sponsored by: The FreeBSD Foundation Modified: head/en_US.ISO8859-1/articles/committers-guide/article.xml Modified: head/en_US.ISO8859-1/articles/committers-guide/article.xml ============================================================================== --- head/en_US.ISO8859-1/articles/committers-guide/article.xml Mon Dec 9 16:10:05 2013 (r43316) +++ head/en_US.ISO8859-1/articles/committers-guide/article.xml Mon Dec 9 16:25:24 2013 (r43317) @@ -1138,7 +1138,7 @@ always originate from the corresponding stable/ branch. For example: - &prompt.user; svn merge -c r123456 ^/stable/10 releng/10.0 + &prompt.user; svn merge -c r123456 ^/stable/10 releng/10.0 From owner-svn-doc-head@FreeBSD.ORG Mon Dec 9 20:14:17 2013 Return-Path: Delivered-To: svn-doc-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 42273D6A; Mon, 9 Dec 2013 20:14:17 +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 2EAAC1D3E; Mon, 9 Dec 2013 20:14:17 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rB9KEHZB069234; Mon, 9 Dec 2013 20:14:17 GMT (envelope-from gjb@svn.freebsd.org) Received: (from gjb@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rB9KEHeN069233; Mon, 9 Dec 2013 20:14:17 GMT (envelope-from gjb@svn.freebsd.org) Message-Id: <201312092014.rB9KEHeN069233@svn.freebsd.org> From: Glen Barber Date: Mon, 9 Dec 2013 20:14:17 +0000 (UTC) To: doc-committers@freebsd.org, svn-doc-all@freebsd.org, svn-doc-head@freebsd.org Subject: svn commit: r43318 - head/share/xml 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 List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 09 Dec 2013 20:14:17 -0000 Author: gjb Date: Mon Dec 9 20:14:16 2013 New Revision: 43318 URL: http://svnweb.freebsd.org/changeset/doc/43318 Log: Switch 10.0 over to -RC1 status. Approved by: re (implicit) Sponsored by: The FreeBSD Foundation Modified: head/share/xml/release.ent Modified: head/share/xml/release.ent ============================================================================== --- head/share/xml/release.ent Mon Dec 9 16:25:24 2013 (r43317) +++ head/share/xml/release.ent Mon Dec 9 20:14:16 2013 (r43318) @@ -32,7 +32,7 @@ - +