From owner-svn-doc-projects@FreeBSD.ORG Sun Feb 17 01:03:39 2013 Return-Path: Delivered-To: svn-doc-projects@freebsd.org Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id E626D3EF; Sun, 17 Feb 2013 01:03:39 +0000 (UTC) (envelope-from gjb@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id BFF2226D; Sun, 17 Feb 2013 01:03:39 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r1H13dWg010455; Sun, 17 Feb 2013 01:03:39 GMT (envelope-from gjb@svn.freebsd.org) Received: (from gjb@localhost) by svn.freebsd.org (8.14.5/8.14.5/Submit) id r1H13a7H010436; Sun, 17 Feb 2013 01:03:36 GMT (envelope-from gjb@svn.freebsd.org) Message-Id: <201302170103.r1H13a7H010436@svn.freebsd.org> From: Glen Barber Date: Sun, 17 Feb 2013 01:03:36 +0000 (UTC) To: doc-committers@freebsd.org, svn-doc-projects@freebsd.org Subject: svn commit: r40992 - in projects/entities/share: pgpkeys xml X-SVN-Group: doc-projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-doc-projects@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for doc projects trees List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 17 Feb 2013 01:03:40 -0000 Author: gjb Date: Sun Feb 17 01:03:36 2013 New Revision: 40992 URL: http://svnweb.freebsd.org/changeset/doc/40992 Log: MFH: /head/share:r40578-40991 Added: projects/entities/share/pgpkeys/achim.key - copied unchanged from r40991, head/share/pgpkeys/achim.key projects/entities/share/pgpkeys/carl.key - copied unchanged from r40991, head/share/pgpkeys/carl.key projects/entities/share/pgpkeys/dbn.key - copied unchanged from r40991, head/share/pgpkeys/dbn.key projects/entities/share/pgpkeys/dru.key - copied unchanged from r40991, head/share/pgpkeys/dru.key projects/entities/share/pgpkeys/pclin.key - copied unchanged from r40991, head/share/pgpkeys/pclin.key Deleted: projects/entities/share/pgpkeys/yar.key Modified: projects/entities/share/pgpkeys/glebius.key projects/entities/share/pgpkeys/pgpkeys-developers.xml projects/entities/share/pgpkeys/pgpkeys.ent projects/entities/share/xml/authors.ent projects/entities/share/xml/commercial.consult.xml projects/entities/share/xml/commercial.isp.xml projects/entities/share/xml/mirrors.xml projects/entities/share/xml/news.xml projects/entities/share/xml/press.xml projects/entities/share/xml/xhtml.xsl Directory Properties: projects/entities/share/ (props changed) Copied: projects/entities/share/pgpkeys/achim.key (from r40991, head/share/pgpkeys/achim.key) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/entities/share/pgpkeys/achim.key Sun Feb 17 01:03:36 2013 (r40992, copy of r40991, head/share/pgpkeys/achim.key) @@ -0,0 +1,41 @@ + + + +sub 2048R/E275EF01 2013-01-22 +]]> + Copied: projects/entities/share/pgpkeys/carl.key (from r40991, head/share/pgpkeys/carl.key) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/entities/share/pgpkeys/carl.key Sun Feb 17 01:03:36 2013 (r40992, copy of r40991, head/share/pgpkeys/carl.key) @@ -0,0 +1,62 @@ + + + +sub 4096R/256F29D3 2013-01-15 +]]> + Copied: projects/entities/share/pgpkeys/dbn.key (from r40991, head/share/pgpkeys/dbn.key) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/entities/share/pgpkeys/dbn.key Sun Feb 17 01:03:36 2013 (r40992, copy of r40991, head/share/pgpkeys/dbn.key) @@ -0,0 +1,55 @@ + + + +uid David Naylor +sub 4096g/77FA885C 2008-04-09 +]]> + Copied: projects/entities/share/pgpkeys/dru.key (from r40991, head/share/pgpkeys/dru.key) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/entities/share/pgpkeys/dru.key Sun Feb 17 01:03:36 2013 (r40992, copy of r40991, head/share/pgpkeys/dru.key) @@ -0,0 +1,35 @@ + + + +sub 1024g/7FAC82EA 2013-01-22 +]]> + Modified: projects/entities/share/pgpkeys/glebius.key ============================================================================== --- projects/entities/share/pgpkeys/glebius.key Sun Feb 17 00:25:40 2013 (r40991) +++ projects/entities/share/pgpkeys/glebius.key Sun Feb 17 01:03:36 2013 (r40992) @@ -1,98 +1,50 @@ -uid Gleb Smirnoff -uid Gleb Smirnoff -uid Gleb Smirnoff -uid Gleb Smirnoff -uid Gleb Smirnoff -sub 1024g/A05118BD 2003-08-25 +sub 2048g/11E89DCE 2013-01-30 [expires: 2023-08-25] ]]> Copied: projects/entities/share/pgpkeys/pclin.key (from r40991, head/share/pgpkeys/pclin.key) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/entities/share/pgpkeys/pclin.key Sun Feb 17 01:03:36 2013 (r40992, copy of r40991, head/share/pgpkeys/pclin.key) @@ -0,0 +1,76 @@ + + + +uid Po-Chien Lin +sub 4096R/F31280BA 2013-02-05 +]]> + Modified: projects/entities/share/pgpkeys/pgpkeys-developers.xml ============================================================================== --- projects/entities/share/pgpkeys/pgpkeys-developers.xml Sun Feb 17 00:25:40 2013 (r40991) +++ projects/entities/share/pgpkeys/pgpkeys-developers.xml Sun Feb 17 01:03:36 2013 (r40992) @@ -371,6 +371,11 @@ &pgpkey.bsd; + + &a.carl; + &pgpkey.carl; + + &a.vd.email; &pgpkey.vd; @@ -936,6 +941,11 @@ &pgpkey.laszlof; + + &a.dru; + &pgpkey.dru; + + &a.lawrance.email; &pgpkey.lawrance; @@ -981,6 +991,11 @@ &pgpkey.lesi; + + &a.achim; + &pgpkey.achim; + + &a.cel.email; &pgpkey.cel; @@ -1016,6 +1031,11 @@ &pgpkey.clive; + + &a.pclin; + &pgpkey.pclin; + + &a.yzlin.email; &pgpkey.yzlin; @@ -1226,6 +1246,11 @@ &pgpkey.trasz; + + &a.dbn; + &pgpkey.dbn; + + &a.bland.email; &pgpkey.bland; @@ -1771,11 +1796,6 @@ &pgpkey.flz; - - &a.yar.email; - &pgpkey.yar; - - &a.jilles.email; &pgpkey.jilles; Modified: projects/entities/share/pgpkeys/pgpkeys.ent ============================================================================== --- projects/entities/share/pgpkeys/pgpkeys.ent Sun Feb 17 00:25:40 2013 (r40991) +++ projects/entities/share/pgpkeys/pgpkeys.ent Sun Feb 17 01:03:36 2013 (r40992) @@ -3,6 +3,7 @@ + @@ -63,6 +64,7 @@ + @@ -89,6 +91,7 @@ + @@ -103,6 +106,7 @@ + @@ -282,6 +286,7 @@ + @@ -399,7 +404,6 @@ - Modified: projects/entities/share/xml/authors.ent ============================================================================== --- projects/entities/share/xml/authors.ent Sun Feb 17 00:25:40 2013 (r40991) +++ projects/entities/share/xml/authors.ent Sun Feb 17 01:03:36 2013 (r40992) @@ -27,6 +27,9 @@ ache@FreeBSD.org"> + +achim@FreeBSD.org"> + acm@FreeBSD.org"> @@ -315,6 +318,9 @@ bz@FreeBSD.org"> + +carl@FreeBSD.org"> + carvay@FreeBSD.org"> @@ -462,6 +468,9 @@ dbaker@FreeBSD.org"> + +dbn@FreeBSD.org"> + dburr@FreeBSD.org"> @@ -546,6 +555,9 @@ dougb@FreeBSD.org"> + +dru@FreeBSD.org"> + dryice@FreeBSD.org"> @@ -804,6 +816,9 @@ hsu@FreeBSD.org"> + +ian@FreeBSD.org"> + iedowse@FreeBSD.org"> @@ -1107,6 +1122,9 @@ koitsu@FreeBSD.org"> + +koobs@FreeBSD.org"> + krion@FreeBSD.org"> @@ -1536,6 +1554,9 @@ pb@FreeBSD.org"> + +pclin@FreeBSD.org"> + pdeuskar@FreeBSD.org"> Modified: projects/entities/share/xml/commercial.consult.xml ============================================================================== --- projects/entities/share/xml/commercial.consult.xml Sun Feb 17 00:25:40 2013 (r40991) +++ projects/entities/share/xml/commercial.consult.xml Sun Feb 17 01:03:36 2013 (r40992) @@ -2863,4 +2863,18 @@ approved and registered company in Denmark. + + + The JMBG Network + http://www.jmbg.net + + We believe in quality, reliable and innovative solutions – + so naturally we love FreeBSD. We are a Canadian electronic + solutions provider servicing mainly South-Western Ontario. We + also provide some solutions to clients in Canada and the United + States. We offer a wide range of electronic solutions including + consulting services and we most definitely support and recommend + FreeBSD. + + Modified: projects/entities/share/xml/commercial.isp.xml ============================================================================== --- projects/entities/share/xml/commercial.isp.xml Sun Feb 17 00:25:40 2013 (r40991) +++ projects/entities/share/xml/commercial.isp.xml Sun Feb 17 01:03:36 2013 (r40992) @@ -8,6 +8,16 @@ $FreeBSD$ + + Argeweb Hosting + http://www.argeweb.nl + + Argeweb is one of the largest hosting providers in the Netherlands. + Most of our shared hosting platforms are running on servers powered + by FreeBSD for years. + + + Astute Hosting Incorporated http://www.astutehosting.com @@ -21,6 +31,16 @@ + + CARI.net + http://www.cari.net/ + + CARI.net provides FreeBSD as a hosting platform for clusters, + clouds, and stand-alone dedicated servers. We have been + supporting the Open Source community for over seventeen years. + + + IFDNRG http://www.ifdnrg.com/ @@ -262,6 +282,17 @@ + + GigeNET + http://www.gigenet.com/ + + GigeNET provides dedicated servers, cloud servers, colocation, and + DDOS protection services. We fully support FreeBSD on all our + products as of now. We have integrated FreeBSD 9 in to our Cloud + Server product as well. + + + gradwell dot com Ltd http://www.gradwell.com/ Modified: projects/entities/share/xml/mirrors.xml ============================================================================== --- projects/entities/share/xml/mirrors.xml Sun Feb 17 00:25:40 2013 (r40991) +++ projects/entities/share/xml/mirrors.xml Sun Feb 17 01:03:36 2013 (r40992) @@ -1609,7 +1609,6 @@ ftp2.se.FreeBSD.org ftp://ftp2.se.FreeBSD.org/pub/FreeBSD/ - http://ftp2.se.FreeBSD.org/ rsync://ftp2.se.FreeBSD.org/ @@ -2112,8 +2111,7 @@ ftp9.us.FreeBSD.org - ftp://ftp9.us.FreeBSD.org/pub/FreeBSD/ - http://ftp9.us.FreeBSD.org/pub/os/FreeBSD/ + http://ftp9.us.FreeBSD.org/pub/FreeBSD/ Modified: projects/entities/share/xml/news.xml ============================================================================== --- projects/entities/share/xml/news.xml Sun Feb 17 00:25:40 2013 (r40991) +++ projects/entities/share/xml/news.xml Sun Feb 17 01:03:36 2013 (r40992) @@ -31,7 +31,75 @@ 2013 + 2 + + + 10 + + +

New committer: + Po-Chien Lin (ports)

+ + + + + 1 + + + 23 + +

New committer: + Achim Leubner (src)

+ + + + + + 22 + +

New committer: + Dru Lavigne (doc)

+ + + + + + 16 + +

New committer: + Carl Delsey (src)

+ + + + + + 15 + +

Enhanced commit privileges: René Ladan (ports, + full doc/www)

+ + + + + 14 + +

New committer: + David Naylor (ports)

+ + + + + 13 + + April-June, 2012 Status Report + +

The April-June, 2012 Status Report is now + available with 17 entries.

+ + 10 @@ -74,6 +142,15 @@ href="http://freebsdfoundation.blogspot.com/2013/01/faces-of-freebsd-thomas-abthorpe.html">here.

 + + + 7 + + +

New committer: + Ian Lepore (src)

+ + @@ -106,6 +183,14 @@ + 24 + +

New committer: + Kubilay Kocak (ports)

+ + + + 20 Modified: projects/entities/share/xml/press.xml ============================================================================== --- projects/entities/share/xml/press.xml Sun Feb 17 00:25:40 2013 (r40991) +++ projects/entities/share/xml/press.xml Sun Feb 17 01:03:36 2013 (r40992) @@ -12,6 +12,25 @@ + 2013 + + + 1 + + + A Decade of OS Access-control Extensibility + https://queue.acm.org/detail.cfm?id=2430732 + ACM Queue + https://queue.acm.org/ + 18 January 2013 + Robert N. M. Watson +

To discuss operating system security is to marvel at the + diversity of deployed access-control models.

+ + + + + 2012 Modified: projects/entities/share/xml/xhtml.xsl ============================================================================== --- projects/entities/share/xml/xhtml.xsl Sun Feb 17 00:25:40 2013 (r40991) +++ projects/entities/share/xml/xhtml.xsl Sun Feb 17 01:03:36 2013 (r40992) @@ -39,11 +39,9 @@ <xsl:value-of select="$title" /> - - &header1.googlejs; From owner-svn-doc-projects@FreeBSD.ORG Sun Feb 17 01:03:56 2013 Return-Path: Delivered-To: svn-doc-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id E469342B; Sun, 17 Feb 2013 01:03:56 +0000 (UTC) (envelope-from gjb@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id D4D30270; Sun, 17 Feb 2013 01:03:56 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r1H13uuo010545; Sun, 17 Feb 2013 01:03:56 GMT (envelope-from gjb@svn.freebsd.org) Received: (from gjb@localhost) by svn.freebsd.org (8.14.5/8.14.5/Submit) id r1H13taC010532; Sun, 17 Feb 2013 01:03:55 GMT (envelope-from gjb@svn.freebsd.org) Message-Id: <201302170103.r1H13taC010532@svn.freebsd.org> From: Glen Barber Date: Sun, 17 Feb 2013 01:03:55 +0000 (UTC) To: doc-committers@freebsd.org, svn-doc-projects@freebsd.org Subject: svn commit: r40993 - in projects/entities/en_US.ISO8859-1: articles/committers-guide articles/contributing articles/contributors articles/port-mentor-guidelines articles/portbuild books/arch-handbo... X-SVN-Group: doc-projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-doc-projects@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for doc projects trees List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 17 Feb 2013 01:03:57 -0000 Author: gjb Date: Sun Feb 17 01:03:54 2013 New Revision: 40993 URL: http://svnweb.freebsd.org/changeset/doc/40993 Log: MFH: /head/en_US.ISO8859-1:r40578-40991 Added: projects/entities/en_US.ISO8859-1/htdocs/news/status/report-2012-04-2012-06.xml - copied unchanged from r40991, head/en_US.ISO8859-1/htdocs/news/status/report-2012-04-2012-06.xml Deleted: projects/entities/en_US.ISO8859-1/htdocs/FAQ/ Modified: projects/entities/en_US.ISO8859-1/articles/committers-guide/article.xml projects/entities/en_US.ISO8859-1/articles/contributing/article.xml projects/entities/en_US.ISO8859-1/articles/contributors/contrib.additional.xml (contents, props changed) projects/entities/en_US.ISO8859-1/articles/contributors/contrib.committers.xml projects/entities/en_US.ISO8859-1/articles/contributors/contrib.develalumni.xml projects/entities/en_US.ISO8859-1/articles/contributors/contrib.develinmemoriam.xml projects/entities/en_US.ISO8859-1/articles/port-mentor-guidelines/article.xml projects/entities/en_US.ISO8859-1/articles/portbuild/article.xml projects/entities/en_US.ISO8859-1/books/arch-handbook/book.xml projects/entities/en_US.ISO8859-1/books/arch-handbook/boot/chapter.xml projects/entities/en_US.ISO8859-1/books/arch-handbook/driverbasics/chapter.xml projects/entities/en_US.ISO8859-1/books/arch-handbook/isa/chapter.xml projects/entities/en_US.ISO8859-1/books/arch-handbook/jail/chapter.xml projects/entities/en_US.ISO8859-1/books/arch-handbook/kobj/chapter.xml projects/entities/en_US.ISO8859-1/books/arch-handbook/mac/chapter.xml projects/entities/en_US.ISO8859-1/books/arch-handbook/newbus/chapter.xml projects/entities/en_US.ISO8859-1/books/arch-handbook/pccard/chapter.xml projects/entities/en_US.ISO8859-1/books/arch-handbook/pci/chapter.xml projects/entities/en_US.ISO8859-1/books/arch-handbook/scsi/chapter.xml projects/entities/en_US.ISO8859-1/books/arch-handbook/smp/chapter.xml projects/entities/en_US.ISO8859-1/books/arch-handbook/sound/chapter.xml projects/entities/en_US.ISO8859-1/books/arch-handbook/usb/chapter.xml projects/entities/en_US.ISO8859-1/books/arch-handbook/vm/chapter.xml projects/entities/en_US.ISO8859-1/books/dev-model/book.xml projects/entities/en_US.ISO8859-1/books/developers-handbook/testing/chapter.xml projects/entities/en_US.ISO8859-1/books/faq/book.xml projects/entities/en_US.ISO8859-1/books/fdp-primer/book.xml projects/entities/en_US.ISO8859-1/books/fdp-primer/sgml-primer/chapter.xml projects/entities/en_US.ISO8859-1/books/handbook/advanced-networking/chapter.xml projects/entities/en_US.ISO8859-1/books/handbook/audit/chapter.xml projects/entities/en_US.ISO8859-1/books/handbook/basics/chapter.xml projects/entities/en_US.ISO8859-1/books/handbook/book.xml projects/entities/en_US.ISO8859-1/books/handbook/boot/chapter.xml projects/entities/en_US.ISO8859-1/books/handbook/bsdinstall/chapter.xml projects/entities/en_US.ISO8859-1/books/handbook/config/chapter.xml projects/entities/en_US.ISO8859-1/books/handbook/cutting-edge/chapter.xml projects/entities/en_US.ISO8859-1/books/handbook/desktop/chapter.xml projects/entities/en_US.ISO8859-1/books/handbook/disks/chapter.xml projects/entities/en_US.ISO8859-1/books/handbook/dtrace/chapter.xml projects/entities/en_US.ISO8859-1/books/handbook/eresources/chapter.xml projects/entities/en_US.ISO8859-1/books/handbook/filesystems/chapter.xml projects/entities/en_US.ISO8859-1/books/handbook/firewalls/chapter.xml projects/entities/en_US.ISO8859-1/books/handbook/geom/chapter.xml projects/entities/en_US.ISO8859-1/books/handbook/install/chapter.xml projects/entities/en_US.ISO8859-1/books/handbook/introduction/chapter.xml projects/entities/en_US.ISO8859-1/books/handbook/jails/chapter.xml projects/entities/en_US.ISO8859-1/books/handbook/kernelconfig/chapter.xml projects/entities/en_US.ISO8859-1/books/handbook/l10n/chapter.xml projects/entities/en_US.ISO8859-1/books/handbook/linuxemu/chapter.xml projects/entities/en_US.ISO8859-1/books/handbook/mac/chapter.xml projects/entities/en_US.ISO8859-1/books/handbook/mail/chapter.xml projects/entities/en_US.ISO8859-1/books/handbook/mirrors/chapter.xml projects/entities/en_US.ISO8859-1/books/handbook/multimedia/chapter.xml projects/entities/en_US.ISO8859-1/books/handbook/network-servers/chapter.xml projects/entities/en_US.ISO8859-1/books/handbook/ports/chapter.xml projects/entities/en_US.ISO8859-1/books/handbook/ppp-and-slip/chapter.xml projects/entities/en_US.ISO8859-1/books/handbook/preface/preface.xml projects/entities/en_US.ISO8859-1/books/handbook/printing/chapter.xml projects/entities/en_US.ISO8859-1/books/handbook/security/chapter.xml projects/entities/en_US.ISO8859-1/books/handbook/serialcomms/chapter.xml projects/entities/en_US.ISO8859-1/books/handbook/users/chapter.xml projects/entities/en_US.ISO8859-1/books/handbook/vinum/chapter.xml projects/entities/en_US.ISO8859-1/books/handbook/virtualization/chapter.xml projects/entities/en_US.ISO8859-1/books/porters-handbook/book.xml (contents, props changed) projects/entities/en_US.ISO8859-1/htdocs/Makefile projects/entities/en_US.ISO8859-1/htdocs/about.xml projects/entities/en_US.ISO8859-1/htdocs/advocacy/myths.xml projects/entities/en_US.ISO8859-1/htdocs/applications.xml projects/entities/en_US.ISO8859-1/htdocs/cgi/man.cgi projects/entities/en_US.ISO8859-1/htdocs/doc/Makefile projects/entities/en_US.ISO8859-1/htdocs/donations/donors.xml (contents, props changed) projects/entities/en_US.ISO8859-1/htdocs/donations/wantlist.xml projects/entities/en_US.ISO8859-1/htdocs/features.xml projects/entities/en_US.ISO8859-1/htdocs/internal/doceng.xml projects/entities/en_US.ISO8859-1/htdocs/internal/internal.xml projects/entities/en_US.ISO8859-1/htdocs/layout/css/layout.css projects/entities/en_US.ISO8859-1/htdocs/layout/js/google.js projects/entities/en_US.ISO8859-1/htdocs/mailto.xml projects/entities/en_US.ISO8859-1/htdocs/news/status/Makefile projects/entities/en_US.ISO8859-1/htdocs/news/status/README projects/entities/en_US.ISO8859-1/htdocs/news/status/status.xml projects/entities/en_US.ISO8859-1/htdocs/projects/mac/index.xml projects/entities/en_US.ISO8859-1/htdocs/projects/newbies.xml projects/entities/en_US.ISO8859-1/htdocs/projects/projects.xml projects/entities/en_US.ISO8859-1/htdocs/releases/9.1R/schedule.xml projects/entities/en_US.ISO8859-1/htdocs/releng/index.xml projects/entities/en_US.ISO8859-1/htdocs/relnotes.xml projects/entities/en_US.ISO8859-1/htdocs/security/security.xml projects/entities/en_US.ISO8859-1/htdocs/snapshots/index.xml projects/entities/en_US.ISO8859-1/share/xml/mailing-lists.ent Directory Properties: projects/entities/en_US.ISO8859-1/ (props changed) Modified: projects/entities/en_US.ISO8859-1/articles/committers-guide/article.xml ============================================================================== --- projects/entities/en_US.ISO8859-1/articles/committers-guide/article.xml Sun Feb 17 01:03:36 2013 (r40992) +++ projects/entities/en_US.ISO8859-1/articles/committers-guide/article.xml Sun Feb 17 01:03:54 2013 (r40993) @@ -26,6 +26,7 @@ 2010 2011 2012 + 2013 The FreeBSD Documentation Project @@ -212,7 +213,7 @@ doc doceng@ - doc/, www/, src/ documentation + doc/, src/ documentation @@ -1720,6 +1721,13 @@ U stable/9/share/man/man4/netmap.4 &prompt.user; svn merge -r179454:179453 svn+ssh://svn.freebsd.org/base/ROADMAP.txt + + It is important to ensure that the mergeinfo + is correct when reverting a file in order to permit + svn mergeinfo --eligible to work as + expected. + + Reverting the deletion of a file is slightly different. Copying the version of the file that predates the deletion is required. For example, to restore a file that was @@ -3694,7 +3702,7 @@ ControlPersist yes specifically permitted by portmgr. Complete details about what qualifies as a sweeping change can be found on the Portmgr + url="&url.base/portmgr;/implementation.html">Portmgr Implementation page. The benefit of a slush as opposed to a complete @@ -4146,7 +4154,6 @@ bak/packages packages from last complet there are at least some perks: - Direct access to cvsup-master Modified: projects/entities/en_US.ISO8859-1/articles/contributing/article.xml ============================================================================== --- projects/entities/en_US.ISO8859-1/articles/contributing/article.xml Sun Feb 17 01:03:36 2013 (r40992) +++ projects/entities/en_US.ISO8859-1/articles/contributing/article.xml Sun Feb 17 01:03:54 2013 (r40993) @@ -518,9 +518,9 @@ THIS SOFTWARE, EVEN IF ADVISED OF THE PO Donations may be sent in check form to:
The FreeBSD Foundation - 7321 Brockway Dr. + P.O. Box 20247, Boulder, - CO 80303 + CO 80308 USA
Modified: projects/entities/en_US.ISO8859-1/articles/contributors/contrib.additional.xml ============================================================================== --- projects/entities/en_US.ISO8859-1/articles/contributors/contrib.additional.xml Sun Feb 17 01:03:36 2013 (r40992) +++ projects/entities/en_US.ISO8859-1/articles/contributors/contrib.additional.xml Sun Feb 17 01:03:54 2013 (r40993) @@ -2366,11 +2366,6 @@ - David Naylor - naylor.b.david@gmail.com - - - David Otto ottodavid@gmx.net @@ -2605,6 +2600,11 @@ + Dmitry Kazarov + d.y.kazarov@mail.ru + + + Dmitry Khrustalev dima@xyzzy.machaon.ru @@ -3368,7 +3368,7 @@ Gary Hayers - gary@hayers.net + gary@hayers.org @@ -5133,6 +5133,11 @@ + Joseph Mingrone + jrm@ftfl.ca + + + Joseph Scott joseph@randomnetworks.com @@ -5312,11 +5317,6 @@ - Kubilay Kocak - koobs.freebsd@gmail.com - - - KUNISHIMA Takeo kunishi@c.oka-pu.ac.jp @@ -6476,6 +6476,11 @@ + Matt Stofko + matt@mjslabs.com + + + Matt Thomas matt@3am-software.com @@ -6830,6 +6835,11 @@ + Michael Sanders + mike@topcat.hypermart.net + + + Michael Sardo jaeger16@yahoo.com @@ -8375,11 +8385,6 @@ - Po-Chien Lin - linpc@cs.nctu.edu.tw - - - Pomegranate daver@flag.blackened.net @@ -8787,6 +8792,11 @@ + Dr. Rolf Jansen + cyclaero@gmail.com + + + Roman Neuhauser neuhauser@chello.cz @@ -10822,6 +10832,11 @@ + Yamagi Burmeister + yamagi@yamagi.org + + + Yanhui Shen shen.elf@gmail.com Modified: projects/entities/en_US.ISO8859-1/articles/contributors/contrib.committers.xml ============================================================================== --- projects/entities/en_US.ISO8859-1/articles/contributors/contrib.committers.xml Sun Feb 17 01:03:36 2013 (r40992) +++ projects/entities/en_US.ISO8859-1/articles/contributors/contrib.committers.xml Sun Feb 17 01:03:54 2013 (r40993) @@ -68,6 +68,10 @@ + &a.syuu.email; + + + &a.gavin.email; @@ -172,10 +176,6 @@ - &a.wilko.email; - - - &a.oleg.email; @@ -292,6 +292,10 @@ + &a.carl.email; + + + &a.vd.email; @@ -696,6 +700,10 @@ + &a.koobs.email; + + + &a.jkois.email; @@ -780,6 +788,10 @@ + &a.dru.email; + + + &a.jlh.email; @@ -804,6 +816,14 @@ + &a.ian.email; + + + + &a.achim.email; + + + &a.truckman.email; @@ -824,6 +844,10 @@ + &a.pclin.email; + + + &a.yzlin.email; @@ -1020,6 +1044,10 @@ + &a.dbn.email; + + + &a.bland.email; @@ -1650,8 +1678,4 @@ &a.az.email; - - - &a.syuu.email; - Modified: projects/entities/en_US.ISO8859-1/articles/contributors/contrib.develalumni.xml ============================================================================== --- projects/entities/en_US.ISO8859-1/articles/contributors/contrib.develalumni.xml Sun Feb 17 01:03:36 2013 (r40992) +++ projects/entities/en_US.ISO8859-1/articles/contributors/contrib.develalumni.xml Sun Feb 17 01:03:54 2013 (r40993) @@ -3,6 +3,10 @@ + &a.wilko.email; (2000 - 2012) + + + &a.dougb.email; (2000 - 2012) Modified: projects/entities/en_US.ISO8859-1/articles/contributors/contrib.develinmemoriam.xml ============================================================================== --- projects/entities/en_US.ISO8859-1/articles/contributors/contrib.develinmemoriam.xml Sun Feb 17 01:03:36 2013 (r40992) +++ projects/entities/en_US.ISO8859-1/articles/contributors/contrib.develinmemoriam.xml Sun Feb 17 01:03:54 2013 (r40993) @@ -7,7 +7,7 @@ John made major contributions to FreeBSD, the best known of which - is the import of the &man.dtrace.1 code. John's unique sense + is the import of the &man.dtrace.1; code. John's unique sense of humor and plain-spokenness either ruffled feathers or made him quick friends. At the end of his life, he had moved to a rural area and was attempting to live with Modified: projects/entities/en_US.ISO8859-1/articles/port-mentor-guidelines/article.xml ============================================================================== --- projects/entities/en_US.ISO8859-1/articles/port-mentor-guidelines/article.xml Sun Feb 17 01:03:36 2013 (r40992) +++ projects/entities/en_US.ISO8859-1/articles/port-mentor-guidelines/article.xml Sun Feb 17 01:03:54 2013 (r40993) @@ -127,8 +127,8 @@ We expect mentors to make sure their mentees read the Porter's Handbook, the PR handling guide, and - the Committer's + url="&url.articles.pr-guidelines;">PR handling guide, and + the Committer's Guide. While it's not necessary to memorize all the details, every committer needs to have an overview of these things to be an effective part of the community (and avoid as Modified: projects/entities/en_US.ISO8859-1/articles/portbuild/article.xml ============================================================================== --- projects/entities/en_US.ISO8859-1/articles/portbuild/article.xml Sun Feb 17 01:03:36 2013 (r40992) +++ projects/entities/en_US.ISO8859-1/articles/portbuild/article.xml Sun Feb 17 01:03:54 2013 (r40993) @@ -63,7 +63,7 @@ The codebase Most of the package building magic occurs under the - /var/portbuild directory. Unless + /a/portbuild directory. Unless otherwise specified, all paths will be relative to this location. ${arch} will be used to specify one of the package architectures @@ -77,15 +77,16 @@ - Packages are no longer built for branches 4, 5, or 6, nor + FreeBSD no longer builds packages for branches 4, 5, or 6, nor for the alpha architecture. - The scripts that control all of this live in - /var/portbuild/scripts/. + The scripts that control all of this live in either + /a/portbuild/scripts/ or. + /a/portbuild/admin/scripts/. These are the checked-out copies from the Subversion repository at - - base/projects/portbuild/scripts/ + + base/projects/portbuild/ . Typically, incremental builds are done that use previous @@ -112,7 +113,7 @@ - Notes on the codebase + Historical notes on the codebase Until mid-2010, the scripts were completely specific to pointyhat.FreeBSD.org as the head (dispatch) node. During @@ -148,18 +149,6 @@ - This document was originally written before these changes - were made. Where things such as script invocations have changed, - they were denoted as new codebase: as opposed - to old codebase:. - - - Up until November 2012, pointyhat had still - been running the old codebase. That installation has now been - permanently offlined. Therefore, all the instructions having - to do with the old codebase have been removed. - - Also during this process, the codebase was migrated to the @@ -169,16 +158,61 @@ found in CVS. + + + Notes on privilege separation + + As of January 2013, a rewrite is in progress to further separate + privileges. The following concepts are introduced: + + + + Server-side user portbuild assumes all + responsiblity for operations involving builds and communicating + with the clients. This user no longer has access to + sudo. + + + + Server-side user srcbuild is created + and given responsiblity for operations involving both VCS + operations and anything involving src builds for the clients. + This user does not have access to + sudo. + + + + The server-side + ports-arch + users go away. + + + + None of the above server-side users have + ssh keys. Individual + portmgr will accomplish all those + tasks using ksu. (This is + still work-in-progress.) + + + + The only client-side user is also named + portbuild and still has access to + sudo for the purpose of managing + jails. + + + Build Client Management - The &i386; clients co-located with pointyhat - netboot from it (connected nodes); all - other clients (disconnected nodes) - are either self-hosted or netboot from some other - pxe host. + You may set up clients to either netboot from the master + (connected nodes) + or have them either self-hosted or netboot from some other + pxe host + (disconnected nodes). In all cases they set themselves up at boot-time to prepare to build packages. @@ -189,7 +223,7 @@ nullfs-mounted for jail builds. The - ports-${arch} + portbuild user can &man.ssh.1; to the client nodes to monitor them. Use sudo and check the portbuild.hostname.conf @@ -203,29 +237,31 @@ Jail Build Environment Setup - Package builds are performed in a + Package builds are performed by the clients in a jail populated by the portbuild script using the ${arch}/${branch}/builds/${buildid}/bindist.tar file. - The makeworld command builds a world from the + On the server, use the + makeworld command to build a world from the ${arch}/${branch}/builds/${buildid}/src/ - tree and installs it into + tree and install it into ${arch}/${branch}/builds/${buildid}/bindist.tar. The tree will be updated first unless -novcs is - specified. It should be run as root: + specified. - &prompt.root; /var/portbuild/scripts/makeworld ${arch} ${branch} ${buildid} [-novcs] + &prompt.root; /a/portbuild/admin/scripts/makeworld ${arch} ${branch} ${buildid} [-novcs] - The bindist.tar tarball is created from the + Similiarly on the server, the + bindist.tar tarball is created from the previously installed world by the mkbindist - script. It should be also be run as root: + script. - &prompt.root; /var/portbuild/scripts/mkbindist ${arch} ${branch} ${buildid} + &prompt.root; /a/portbuild/admin/scripts/mkbindist ${arch} ${branch} ${buildid} - The per-machine tarballs are located in + The per-machine tarballs are located on the server in ${arch}/clients. The bindist.tar file is extracted @@ -236,6 +272,16 @@ For both commands above, if ${buildid} is latest, it may be omitted. + + + Currently the above two scripts must be run as + root; otherwise, the install scripts + lack sufficient permissions. This is undesirable for + security reasons. Work is in progress in -HEAD to allow + users to do installations; once that is committed, the + intention is to use that and run these two commands as + srcbuild. + @@ -548,7 +594,7 @@ PKG_BIN=/usr/local/sbin/pkg Make sure the ${arch} build - is run as the ports-${arch} user + is run as the portbuild user or it will complain loudly. @@ -785,7 +831,7 @@ PKG_BIN=/usr/local/sbin/pkgTo free up resources, you will need to clean up client machines by running build cleanup command. For example: - &prompt.user; /var/portbuild/scripts/build cleanup i386 8-exp 20080714120411 -full + &prompt.user; /a/portbuild/scripts/build cleanup i386 8-exp 20080714120411 -full If you forget to do this, then the old build jails will not be cleaned up for 24 hours, and no @@ -800,6 +846,11 @@ PKG_BIN=/usr/local/sbin/pkgloads thinks are in use, you are in trouble. + + The following notes about mounting only apply to + connected nodes. + + You may have problem with the umount commands hanging. If so, you are going to have to use the allgohans script to run an &man.ssh.1; @@ -829,6 +880,11 @@ umount: Cleanup of /x/tmp/8-exp/chroot/5 You may also see messages about procfs. + + The above is the end of the notes that apply only to + connected nodes. + + After you have done all the above, remove the ${arch}/lock file before trying to restart the build. If you do not, @@ -875,7 +931,7 @@ umount: Cleanup of /x/tmp/8-exp/chroot/5 scripts/stats ${branch} command shows the number of packages already built. - Running cat /var/portbuild/*/loads/* + Running cat /a/portbuild/*/loads/* shows the client loads and number of concurrent builds in progress. The files that have been recently updated are the clients that are online; the others are the offline clients. @@ -912,7 +968,7 @@ umount: Cleanup of /x/tmp/8-exp/chroot/5 it if not. Keep an eye on &man.df.1; output. If the - /var/portbuild file system becomes full + /a/portbuild file system becomes full then Bad Things happen. The status of all current builds is generated periodically @@ -1017,12 +1073,7 @@ umount: Cleanup of /x/tmp/8-exp/chroot/5 &prompt.user; cd ${arch}/${branch} &prompt.user; find distfiles > distfiles-${release} - - This inventory file typically lives in - i386/${branch} - on the cluster master. - - This is useful to aid in periodically cleaning out + You should use that output to periodically clean out the distfiles from ftp-master. When space gets tight, distfiles from recent releases can be kept while others can be thrown away. @@ -1046,6 +1097,16 @@ umount: Cleanup of /x/tmp/8-exp/chroot/5 Uploading Packages + + For FreeBSD.org as of 2013, the instructions + about uploading to ftp-master are obsolete. + In the future, ftp-master will pull + from pointyhat, using a mechanism yet + to be implemented. However, the instructions about + RESTRICTED and NO_CDROM + must still be carefully followed. + + Once a build has completed, packages and/or distfiles can be transferred to ftp-master for propagation to the FTP mirror network. If the build was @@ -1123,7 +1184,7 @@ umount: Cleanup of /x/tmp/8-exp/chroot/5 a new release), copy packages to the staging area on ftp-master with something like the following: - &prompt.root; cd /var/portbuild/${arch}/${branch} + &prompt.root; cd /a/portbuild/${arch}/${branch} &prompt.root; tar cfv - packages/ | ssh portmgr@ftp-master tar xfC - w/ports/${arch}/tmp/${subdir} Then log into ftp-master, verify that @@ -1151,7 +1212,7 @@ umount: Cleanup of /x/tmp/8-exp/chroot/5 Distfiles should be transferred with the cpdistfiles script: - &prompt.root; /var/portbuild/scripts/cpdistfiles ${arch} ${branch} ${buildid} [-yesreally] | tee log2 + &prompt.root; /a/portbuild/scripts/cpdistfiles ${arch} ${branch} ${buildid} [-yesreally] | tee log2 Doing it by hand is deprecated. @@ -1159,6 +1220,11 @@ umount: Cleanup of /x/tmp/8-exp/chroot/5 Experimental Patches Builds + + Most of the information in this section is obsolete + as of 2013 and needs to be rewritten. + + Experimental patches builds are run from time to time to new features or bugfixes to the ports infrastructure (i.e. bsd.port.mk), or to test large sweeping @@ -1209,21 +1275,15 @@ umount: Cleanup of /x/tmp/8-exp/chroot/5 build. This will ensure an apples-to-apples comparison later. - - Once the build finishes, compare the control build failures to those of the experimental patches build. Use the following commands to facilitate this (this assumes the 8 branch is the control branch, and the 8-exp branch is the experimental patches branch): - &prompt.user; cd /var/portbuild/i386/8-exp/errors + &prompt.user; cd /a/portbuild/i386/8-exp/errors &prompt.user; find . -name \*.log\* | sort > /tmp/8-exp-errs -&prompt.user; cd /var/portbuild/i386/8/errors +&prompt.user; cd /a/portbuild/i386/8/errors &prompt.user; find . -name \*.log\* | sort > /tmp/8-errs @@ -1286,7 +1346,7 @@ umount: Cleanup of /x/tmp/8-exp/chroot/5 rebuild of the affected packages under the control branch: - &prompt.user; cd /var/portbuild/i386/8/ports + &prompt.user; cd /a/portbuild/i386/8/ports The following example is obsolete @@ -1299,9 +1359,9 @@ umount: Cleanup of /x/tmp/8-exp/chroot/5 The following command will set up the control branch for - the partial build (old codebase): + the partial build: - &prompt.user; /var/portbuild/scripts/dopackages.8 -noportsvcs -nobuild -novcs -nofinish + &prompt.user; /a/portbuild/scripts/dopackages.wrapper i386 8 -noportsvcs -nobuild -novcs -nofinish The builds must be performed from the @@ -1309,14 +1369,14 @@ umount: Cleanup of /x/tmp/8-exp/chroot/5 initially be empty except for the Makefile symlink. If this symlink does not exist, it must be created: - &prompt.user; cd /var/portbuild/i386/8/packages/All + &prompt.user; cd /a/portbuild/i386/8/packages/All &prompt.user; ln -sf ../../Makefile . &prompt.user; make -k -j<#> <list of packages to build> <#> is the concurrency of the build to attempt. It is usually the sum of the weights listed in - /var/portbuild/i386/mlist unless you have a + /a/portbuild/i386/mlist unless you have a reason to run a heavier or lighter build. The list of packages to build should be a list of package @@ -1349,17 +1409,15 @@ umount: Cleanup of /x/tmp/8-exp/chroot/5 Before following these steps, please coordinate with portmgr. - - Due to some generous donations, portmgr is - no longer looking for the loan of &i386; or amd64 - systems. However, we are still interested in borrowing tier-2 - systems. - - Node requirements - portmgr is still working on characterizing + + This section is only of interest when considering + tier-2 architectures. + + + Here are the requirement for what a node needs to be generally useful. @@ -1439,7 +1497,8 @@ umount: Cleanup of /x/tmp/8-exp/chroot/5 /usr2/.) The filename chroot is a - historical remnant. + historical remnant. The chroot + command is no longer used. @@ -1480,8 +1539,9 @@ umount: Cleanup of /x/tmp/8-exp/chroot/5 Generate a kernel config file. Include - GENERIC (or, if you are using more than - 3.5G on &i386;, PAE). + GENERIC (or, if on &i386, and + you are using more than + 3.5G, PAE). Required options: @@ -1496,9 +1556,14 @@ options SHMMAXPGS=65536 options SEMMNI=40 options SEMMNS=240 options SEMUME=40 -options SEMMNU=120 +options SEMMNU=120 + + If you are interested in debugging general + problems, you may wish to use the following. + However, for unattended operations, it is best + to leave it out: -options ALT_BREAK_TO_DEBUGGER + options ALT_BREAK_TO_DEBUGGER For PAE, it is not currently possible to load modules. Therefore, if you are running an architecture @@ -1553,11 +1618,11 @@ options NFSSERVER Create a - ports-${arch} + portbuild user and group. It can have the '*' password. Create - /home/ports-${arch}/.ssh/ + /home/portbuild/.ssh/ and populate authorized_keys. @@ -1836,8 +1901,7 @@ touch /tmp/.boot_finishedusr/local/etc/sudoers/sudoers.d/portbuild: # local changes for package building -%wheel ALL=(ALL) ALL -ports-${arch} ALL=(ALL) NOPASSWD: ALL +portbuild ALL=(ALL) NOPASSWD: ALL @@ -1858,9 +1922,9 @@ ports-${arch} As root: &prompt.root; mkdir portbuild -&prompt.root; chown ports-${arch}:ports-${arch} portbuild +&prompt.root; chown portbuild:portbuild portbuild &prompt.root; mkdir pkgbuild -&prompt.root; chown ports-${arch}:ports-${arch} pkgbuild +&prompt.root; chown portbuild:portbuild pkgbuild &prompt.root; mkdir squid &prompt.root; mkdir squid/cache &prompt.root; mkdir squid/logs @@ -1894,7 +1958,7 @@ ports-${arch} Configuration on the server These steps need to be taken by a portmgr - acting as ports-${arch} + acting as portbuild on the server. @@ -1902,13 +1966,13 @@ ports-${arch} If any of the default TCP ports is not available (see above), you will need to create an ssh tunnel for them and include its invocation command in - ports-${arch}'s + portbuild's crontab. Unless you can use the defaults, add an entry to - /home/ports-${arch}/.ssh/config + /home/portbuild/.ssh/config to specify the public IP address, TCP port for ssh, username, and any other necessary information. @@ -1916,7 +1980,7 @@ ports-${arch} Create - /var/portbuild/${arch}/clients/bindist-${hostname}.tar. + /a/portbuild/${arch}/clients/bindist-${hostname}.tar. @@ -1955,16 +2019,16 @@ MASTER_SITE_OVERRIDE= \ Hint: you will need one of these for each machine; however, if you have multiple machines at one site, you should create a site-specific one (e.g., in - /var/portbuild/conf/clients/) + /a/portbuild/conf/clients/) and symlink to it. Create -/var/portbuild/${arch}/portbuild-${hostname} +/a/portbuild/${arch}/portbuild-${hostname} using one of the existing ones as a guide. This file contains overrides to -/var/portbuild/${arch}/portbuild.conf. +/a/portbuild/${arch}/portbuild.conf. Suggested values: @@ -1972,7 +2036,7 @@ MASTER_SITE_OVERRIDE= \ http_proxy="http://localhost:3128/" squid_dir=/usr2/squid scratchdir=/usr2/pkgbuild -client_user=ports-${arch} +client_user=portbuild sudo_cmd="sudo -H" rsync_gzip=-z @@ -2014,7 +2078,7 @@ ssh_cmd="/usr/local/bin/ssh"Enabling the node These steps need to be taken by a portmgr - acting as ports-arch: + acting as portbuild: @@ -2030,7 +2094,7 @@ ssh_cmd="/usr/local/bin/ssh" Populate the client's copy of /var/portbuild/scripts/ by something like - /var/portbuild/scripts/dosetupnode arch major latest hostname. + /a/portbuild/scripts/dosetupnode arch major latest hostname. Verify that you now have files in that directory. @@ -2068,14 +2132,14 @@ ssh_cmd="/usr/local/bin/ssh" Finally, again as portmgr - acting as ports-arch: + acting as portbuild: Once you are sure that the client is working, tell pollmachine about it by adding it to - /var/portbuild/${arch}/mlist. + /a/portbuild/${arch}/mlist. @@ -2091,10 +2155,15 @@ ssh_cmd="/usr/local/bin/ssh"HEAD. + + As + srcbuild: + + - Edit /var/portbuild/conf/server.conf + Edit /a/portbuild/conf/admin/admin.conf with the following changes: @@ -2119,7 +2188,7 @@ ssh_cmd="/usr/local/bin/ssh" - Run /var/portbuild/updatesnap manually. + Run /a/portbuild/admin/scripts/updatesnap manually. @@ -2127,24 +2196,21 @@ ssh_cmd="/usr/local/bin/ssh" Steps necessary after <application>qmanager</application> is started - - Again, as - ports-arch: - - For each branch that will be supported, do the following: - Kick-start the build for the branch with: + As portbuild, + kick-start the build for the branch with: build create arch branch - Create + As srcbuild, + create bindist.tar. @@ -2161,7 +2227,7 @@ ssh_cmd="/usr/local/bin/ssh" - Edit /var/portbuild/conf/server.conf + Edit /a/portbuild/admin/conf/admin.conf with the following changes: @@ -2188,7 +2254,7 @@ zfs destroy -r a/snap/src-o You will probably find that the following files and - symlinks in /var/portbuild/errorlogs/ + symlinks in /a/portbuild/errorlogs/ can be removed: @@ -2233,7 +2299,7 @@ zfs destroy -r a/snap/src-o - Edit /var/portbuild/conf/server.conf + Edit /a/portbuild/admin/conf/admin.conf with the following changes: @@ -2248,7 +2314,7 @@ zfs destroy -r a/snap/src-o - Run /var/portbuild/updatesnap manually. + Run /a/portbuild/admin/scripts/updatesnap manually. @@ -2272,49 +2338,24 @@ zfs destroy -r a/snap/src-o Steps necessary before <application>qmanager</application> is started - The initial steps need to be done using - sudo. + The next steps are most easily done as user + portbuild. - *** DIFF OUTPUT TRUNCATED AT 1000 LINES *** From owner-svn-doc-projects@FreeBSD.ORG Sun Feb 17 01:06:45 2013 Return-Path: Delivered-To: svn-doc-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id E94A2583; Sun, 17 Feb 2013 01:06:45 +0000 (UTC) (envelope-from gjb@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id C042528E; Sun, 17 Feb 2013 01:06:45 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r1H16j1i011056; Sun, 17 Feb 2013 01:06:45 GMT (envelope-from gjb@svn.freebsd.org) Received: (from gjb@localhost) by svn.freebsd.org (8.14.5/8.14.5/Submit) id r1H16ji7011055; Sun, 17 Feb 2013 01:06:45 GMT (envelope-from gjb@svn.freebsd.org) Message-Id: <201302170106.r1H16ji7011055@svn.freebsd.org> From: Glen Barber Date: Sun, 17 Feb 2013 01:06:45 +0000 (UTC) To: doc-committers@freebsd.org, svn-doc-projects@freebsd.org Subject: svn commit: r40994 - projects/pkgng X-SVN-Group: doc-projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-doc-projects@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for doc projects trees List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 17 Feb 2013 01:06:46 -0000 Author: gjb Date: Sun Feb 17 01:06:45 2013 New Revision: 40994 URL: http://svnweb.freebsd.org/changeset/doc/40994 Log: Remove pkgng branch. It has served its purpose well. Approved by: doceng (implicit) Deleted: projects/pkgng/ From owner-svn-doc-projects@FreeBSD.ORG Mon Feb 18 13:03:20 2013 Return-Path: Delivered-To: svn-doc-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id 60C79E1; Mon, 18 Feb 2013 13:03:20 +0000 (UTC) (envelope-from gabor@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id 49F75AD5; Mon, 18 Feb 2013 13:03:20 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r1ID3Kx7069525; Mon, 18 Feb 2013 13:03:20 GMT (envelope-from gabor@svn.freebsd.org) Received: (from gabor@localhost) by svn.freebsd.org (8.14.5/8.14.5/Submit) id r1ID3JEC069522; Mon, 18 Feb 2013 13:03:19 GMT (envelope-from gabor@svn.freebsd.org) Message-Id: <201302181303.r1ID3JEC069522@svn.freebsd.org> From: Gabor Kovesdan Date: Mon, 18 Feb 2013 13:03:19 +0000 (UTC) To: doc-committers@freebsd.org, svn-doc-projects@freebsd.org Subject: svn commit: r41006 - in projects/xml-tools/share: mk xml X-SVN-Group: doc-projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-doc-projects@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for doc projects trees List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 18 Feb 2013 13:03:20 -0000 Author: gabor Date: Mon Feb 18 13:03:19 2013 New Revision: 41006 URL: http://svnweb.freebsd.org/changeset/doc/41006 Log: - Fix rendering of Handbook with (Open)Jade Modified: projects/xml-tools/share/mk/doc.commands.mk projects/xml-tools/share/mk/doc.docbook.mk projects/xml-tools/share/xml/freebsd45.dtd Modified: projects/xml-tools/share/mk/doc.commands.mk ============================================================================== --- projects/xml-tools/share/mk/doc.commands.mk Mon Feb 18 11:40:31 2013 (r41005) +++ projects/xml-tools/share/mk/doc.commands.mk Mon Feb 18 13:03:19 2013 (r41006) @@ -70,9 +70,9 @@ HTML2TXT?= ${PREFIX}/bin/w3m HTML2TXTOPTS?= -dump ${HTML2TXTFLAGS} .if exists(${PREFIX}/bin/jade) && !defined(OPENJADE) -JADE?= ${PREFIX}/bin/jade +JADE?= ${ENV} SP_ENCODING=XML ${PREFIX}/bin/jade .else -JADE?= ${PREFIX}/bin/openjade +JADE?= ${ENV} SP_ENCODING=XML ${PREFIX}/bin/openjade JADEFLAGS+= -V openjade .endif @@ -93,7 +93,7 @@ TEX_CMD?= ${PREFIX}/bin/tex PDFTEX_CMD?= ${PREFIX}/bin/pdftex .endif LATEX_CMD?= ${PREFIX}/bin/latex -JADETEX_CMD?= ${TEX_CMD} "&jadetex" +JADETEX_CMD?= ${PDFTEX_CMD} "&jadetex" JADETEX_PREPROCESS?= /bin/cat PDFJADETEX_CMD?=${PDFTEX_CMD} "&pdfjadetex" PDFJADETEX_PREPROCESS?= /bin/cat Modified: projects/xml-tools/share/mk/doc.docbook.mk ============================================================================== --- projects/xml-tools/share/mk/doc.docbook.mk Mon Feb 18 11:40:31 2013 (r41005) +++ projects/xml-tools/share/mk/doc.docbook.mk Mon Feb 18 13:03:19 2013 (r41006) @@ -71,9 +71,6 @@ MASTERDOC?= ${.CURDIR}/${DOC}.xml -# List of supported SP_ENCODINGs -SP_ENCODING_LIST?= ISO-8859-2 KOI8-R - # Either jade or fop RENDERENGINE?= jade @@ -94,7 +91,8 @@ XSLFO?= ${DOC_PREFIX}/share/xsl/freebsd IMAGES_LIB?= -JADEOPTS?= -w no-valid ${JADEFLAGS} -D ${IMAGES_EN_DIR}/${DOC}s/${.CURDIR:T} -D ${CANONICALOBJDIR} +JADEOPTS?= -ijade.compat -w no-valid ${JADEFLAGS} \ + -D ${IMAGES_EN_DIR}/${DOC}s/${.CURDIR:T} -D ${CANONICALOBJDIR} XSLTPROCOPTS?= --nonet KNOWN_FORMATS= html html.tar html-split html-split.tar \ @@ -326,7 +324,14 @@ NO_RTF= yes # Parsed XML ------------------------------------------------------- ${DOC}.parsed.xml: ${SRCS} - ${XMLLINT} --nonet --noent --valid --xinclude --dropdtd ${MASTERDOC} > ${.TARGET} + ${GREP} '^' ${DOC}.xml > ${.TARGET} +.if ${DOC} == "book" + ${ECHO_CMD} '' >> ${.TARGET} +.else + ${ECHO_CMD} '' >> ${.TARGET} +.endif + ${XMLLINT} --nonet --noent --valid --xinclude --dropdtd ${MASTERDOC} | \ + ${GREP} -v '^' >> ${.TARGET} # XHTML ------------------------------------------------------------- Modified: projects/xml-tools/share/xml/freebsd45.dtd ============================================================================== --- projects/xml-tools/share/xml/freebsd45.dtd Mon Feb 18 11:40:31 2013 (r41005) +++ projects/xml-tools/share/xml/freebsd45.dtd Mon Feb 18 13:03:19 2013 (r41006) @@ -3,7 +3,17 @@ + + +]]> + @@ -41,6 +51,7 @@ "/usr/local/share/xml/docbook/4.5/docbookx.dtd"> %orig-docbook; + %authors; @@ -52,6 +63,7 @@ %orig-entities; +]]> Delivered-To: svn-doc-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id C4E5CD49; Mon, 18 Feb 2013 15:29:08 +0000 (UTC) (envelope-from gabor@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id AF24035D; Mon, 18 Feb 2013 15:29:08 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r1IFT8lN013554; Mon, 18 Feb 2013 15:29:08 GMT (envelope-from gabor@svn.freebsd.org) Received: (from gabor@localhost) by svn.freebsd.org (8.14.5/8.14.5/Submit) id r1IFT7la013541; Mon, 18 Feb 2013 15:29:07 GMT (envelope-from gabor@svn.freebsd.org) Message-Id: <201302181529.r1IFT7la013541@svn.freebsd.org> From: Gabor Kovesdan Date: Mon, 18 Feb 2013 15:29:07 +0000 (UTC) To: doc-committers@freebsd.org, svn-doc-projects@freebsd.org Subject: svn commit: r41007 - in projects/xml-tools: bn_BD.ISO10646-1/articles/explaining-bsd bn_BD.ISO10646-1/articles/new-users de_DE.ISO8859-1/htdocs de_DE.ISO8859-1/share/xml en_US.ISO8859-1/articles/co... X-SVN-Group: doc-projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-doc-projects@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for doc projects trees List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 18 Feb 2013 15:29:08 -0000 Author: gabor Date: Mon Feb 18 15:29:06 2013 New Revision: 41007 URL: http://svnweb.freebsd.org/changeset/doc/41007 Log: - MFH Added: projects/xml-tools/share/pgpkeys/achim.key - copied unchanged from r41006, head/share/pgpkeys/achim.key projects/xml-tools/share/pgpkeys/pclin.key - copied unchanged from r41006, head/share/pgpkeys/pclin.key Deleted: projects/xml-tools/en_US.ISO8859-1/htdocs/FAQ/ Modified: projects/xml-tools/bn_BD.ISO10646-1/articles/explaining-bsd/article.xml projects/xml-tools/bn_BD.ISO10646-1/articles/new-users/article.xml projects/xml-tools/de_DE.ISO8859-1/htdocs/about.xml projects/xml-tools/de_DE.ISO8859-1/share/xml/news.xml projects/xml-tools/de_DE.ISO8859-1/share/xml/press.xml projects/xml-tools/en_US.ISO8859-1/articles/committers-guide/article.xml projects/xml-tools/en_US.ISO8859-1/articles/contributors/contrib.additional.xml projects/xml-tools/en_US.ISO8859-1/articles/contributors/contrib.committers.xml projects/xml-tools/en_US.ISO8859-1/articles/portbuild/article.xml projects/xml-tools/en_US.ISO8859-1/books/arch-handbook/book.xml projects/xml-tools/en_US.ISO8859-1/books/arch-handbook/boot/chapter.xml projects/xml-tools/en_US.ISO8859-1/books/arch-handbook/driverbasics/chapter.xml projects/xml-tools/en_US.ISO8859-1/books/arch-handbook/isa/chapter.xml projects/xml-tools/en_US.ISO8859-1/books/arch-handbook/jail/chapter.xml projects/xml-tools/en_US.ISO8859-1/books/arch-handbook/kobj/chapter.xml projects/xml-tools/en_US.ISO8859-1/books/arch-handbook/mac/chapter.xml projects/xml-tools/en_US.ISO8859-1/books/arch-handbook/newbus/chapter.xml projects/xml-tools/en_US.ISO8859-1/books/arch-handbook/pccard/chapter.xml projects/xml-tools/en_US.ISO8859-1/books/arch-handbook/scsi/chapter.xml projects/xml-tools/en_US.ISO8859-1/books/arch-handbook/smp/chapter.xml projects/xml-tools/en_US.ISO8859-1/books/arch-handbook/sound/chapter.xml projects/xml-tools/en_US.ISO8859-1/books/arch-handbook/usb/chapter.xml projects/xml-tools/en_US.ISO8859-1/books/arch-handbook/vm/chapter.xml projects/xml-tools/en_US.ISO8859-1/books/developers-handbook/testing/chapter.xml projects/xml-tools/en_US.ISO8859-1/books/developers-handbook/tools/chapter.xml projects/xml-tools/en_US.ISO8859-1/books/faq/book.xml projects/xml-tools/en_US.ISO8859-1/books/fdp-primer/book.xml projects/xml-tools/en_US.ISO8859-1/books/handbook/book.xml projects/xml-tools/en_US.ISO8859-1/books/handbook/boot/chapter.xml projects/xml-tools/en_US.ISO8859-1/books/handbook/config/chapter.xml projects/xml-tools/en_US.ISO8859-1/books/handbook/cutting-edge/chapter.xml projects/xml-tools/en_US.ISO8859-1/books/handbook/desktop/chapter.xml projects/xml-tools/en_US.ISO8859-1/books/handbook/disks/chapter.xml projects/xml-tools/en_US.ISO8859-1/books/handbook/filesystems/chapter.xml projects/xml-tools/en_US.ISO8859-1/books/handbook/firewalls/chapter.xml projects/xml-tools/en_US.ISO8859-1/books/handbook/geom/chapter.xml projects/xml-tools/en_US.ISO8859-1/books/handbook/introduction/chapter.xml projects/xml-tools/en_US.ISO8859-1/books/handbook/jails/chapter.xml projects/xml-tools/en_US.ISO8859-1/books/handbook/kernelconfig/chapter.xml projects/xml-tools/en_US.ISO8859-1/books/handbook/l10n/chapter.xml projects/xml-tools/en_US.ISO8859-1/books/handbook/linuxemu/chapter.xml projects/xml-tools/en_US.ISO8859-1/books/handbook/mac/chapter.xml projects/xml-tools/en_US.ISO8859-1/books/handbook/mail/chapter.xml projects/xml-tools/en_US.ISO8859-1/books/handbook/mirrors/chapter.xml projects/xml-tools/en_US.ISO8859-1/books/handbook/printing/chapter.xml projects/xml-tools/en_US.ISO8859-1/books/porters-handbook/book.xml (contents, props changed) projects/xml-tools/en_US.ISO8859-1/htdocs/Makefile projects/xml-tools/en_US.ISO8859-1/htdocs/donations/wantlist.xml projects/xml-tools/en_US.ISO8859-1/htdocs/features.xml projects/xml-tools/en_US.ISO8859-1/htdocs/internal/internal.xml projects/xml-tools/en_US.ISO8859-1/htdocs/layout/css/layout.css projects/xml-tools/en_US.ISO8859-1/htdocs/mailto.xml projects/xml-tools/en_US.ISO8859-1/htdocs/projects/newbies.xml projects/xml-tools/en_US.ISO8859-1/htdocs/releng/index.xml projects/xml-tools/ja_JP.eucJP/books/handbook/advanced-networking/chapter.xml projects/xml-tools/ja_JP.eucJP/books/handbook/cutting-edge/chapter.xml projects/xml-tools/ja_JP.eucJP/books/handbook/mirrors/chapter.xml projects/xml-tools/ja_JP.eucJP/books/handbook/ports/chapter.xml projects/xml-tools/ja_JP.eucJP/htdocs/internal/internal.xml projects/xml-tools/ja_JP.eucJP/htdocs/mailto.xml projects/xml-tools/ja_JP.eucJP/share/xml/news.xml projects/xml-tools/nl_NL.ISO8859-1/articles/contributing/article.xml projects/xml-tools/nl_NL.ISO8859-1/books/handbook/audit/chapter.xml projects/xml-tools/nl_NL.ISO8859-1/books/handbook/disks/chapter.xml projects/xml-tools/nl_NL.ISO8859-1/books/handbook/filesystems/chapter.xml projects/xml-tools/nl_NL.ISO8859-1/books/handbook/firewalls/chapter.xml projects/xml-tools/nl_NL.ISO8859-1/books/handbook/jails/chapter.xml projects/xml-tools/nl_NL.ISO8859-1/books/handbook/linuxemu/chapter.xml projects/xml-tools/nl_NL.ISO8859-1/books/handbook/mail/chapter.xml projects/xml-tools/nl_NL.ISO8859-1/books/handbook/multimedia/chapter.xml projects/xml-tools/nl_NL.ISO8859-1/books/handbook/network-servers/chapter.xml projects/xml-tools/nl_NL.ISO8859-1/books/handbook/ppp-and-slip/chapter.xml projects/xml-tools/nl_NL.ISO8859-1/books/handbook/security/chapter.xml projects/xml-tools/nl_NL.ISO8859-1/books/handbook/virtualization/chapter.xml projects/xml-tools/share/pgpkeys/des.key projects/xml-tools/share/pgpkeys/pgpkeys-developers.xml projects/xml-tools/share/pgpkeys/pgpkeys.ent projects/xml-tools/share/xml/authors.ent projects/xml-tools/share/xml/developers.ent projects/xml-tools/share/xml/mirrors.xml projects/xml-tools/share/xml/news.xml projects/xml-tools/share/xml/press.xml Directory Properties: projects/xml-tools/ (props changed) projects/xml-tools/de_DE.ISO8859-1/ (props changed) projects/xml-tools/en_US.ISO8859-1/ (props changed) projects/xml-tools/ja_JP.eucJP/ (props changed) projects/xml-tools/nl_NL.ISO8859-1/ (props changed) projects/xml-tools/share/ (props changed) Modified: projects/xml-tools/bn_BD.ISO10646-1/articles/explaining-bsd/article.xml ============================================================================== --- projects/xml-tools/bn_BD.ISO10646-1/articles/explaining-bsd/article.xml Mon Feb 18 13:03:19 2013 (r41006) +++ projects/xml-tools/bn_BD.ISO10646-1/articles/explaining-bsd/article.xml Mon Feb 18 15:29:06 2013 (r41007) @@ -1,3 +1,4 @@ + @@ -16,6 +16,26 @@ + 2013 + + + 1 + + + A Decade of OS Access-control Extensibility + https://queue.acm.org/detail.cfm?id=2430732 + ACM Queue + https://queue.acm.org/ + 18. Januar 2013 + Robert N. M. Watson +

Wer sich nher mit der Absicherung von Betriebssystemen + beschftigt, ist erstaunt ber die zahlreichen in der + Praxis eingesetzten Modelle zur Zugangskontrolle.

+ + + + + 2012 Modified: projects/xml-tools/en_US.ISO8859-1/articles/committers-guide/article.xml ============================================================================== --- projects/xml-tools/en_US.ISO8859-1/articles/committers-guide/article.xml Mon Feb 18 13:03:19 2013 (r41006) +++ projects/xml-tools/en_US.ISO8859-1/articles/committers-guide/article.xml Mon Feb 18 15:29:06 2013 (r41007) @@ -4156,24 +4156,6 @@ bak/packages packages from last complet there are at least some perks: - - - Direct access to cvsup-master - - - As a committer, you may apply to &a.kuriyama; for direct access - to cvsup-master.FreeBSD.org, - providing the public key output from cvpasswd - yourusername@FreeBSD.org - freefall.FreeBSD.org. Please note: you must - specify freefall.FreeBSD.org on the - cvpasswd command line even though the - actual server is cvsup-master. Access to - cvsup-master should not be overused as it is - a busy machine. - - - Free 4-CD and DVD Sets Modified: projects/xml-tools/en_US.ISO8859-1/articles/contributors/contrib.additional.xml ============================================================================== --- projects/xml-tools/en_US.ISO8859-1/articles/contributors/contrib.additional.xml Mon Feb 18 13:03:19 2013 (r41006) +++ projects/xml-tools/en_US.ISO8859-1/articles/contributors/contrib.additional.xml Mon Feb 18 15:29:06 2013 (r41007) @@ -2603,6 +2603,11 @@ + Dmitry Kazarov + d.y.kazarov@mail.ru + + + Dmitry Khrustalev dima@xyzzy.machaon.ru @@ -3366,7 +3371,7 @@ Gary Hayers - gary@hayers.net + gary@hayers.org @@ -6835,6 +6840,11 @@ + Michael Sanders + mike@topcat.hypermart.net + + + Michael Sardo jaeger16@yahoo.com @@ -8380,11 +8390,6 @@ - Po-Chien Lin - linpc@cs.nctu.edu.tw - - - Pomegranate daver@flag.blackened.net @@ -8792,6 +8797,11 @@ + Dr. Rolf Jansen + cyclaero@gmail.com + + + Roman Neuhauser neuhauser@chello.cz Modified: projects/xml-tools/en_US.ISO8859-1/articles/contributors/contrib.committers.xml ============================================================================== --- projects/xml-tools/en_US.ISO8859-1/articles/contributors/contrib.committers.xml Mon Feb 18 13:03:19 2013 (r41006) +++ projects/xml-tools/en_US.ISO8859-1/articles/contributors/contrib.committers.xml Mon Feb 18 15:29:06 2013 (r41007) @@ -524,6 +524,10 @@ + &a.smh; + + + &a.ehaupt; @@ -820,6 +824,10 @@ + &a.achim; + + + &a.truckman; @@ -840,6 +848,10 @@ + &a.pclin; + + + &a.yzlin; Modified: projects/xml-tools/en_US.ISO8859-1/articles/portbuild/article.xml ============================================================================== --- projects/xml-tools/en_US.ISO8859-1/articles/portbuild/article.xml Mon Feb 18 13:03:19 2013 (r41006) +++ projects/xml-tools/en_US.ISO8859-1/articles/portbuild/article.xml Mon Feb 18 15:29:06 2013 (r41007) @@ -60,7 +60,7 @@ The codebase Most of the package building magic occurs under the - /var/portbuild directory. Unless + /a/portbuild directory. Unless otherwise specified, all paths will be relative to this location. ${arch} will be used to specify one of the package architectures @@ -74,15 +74,16 @@ - Packages are no longer built for branches 4, 5, or 6, nor + FreeBSD no longer builds packages for branches 4, 5, or 6, nor for the alpha architecture. - The scripts that control all of this live in - /var/portbuild/scripts/. + The scripts that control all of this live in either + /a/portbuild/scripts/ or. + /a/portbuild/admin/scripts/. These are the checked-out copies from the Subversion repository at - - base/projects/portbuild/scripts/ + + base/projects/portbuild/ . Typically, incremental builds are done that use previous @@ -109,7 +110,7 @@ - Notes on the codebase + Historical notes on the codebase Until mid-2010, the scripts were completely specific to pointyhat.FreeBSD.org as the head (dispatch) node. During @@ -145,18 +146,6 @@ - This document was originally written before these changes - were made. Where things such as script invocations have changed, - they were denoted as new codebase: as opposed - to old codebase:. - - - Up until November 2012, pointyhat had still - been running the old codebase. That installation has now been - permanently offlined. Therefore, all the instructions having - to do with the old codebase have been removed. - - Also during this process, the codebase was migrated to the @@ -166,16 +155,61 @@ found in CVS. + + + Notes on privilege separation + + As of January 2013, a rewrite is in progress to further separate + privileges. The following concepts are introduced: + + + + Server-side user portbuild assumes all + responsiblity for operations involving builds and communicating + with the clients. This user no longer has access to + sudo. + + + + Server-side user srcbuild is created + and given responsiblity for operations involving both VCS + operations and anything involving src builds for the clients. + This user does not have access to + sudo. + + + + The server-side + ports-arch + users go away. + + + + None of the above server-side users have + ssh keys. Individual + portmgr will accomplish all those + tasks using ksu. (This is + still work-in-progress.) + + + + The only client-side user is also named + portbuild and still has access to + sudo for the purpose of managing + jails. + + + Build Client Management - The &i386; clients co-located with pointyhat - netboot from it (connected nodes); all - other clients (disconnected nodes) - are either self-hosted or netboot from some other - pxe host. + You may set up clients to either netboot from the master + (connected nodes) + or have them either self-hosted or netboot from some other + pxe host + (disconnected nodes). In all cases they set themselves up at boot-time to prepare to build packages. @@ -200,29 +234,31 @@ Jail Build Environment Setup - Package builds are performed in a + Package builds are performed by the clients in a jail populated by the portbuild script using the ${arch}/${branch}/builds/${buildid}/bindist.tar file. - The makeworld command builds a world from the + On the server, use the + makeworld command to build a world from the ${arch}/${branch}/builds/${buildid}/src/ - tree and installs it into + tree and install it into ${arch}/${branch}/builds/${buildid}/bindist.tar. The tree will be updated first unless -novcs is - specified. It should be run as root: + specified. - &prompt.root; /var/portbuild/scripts/makeworld ${arch} ${branch} ${buildid} [-novcs] + &prompt.root; /a/portbuild/admin/scripts/makeworld ${arch} ${branch} ${buildid} [-novcs] - The bindist.tar tarball is created from the + Similiarly on the server, the + bindist.tar tarball is created from the previously installed world by the mkbindist - script. It should be also be run as root: + script. - &prompt.root; /var/portbuild/scripts/mkbindist ${arch} ${branch} ${buildid} + &prompt.root; /a/portbuild/admin/scripts/mkbindist ${arch} ${branch} ${buildid} - The per-machine tarballs are located in + The per-machine tarballs are located on the server in ${arch}/clients. The bindist.tar file is extracted @@ -233,6 +269,16 @@ For both commands above, if ${buildid} is latest, it may be omitted. + + + Currently the above two scripts must be run as + root; otherwise, the install scripts + lack sufficient permissions. This is undesirable for + security reasons. Work is in progress in -HEAD to allow + users to do installations; once that is committed, the + intention is to use that and run these two commands as + srcbuild. + @@ -782,7 +828,7 @@ PKG_BIN=/usr/local/sbin/pkgTo free up resources, you will need to clean up client machines by running build cleanup command. For example: - &prompt.user; /var/portbuild/scripts/build cleanup i386 8-exp 20080714120411 -full + &prompt.user; /a/portbuild/scripts/build cleanup i386 8-exp 20080714120411 -full If you forget to do this, then the old build jails will not be cleaned up for 24 hours, and no @@ -797,6 +843,11 @@ PKG_BIN=/usr/local/sbin/pkgloads thinks are in use, you are in trouble. + + The following notes about mounting only apply to + connected nodes. + + You may have problem with the umount commands hanging. If so, you are going to have to use the allgohans script to run an &man.ssh.1; @@ -826,6 +877,11 @@ umount: Cleanup of /x/tmp/8-exp/chroot/5 You may also see messages about procfs. + + The above is the end of the notes that apply only to + connected nodes. + + After you have done all the above, remove the ${arch}/lock file before trying to restart the build. If you do not, @@ -872,7 +928,7 @@ umount: Cleanup of /x/tmp/8-exp/chroot/5 scripts/stats ${branch} command shows the number of packages already built. - Running cat /var/portbuild/*/loads/* + Running cat /a/portbuild/*/loads/* shows the client loads and number of concurrent builds in progress. The files that have been recently updated are the clients that are online; the others are the offline clients. @@ -909,7 +965,7 @@ umount: Cleanup of /x/tmp/8-exp/chroot/5 it if not. Keep an eye on &man.df.1; output. If the - /var/portbuild file system becomes full + /a/portbuild file system becomes full then Bad Things happen. The status of all current builds is generated periodically @@ -1014,12 +1070,7 @@ umount: Cleanup of /x/tmp/8-exp/chroot/5 &prompt.user; cd ${arch}/${branch} &prompt.user; find distfiles > distfiles-${release} - - This inventory file typically lives in - i386/${branch} - on the cluster master. - - This is useful to aid in periodically cleaning out + You should use that output to periodically clean out the distfiles from ftp-master. When space gets tight, distfiles from recent releases can be kept while others can be thrown away. @@ -1043,6 +1094,16 @@ umount: Cleanup of /x/tmp/8-exp/chroot/5 Uploading Packages + + For FreeBSD.org as of 2013, the instructions + about uploading to ftp-master are obsolete. + In the future, ftp-master will pull + from pointyhat, using a mechanism yet + to be implemented. However, the instructions about + RESTRICTED and NO_CDROM + must still be carefully followed. + + Once a build has completed, packages and/or distfiles can be transferred to ftp-master for propagation to the FTP mirror network. If the build was @@ -1120,7 +1181,7 @@ umount: Cleanup of /x/tmp/8-exp/chroot/5 a new release), copy packages to the staging area on ftp-master with something like the following: - &prompt.root; cd /var/portbuild/${arch}/${branch} + &prompt.root; cd /a/portbuild/${arch}/${branch} &prompt.root; tar cfv - packages/ | ssh portmgr@ftp-master tar xfC - w/ports/${arch}/tmp/${subdir} Then log into ftp-master, verify that @@ -1148,7 +1209,7 @@ umount: Cleanup of /x/tmp/8-exp/chroot/5 Distfiles should be transferred with the cpdistfiles script: - &prompt.root; /var/portbuild/scripts/cpdistfiles ${arch} ${branch} ${buildid} [-yesreally] | tee log2 + &prompt.root; /a/portbuild/scripts/cpdistfiles ${arch} ${branch} ${buildid} [-yesreally] | tee log2 Doing it by hand is deprecated. @@ -1156,6 +1217,11 @@ umount: Cleanup of /x/tmp/8-exp/chroot/5 Experimental Patches Builds + + Most of the information in this section is obsolete + as of 2013 and needs to be rewritten. + + Experimental patches builds are run from time to time to new features or bugfixes to the ports infrastructure (i.e. bsd.port.mk), or to test large sweeping @@ -1206,21 +1272,15 @@ umount: Cleanup of /x/tmp/8-exp/chroot/5 build. This will ensure an apples-to-apples comparison later. - - Once the build finishes, compare the control build failures to those of the experimental patches build. Use the following commands to facilitate this (this assumes the 8 branch is the control branch, and the 8-exp branch is the experimental patches branch): - &prompt.user; cd /var/portbuild/i386/8-exp/errors + &prompt.user; cd /a/portbuild/i386/8-exp/errors &prompt.user; find . -name \*.log\* | sort > /tmp/8-exp-errs -&prompt.user; cd /var/portbuild/i386/8/errors +&prompt.user; cd /a/portbuild/i386/8/errors &prompt.user; find . -name \*.log\* | sort > /tmp/8-errs @@ -1283,7 +1343,7 @@ umount: Cleanup of /x/tmp/8-exp/chroot/5 rebuild of the affected packages under the control branch: - &prompt.user; cd /var/portbuild/i386/8/ports + &prompt.user; cd /a/portbuild/i386/8/ports The following example is obsolete @@ -1296,9 +1356,9 @@ umount: Cleanup of /x/tmp/8-exp/chroot/5 The following command will set up the control branch for - the partial build (old codebase): + the partial build: - &prompt.user; /var/portbuild/scripts/dopackages.8 -noportsvcs -nobuild -novcs -nofinish + &prompt.user; /a/portbuild/scripts/dopackages.wrapper i386 8 -noportsvcs -nobuild -novcs -nofinish The builds must be performed from the @@ -1306,14 +1366,14 @@ umount: Cleanup of /x/tmp/8-exp/chroot/5 initially be empty except for the Makefile symlink. If this symlink does not exist, it must be created: - &prompt.user; cd /var/portbuild/i386/8/packages/All + &prompt.user; cd /a/portbuild/i386/8/packages/All &prompt.user; ln -sf ../../Makefile . &prompt.user; make -k -j<#> <list of packages to build> <#> is the concurrency of the build to attempt. It is usually the sum of the weights listed in - /var/portbuild/i386/mlist unless you have a + /a/portbuild/i386/mlist unless you have a reason to run a heavier or lighter build. The list of packages to build should be a list of package @@ -1346,17 +1406,15 @@ umount: Cleanup of /x/tmp/8-exp/chroot/5 Before following these steps, please coordinate with portmgr. - - Due to some generous donations, portmgr is - no longer looking for the loan of &i386; or amd64 - systems. However, we are still interested in borrowing tier-2 - systems. - - Node requirements - portmgr is still working on characterizing + + This section is only of interest when considering + tier-2 architectures. + + + Here are the requirement for what a node needs to be generally useful. @@ -1436,7 +1494,8 @@ umount: Cleanup of /x/tmp/8-exp/chroot/5 /usr2/.) The filename chroot is a - historical remnant. + historical remnant. The chroot + command is no longer used. @@ -1477,8 +1536,9 @@ umount: Cleanup of /x/tmp/8-exp/chroot/5 Generate a kernel config file. Include - GENERIC (or, if you are using more than - 3.5G on &i386;, PAE). + GENERIC (or, if on &i386;, and + you are using more than + 3.5G, PAE). Required options: @@ -1493,9 +1553,14 @@ options SHMMAXPGS=65536 options SEMMNI=40 options SEMMNS=240 options SEMUME=40 -options SEMMNU=120 +options SEMMNU=120 + + If you are interested in debugging general + problems, you may wish to use the following. + However, for unattended operations, it is best + to leave it out: -options ALT_BREAK_TO_DEBUGGER + options ALT_BREAK_TO_DEBUGGER For PAE, it is not currently possible to load modules. Therefore, if you are running an architecture @@ -1912,7 +1977,7 @@ portbuild ALL=(ALL) NOPASSWD: ALL

Create - /var/portbuild/${arch}/clients/bindist-${hostname}.tar. + /a/portbuild/${arch}/clients/bindist-${hostname}.tar. @@ -1951,16 +2016,16 @@ MASTER_SITE_OVERRIDE= \ Hint: you will need one of these for each machine; however, if you have multiple machines at one site, you should create a site-specific one (e.g., in - /var/portbuild/conf/clients/) + /a/portbuild/conf/clients/) and symlink to it. Create -/var/portbuild/${arch}/portbuild-${hostname} +/a/portbuild/${arch}/portbuild-${hostname} using one of the existing ones as a guide. This file contains overrides to -/var/portbuild/${arch}/portbuild.conf. +/a/portbuild/${arch}/portbuild.conf. Suggested values: @@ -2026,7 +2091,7 @@ ssh_cmd="/usr/local/bin/ssh" Populate the client's copy of /var/portbuild/scripts/ by something like - /var/portbuild/scripts/dosetupnode arch major latest hostname. + /a/portbuild/scripts/dosetupnode arch major latest hostname. Verify that you now have files in that directory. @@ -2071,7 +2136,7 @@ ssh_cmd="/usr/local/bin/ssh"Once you are sure that the client is working, tell pollmachine about it by adding it to - /var/portbuild/${arch}/mlist. + /a/portbuild/${arch}/mlist. @@ -2087,10 +2152,15 @@ ssh_cmd="/usr/local/bin/ssh"HEAD. + + As + srcbuild: + + - Edit /var/portbuild/conf/server.conf + Edit /a/portbuild/conf/admin/admin.conf with the following changes: @@ -2115,7 +2185,7 @@ ssh_cmd="/usr/local/bin/ssh" - Run /var/portbuild/updatesnap manually. + Run /a/portbuild/admin/scripts/updatesnap manually. @@ -2123,24 +2193,21 @@ ssh_cmd="/usr/local/bin/ssh" Steps necessary after <application>qmanager</application> is started - - Again, as - portbuild: - - For each branch that will be supported, do the following: - Kick-start the build for the branch with: + As portbuild, + kick-start the build for the branch with: build create arch branch - Create + As srcbuild, + create bindist.tar. @@ -2157,7 +2224,7 @@ ssh_cmd="/usr/local/bin/ssh" - Edit /var/portbuild/conf/server.conf + Edit /a/portbuild/admin/conf/admin.conf with the following changes: @@ -2184,7 +2251,7 @@ zfs destroy -r a/snap/src-o You will probably find that the following files and - symlinks in /var/portbuild/errorlogs/ + symlinks in /a/portbuild/errorlogs/ can be removed: @@ -2229,7 +2296,7 @@ zfs destroy -r a/snap/src-o - Edit /var/portbuild/conf/server.conf + Edit /a/portbuild/admin/conf/admin.conf with the following changes: @@ -2244,7 +2311,7 @@ zfs destroy -r a/snap/src-o - Run /var/portbuild/updatesnap manually. + Run /a/portbuild/admin/scripts/updatesnap manually. @@ -2268,49 +2335,24 @@ zfs destroy -r a/snap/src-o Steps necessary before <application>qmanager</application> is started - The initial steps need to be done as - root. + The next steps are most easily done as user + portbuild. - - - If it has not already been done, create the - portbuild - user and group. - - - - mkdir /var/portbuild/arch - - - - Create a new zfs filesystem: - - &prompt.root; zfs create -o mountpoint=/a/portbuild/arch a/portbuild/arch - - - - &prompt.root; chown portbuild:portbuild /var/portbuild/arch; -&prompt.root; chmod 775 /var/portbuild/arch; -&prompt.root; cd /var/portbuild/arch - - - - Create the .ssh directory. - - - - The next steps are most easily done as user - portbuild. + The following assumes you have already run + mkportbuild. - Create an archive directory for buildlogs and errorlogs - under archive/. + As the portbuild user, run + + &prompt.user; /a/portbuild/admin/tools/addarch arch + + For each branch that will be supported, do the following: @@ -2354,8 +2396,10 @@ zfs destroy -r a/snap/src-o - Create a fresh portbuild.conf file - from one of the ones for another architecture. + Edit portbuild.conf + from one of the ones for another architecture. + addarch will have created a default + one for you. @@ -2365,23 +2409,13 @@ zfs destroy -r a/snap/src-o - &prompt.root; cd .ssh && ssh-keygen - - - - If desired, - edit the .ssh/config file for - convenience in using ssh. - - - If you need to create any tunnels: Make a private configuration directory: - &prompt.root; mkdir /var/portbuild/conf/arch + &prompt.root; mkdir /a/portbuild/conf/arch @@ -2393,26 +2427,26 @@ zfs destroy -r a/snap/src-o - Once again as root: + As srcbuild: Add arch to SUPPORTED_ARCHS in - /var/portbuild/conf/server.conf. + /a/portbuild/admin/conf/admin.conf. Add the arch directory to - /var/portbuild/scripts/zbackup and - /var/portbuild/scripts/zexpire. + /a/portbuild/admin/scripts/zbackup. + (This is a hack and should go away.) - Add an appropriate arch entry for - /var/portbuild/scripts/dologs to the portbuild + Enable the appropriate arch entry for + /a/portbuild/scripts/dologs to the portbuild crontab. (This is a hack and should go away.) @@ -2422,17 +2456,11 @@ zfs destroy -r a/snap/src-o Steps necessary after <application>qmanager</application> is started - Again as root: + Again as srcbuild: - Tell qmanager about the arch: - - python path/qmanager/qclient add_acl name=ports-arch uidlist=ports-arch gidlist=portbuild sense=1 - - - For each branch that will be supported, do the following: @@ -2452,54 +2480,6 @@ zfs destroy -r a/snap/src-o Please talk to Mark Linimon before making any changes to this section. - - Notes on privilege separation - - As of January 2013, a rewrite is in progress to further separate - privileges. The following concepts are introduced: - - - - Server-side user portbuild assumes all - responsiblity for operations involving builds and communicating - with the clients. This user no longer has access to - sudo. - - *** DIFF OUTPUT TRUNCATED AT 1000 LINES *** From owner-svn-doc-projects@FreeBSD.ORG Tue Feb 19 16:14:05 2013 Return-Path: Delivered-To: svn-doc-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id 10A88E97; Tue, 19 Feb 2013 16:14:05 +0000 (UTC) (envelope-from gabor@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id DA1F4B3; Tue, 19 Feb 2013 16:14:04 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r1JGE4Gn069222; Tue, 19 Feb 2013 16:14:04 GMT (envelope-from gabor@svn.freebsd.org) Received: (from gabor@localhost) by svn.freebsd.org (8.14.5/8.14.5/Submit) id r1JGE1RV069190; Tue, 19 Feb 2013 16:14:01 GMT (envelope-from gabor@svn.freebsd.org) Message-Id: <201302191614.r1JGE1RV069190@svn.freebsd.org> From: Gabor Kovesdan Date: Tue, 19 Feb 2013 16:14:01 +0000 (UTC) To: doc-committers@freebsd.org, svn-doc-projects@freebsd.org Subject: svn commit: r41016 - in projects/xml-tools: da_DK.ISO8859-1/share/xml de_DE.ISO8859-1/share/xml el_GR.ISO8859-7/share/xml en_US.ISO8859-1/share/xml es_ES.ISO8859-1/share/xml fr_FR.ISO8859-1/share/x... X-SVN-Group: doc-projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-doc-projects@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for doc projects trees List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 19 Feb 2013 16:14:05 -0000 Author: gabor Date: Tue Feb 19 16:14:00 2013 New Revision: 41016 URL: http://svnweb.freebsd.org/changeset/doc/41016 Log: - Add back SGML catalogs (trimmed to minimally necessary content) since they are still needed for language-specific DSSSL customizations Added: projects/xml-tools/da_DK.ISO8859-1/share/xml/catalog projects/xml-tools/de_DE.ISO8859-1/share/xml/catalog projects/xml-tools/el_GR.ISO8859-7/share/xml/catalog projects/xml-tools/en_US.ISO8859-1/share/xml/catalog projects/xml-tools/es_ES.ISO8859-1/share/xml/catalog projects/xml-tools/fr_FR.ISO8859-1/share/xml/catalog projects/xml-tools/hu_HU.ISO8859-2/share/xml/catalog projects/xml-tools/it_IT.ISO8859-15/share/xml/catalog projects/xml-tools/ja_JP.eucJP/share/xml/catalog projects/xml-tools/mn_MN.UTF-8/share/xml/catalog projects/xml-tools/nl_NL.ISO8859-1/share/xml/catalog projects/xml-tools/pl_PL.ISO8859-2/share/xml/catalog projects/xml-tools/pt_BR.ISO8859-1/share/xml/catalog projects/xml-tools/ru_RU.KOI8-R/share/xml/catalog projects/xml-tools/sr_YU.ISO8859-2/share/xml/catalog projects/xml-tools/zh_CN.GB2312/share/xml/catalog projects/xml-tools/zh_TW.Big5/share/xml/catalog Modified: projects/xml-tools/share/mk/doc.docbook.mk projects/xml-tools/share/xml/catalog Added: projects/xml-tools/da_DK.ISO8859-1/share/xml/catalog ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/xml-tools/da_DK.ISO8859-1/share/xml/catalog Tue Feb 19 16:14:00 2013 (r41016) @@ -0,0 +1,2 @@ +PUBLIC "-//FreeBSD//DOCUMENT DocBook Stylesheet//EN" + "freebsd.dsl" Added: projects/xml-tools/de_DE.ISO8859-1/share/xml/catalog ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/xml-tools/de_DE.ISO8859-1/share/xml/catalog Tue Feb 19 16:14:00 2013 (r41016) @@ -0,0 +1,2 @@ +PUBLIC "-//FreeBSD//DOCUMENT DocBook Stylesheet//EN" + "freebsd.dsl" Added: projects/xml-tools/el_GR.ISO8859-7/share/xml/catalog ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/xml-tools/el_GR.ISO8859-7/share/xml/catalog Tue Feb 19 16:14:00 2013 (r41016) @@ -0,0 +1,2 @@ +PUBLIC "-//FreeBSD//DOCUMENT DocBook Stylesheet//EN" + "freebsd.dsl" Added: projects/xml-tools/en_US.ISO8859-1/share/xml/catalog ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/xml-tools/en_US.ISO8859-1/share/xml/catalog Tue Feb 19 16:14:00 2013 (r41016) @@ -0,0 +1,2 @@ +PUBLIC "-//FreeBSD//DOCUMENT DocBook Stylesheet//EN" + "freebsd.dsl" Added: projects/xml-tools/es_ES.ISO8859-1/share/xml/catalog ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/xml-tools/es_ES.ISO8859-1/share/xml/catalog Tue Feb 19 16:14:00 2013 (r41016) @@ -0,0 +1,2 @@ +PUBLIC "-//FreeBSD//DOCUMENT DocBook Stylesheet//EN" + "freebsd.dsl" Added: projects/xml-tools/fr_FR.ISO8859-1/share/xml/catalog ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/xml-tools/fr_FR.ISO8859-1/share/xml/catalog Tue Feb 19 16:14:00 2013 (r41016) @@ -0,0 +1,2 @@ +PUBLIC "-//FreeBSD//DOCUMENT DocBook Stylesheet//EN" + "freebsd.dsl" Added: projects/xml-tools/hu_HU.ISO8859-2/share/xml/catalog ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/xml-tools/hu_HU.ISO8859-2/share/xml/catalog Tue Feb 19 16:14:00 2013 (r41016) @@ -0,0 +1,2 @@ +PUBLIC "-//FreeBSD//DOCUMENT DocBook Stylesheet//EN" + "freebsd.dsl" Added: projects/xml-tools/it_IT.ISO8859-15/share/xml/catalog ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/xml-tools/it_IT.ISO8859-15/share/xml/catalog Tue Feb 19 16:14:00 2013 (r41016) @@ -0,0 +1,2 @@ +PUBLIC "-//FreeBSD//DOCUMENT DocBook Stylesheet//EN" + "freebsd.dsl" Added: projects/xml-tools/ja_JP.eucJP/share/xml/catalog ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/xml-tools/ja_JP.eucJP/share/xml/catalog Tue Feb 19 16:14:00 2013 (r41016) @@ -0,0 +1,2 @@ +PUBLIC "-//FreeBSD//DOCUMENT DocBook Stylesheet//EN" + "freebsd.dsl" Added: projects/xml-tools/mn_MN.UTF-8/share/xml/catalog ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/xml-tools/mn_MN.UTF-8/share/xml/catalog Tue Feb 19 16:14:00 2013 (r41016) @@ -0,0 +1,2 @@ +PUBLIC "-//FreeBSD//DOCUMENT DocBook Stylesheet//EN" + "freebsd.dsl" Added: projects/xml-tools/nl_NL.ISO8859-1/share/xml/catalog ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/xml-tools/nl_NL.ISO8859-1/share/xml/catalog Tue Feb 19 16:14:00 2013 (r41016) @@ -0,0 +1,2 @@ +PUBLIC "-//FreeBSD//DOCUMENT DocBook Stylesheet//EN" + "freebsd.dsl" Added: projects/xml-tools/pl_PL.ISO8859-2/share/xml/catalog ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/xml-tools/pl_PL.ISO8859-2/share/xml/catalog Tue Feb 19 16:14:00 2013 (r41016) @@ -0,0 +1,2 @@ +PUBLIC "-//FreeBSD//DOCUMENT DocBook Stylesheet//EN" + "freebsd.dsl" Added: projects/xml-tools/pt_BR.ISO8859-1/share/xml/catalog ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/xml-tools/pt_BR.ISO8859-1/share/xml/catalog Tue Feb 19 16:14:00 2013 (r41016) @@ -0,0 +1,2 @@ +PUBLIC "-//FreeBSD//DOCUMENT DocBook Stylesheet//EN" + "freebsd.dsl" Added: projects/xml-tools/ru_RU.KOI8-R/share/xml/catalog ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/xml-tools/ru_RU.KOI8-R/share/xml/catalog Tue Feb 19 16:14:00 2013 (r41016) @@ -0,0 +1,2 @@ +PUBLIC "-//FreeBSD//DOCUMENT DocBook Stylesheet//EN" + "freebsd.dsl" Modified: projects/xml-tools/share/mk/doc.docbook.mk ============================================================================== --- projects/xml-tools/share/mk/doc.docbook.mk Tue Feb 19 15:25:28 2013 (r41015) +++ projects/xml-tools/share/mk/doc.docbook.mk Tue Feb 19 16:14:00 2013 (r41016) @@ -74,13 +74,9 @@ MASTERDOC?= ${.CURDIR}/${DOC}.xml # Either jade or fop RENDERENGINE?= jade -.if defined(SPELLCHECK) -DSLHTML?= ${DOC_PREFIX}/share/xml/spellcheck.dsl -.endif - XMLDECL?= /usr/local/share/sgml/docbook/dsssl/modular/dtds/decls/xml.dcl -DSLHTML?= ${DOC_PREFIX}/share/xml/default.dsl +DSLHTML?= ${DOC_PREFIX}/share/xml/spellcheck.dsl DSLPRINT?= ${DOC_PREFIX}/share/xml/default.dsl DSLPGP?= ${DOC_PREFIX}/share/xml/pgp.dsl @@ -91,8 +87,23 @@ XSLFO?= ${DOC_PREFIX}/share/xsl/freebsd IMAGES_LIB?= +.if exists(${PREFIX}/bin/jade) && !defined(OPENJADE) +JADECATALOG?= ${PREFIX}/share/sgml/jade/catalog +.else +JADECATALOG?= ${PREFIX}/share/sgml/openjade/catalog +.endif +FREEBSDCATALOG= ${DOC_PREFIX}/share/xml/catalog +LANGUAGECATALOG=${DOC_PREFIX}/${LANGCODE}/share/xml/catalog +DSSSLCATALOG= ${PREFIX}/share/sgml/docbook/dsssl/modular/catalog +.for c in ${LANGUAGECATALOG} ${FREEBSDCATALOG} ${DSSSLCATALOG} ${JADECATALOG} +.if exists(${c}) +CATALOGS+= -c ${c} +.endif +.endfor + JADEOPTS?= -ijade.compat -w no-valid ${JADEFLAGS} \ - -D ${IMAGES_EN_DIR}/${DOC}s/${.CURDIR:T} -D ${CANONICALOBJDIR} + -D ${IMAGES_EN_DIR}/${DOC}s/${.CURDIR:T} -D ${CANONICALOBJDIR} \ + ${CATALOGS} XSLTPROCOPTS?= --nonet KNOWN_FORMATS= html html.tar html-split html-split.tar \ Modified: projects/xml-tools/share/xml/catalog ============================================================================== --- projects/xml-tools/share/xml/catalog Tue Feb 19 15:25:28 2013 (r41015) +++ projects/xml-tools/share/xml/catalog Tue Feb 19 16:14:00 2013 (r41016) @@ -4,13 +4,6 @@ -- $FreeBSD$ -- - -- ...................................................................... -- - -- Language neutral ..................................................... -- - - -- These identifiers are shared across all translations of the FreeBSD - documentation, even though the listed language is "EN" - -- - PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN" "freebsd45.dtd" @@ -20,12 +13,6 @@ PUBLIC "-//FreeBSD//DOCUMENT DocBook Sty PUBLIC "-//FreeBSD//DOCUMENT DocBook Language Neutral Stylesheet//EN" "freebsd.dsl" -PUBLIC "-//FreeBSD//DOCUMENT DocBook HTML Stylesheet//EN" - "freebsd-html.dsl" - -PUBLIC "-//FreeBSD//DOCUMENT DocBook HTML Lanugage Neutral Stylesheet//EN" - "freebsd-html.dsl" - PUBLIC "-//FreeBSD//DOCUMENT DocBook Print Stylesheet//EN" "freebsd-print.dsl" @@ -37,86 +24,3 @@ PUBLIC "-//FreeBSD//DOCUMENT DocBook Com PUBLIC "-//FreeBSD//DOCUMENT DocBook Common Lanugage Neutral Stylesheet//EN" "freebsd-common.dsl" - -PUBLIC "-//FreeBSD//ENTITIES DocBook Author Entities//EN" - "authors.ent" - -PUBLIC "-//FreeBSD//ENTITIES DocBook Manual Page Entities//EN" - "man-refs.ent" - -PUBLIC "-//FreeBSD//ENTITIES DocBook Miscellaneous FreeBSD Entities//EN" - "freebsd.ent" - -PUBLIC "-//FreeBSD//ENTITIES DocBook Language Specific Entities//EN" - "l10n.ent" - -PUBLIC "-//FreeBSD//ENTITIES DocBook Language Neutral Entities//EN" - "l10n.ent" - -PUBLIC "-//FreeBSD//ENTITIES DocBook Trademark Entities//EN" - "trademarks.ent" - -PUBLIC "-//FreeBSD//ENTITIES DocBook URL Entities//EN" - "urls.ent" - - -- ...................................................................... -- - -- HTML docs ............................................................ -- - -PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" - "html401-freebsd.dtd" - -PUBLIC "-//FreeBSD//ENTITIES ISO 8879:1986 Entity Set//EN" - "iso8879.ent" - -PUBLIC "-//FreeBSD//ENTITIES FreeBSD L10N Entities//EN" - "l10n.ent" - -PUBLIC "-//FreeBSD//ENTITIES FreeBSD Common Entities//EN" - "common.ent" - -PUBLIC "-//FreeBSD//ENTITIES FreeBSD Developers Entities//EN" - "developers.ent" - -PUBLIC "-//FreeBSD//ENTITIES FreeBSD Release Entities//EN" - "release.ent" - -PUBLIC "-//FreeBSD//ENTITIES FreeBSD Release L10N Entities//EN" - "release.l10n.ent" - -PUBLIC "-//FreeBSD//ENTITIES HTML FreeBSD Header L10N Entities//EN" - "header.l10n.ent" - -PUBLIC "-//FreeBSD//ENTITIES HTML FreeBSD Header Entities//EN" - "header.ent" - -PUBLIC "-//FreeBSD//ENTITIES HTML FreeBSD Navigation Bar L10N Entities//EN" - "navibar.l10n.ent" - -PUBLIC "-//FreeBSD//ENTITIES HTML FreeBSD Navigation Bar Entities//EN" - "navibar.ent" - - -- ...................................................................... -- - -- English specific ..................................................... -- - - -- These identifiers should only be used by English language versions of - the FreeBSD Documentation. - - All other translations should base their FPIs on these, but change the - final parameter in the FPI to represent the target language, as - appropriate. Do not change the rest of the FPI - -- - -PUBLIC "-//FreeBSD//ENTITIES DocBook Author Entities//EN" - "../../en_US.ISO8859-1/share/xml/authors.ent" - -PUBLIC "-//FreeBSD//ENTITIES DocBook Team Entities//EN" - "../../en_US.ISO8859-1/share/xml/teams.ent" - -PUBLIC "-//FreeBSD//ENTITIES DocBook Glossary Entities//EN" - "../../en_US.ISO8859-1/share/xml/glossary.ent" - -PUBLIC "-//FreeBSD//ENTITIES DocBook Mailing List Entities//EN" - "../../en_US.ISO8859-1/share/xml/mailing-lists.ent" - -PUBLIC "-//FreeBSD//ENTITIES DocBook Newsgroup Entities//EN" - "../../en_US.ISO8859-1/share/xml/newsgroups.ent" Added: projects/xml-tools/sr_YU.ISO8859-2/share/xml/catalog ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/xml-tools/sr_YU.ISO8859-2/share/xml/catalog Tue Feb 19 16:14:00 2013 (r41016) @@ -0,0 +1,2 @@ +PUBLIC "-//FreeBSD//DOCUMENT DocBook Stylesheet//EN" + "freebsd.dsl" Added: projects/xml-tools/zh_CN.GB2312/share/xml/catalog ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/xml-tools/zh_CN.GB2312/share/xml/catalog Tue Feb 19 16:14:00 2013 (r41016) @@ -0,0 +1,2 @@ +PUBLIC "-//FreeBSD//DOCUMENT DocBook Stylesheet//EN" + "freebsd.dsl" Added: projects/xml-tools/zh_TW.Big5/share/xml/catalog ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/xml-tools/zh_TW.Big5/share/xml/catalog Tue Feb 19 16:14:00 2013 (r41016) @@ -0,0 +1,2 @@ +PUBLIC "-//FreeBSD//DOCUMENT DocBook Stylesheet//EN" + "freebsd.dsl" From owner-svn-doc-projects@FreeBSD.ORG Tue Feb 19 16:20:40 2013 Return-Path: Delivered-To: svn-doc-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id CA9572FC; Tue, 19 Feb 2013 16:20:40 +0000 (UTC) (envelope-from gabor@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id 9EF1413C; Tue, 19 Feb 2013 16:20:40 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r1JGKeqe071863; Tue, 19 Feb 2013 16:20:40 GMT (envelope-from gabor@svn.freebsd.org) Received: (from gabor@localhost) by svn.freebsd.org (8.14.5/8.14.5/Submit) id r1JGKcnj071851; Tue, 19 Feb 2013 16:20:38 GMT (envelope-from gabor@svn.freebsd.org) Message-Id: <201302191620.r1JGKcnj071851@svn.freebsd.org> From: Gabor Kovesdan Date: Tue, 19 Feb 2013 16:20:38 +0000 (UTC) To: doc-committers@freebsd.org, svn-doc-projects@freebsd.org Subject: svn commit: r41017 - in projects/xml-tools: de_DE.ISO8859-1/books/porters-handbook en_US.ISO8859-1/books/design-44bsd en_US.ISO8859-1/books/porters-handbook fr_FR.ISO8859-1/books/porters-handbook j... X-SVN-Group: doc-projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-doc-projects@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for doc projects trees List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 19 Feb 2013 16:20:40 -0000 Author: gabor Date: Tue Feb 19 16:20:38 2013 New Revision: 41017 URL: http://svnweb.freebsd.org/changeset/doc/41017 Log: - Remove a couple of DSSSL leftovers Modified: projects/xml-tools/de_DE.ISO8859-1/books/porters-handbook/Makefile projects/xml-tools/en_US.ISO8859-1/books/design-44bsd/Makefile projects/xml-tools/en_US.ISO8859-1/books/porters-handbook/Makefile projects/xml-tools/fr_FR.ISO8859-1/books/porters-handbook/Makefile projects/xml-tools/ja_JP.eucJP/books/design-44bsd/Makefile projects/xml-tools/ja_JP.eucJP/books/porters-handbook/Makefile projects/xml-tools/ru_RU.KOI8-R/books/design-44bsd/Makefile projects/xml-tools/ru_RU.KOI8-R/books/porters-handbook/Makefile projects/xml-tools/zh_CN.GB2312/books/porters-handbook/Makefile projects/xml-tools/zh_TW.Big5/books/porters-handbook/Makefile Modified: projects/xml-tools/de_DE.ISO8859-1/books/porters-handbook/Makefile ============================================================================== --- projects/xml-tools/de_DE.ISO8859-1/books/porters-handbook/Makefile Tue Feb 19 16:14:00 2013 (r41016) +++ projects/xml-tools/de_DE.ISO8859-1/books/porters-handbook/Makefile Tue Feb 19 16:20:38 2013 (r41017) @@ -23,7 +23,6 @@ INSTALL_ONLY_COMPRESSED?= SRCS= book.xml # Use the local DSSSL file -DSLHTML?= ${.CURDIR}/freebsd.dsl DSLPRINT?= ${.CURDIR}/freebsd.dsl # Images from the cross-document image library Modified: projects/xml-tools/en_US.ISO8859-1/books/design-44bsd/Makefile ============================================================================== --- projects/xml-tools/en_US.ISO8859-1/books/design-44bsd/Makefile Tue Feb 19 16:14:00 2013 (r41016) +++ projects/xml-tools/en_US.ISO8859-1/books/design-44bsd/Makefile Tue Feb 19 16:20:38 2013 (r41017) @@ -12,7 +12,6 @@ INSTALL_ONLY_COMPRESSED?= SRCS= book.xml # Use the local DSSSL file -DSLHTML?= ${.CURDIR}/freebsd.dsl DSLPRINT?= ${.CURDIR}/freebsd.dsl DOC_PREFIX?= ${.CURDIR}/../../.. Modified: projects/xml-tools/en_US.ISO8859-1/books/porters-handbook/Makefile ============================================================================== --- projects/xml-tools/en_US.ISO8859-1/books/porters-handbook/Makefile Tue Feb 19 16:14:00 2013 (r41016) +++ projects/xml-tools/en_US.ISO8859-1/books/porters-handbook/Makefile Tue Feb 19 16:20:38 2013 (r41017) @@ -22,7 +22,6 @@ INSTALL_ONLY_COMPRESSED?= SRCS= book.xml # Use the local DSSSL file -DSLHTML?= ${.CURDIR}/freebsd.dsl DSLPRINT?= ${.CURDIR}/freebsd.dsl # Images from the cross-document image library Modified: projects/xml-tools/fr_FR.ISO8859-1/books/porters-handbook/Makefile ============================================================================== --- projects/xml-tools/fr_FR.ISO8859-1/books/porters-handbook/Makefile Tue Feb 19 16:14:00 2013 (r41016) +++ projects/xml-tools/fr_FR.ISO8859-1/books/porters-handbook/Makefile Tue Feb 19 16:20:38 2013 (r41017) @@ -23,7 +23,6 @@ INSTALL_ONLY_COMPRESSED?= SRCS= book.xml # Use the local DSSSL file -DSLHTML?= ${.CURDIR}/freebsd.dsl DSLPRINT?= ${.CURDIR}/freebsd.dsl DOC_PREFIX?= ${.CURDIR}/../../.. Modified: projects/xml-tools/ja_JP.eucJP/books/design-44bsd/Makefile ============================================================================== --- projects/xml-tools/ja_JP.eucJP/books/design-44bsd/Makefile Tue Feb 19 16:14:00 2013 (r41016) +++ projects/xml-tools/ja_JP.eucJP/books/design-44bsd/Makefile Tue Feb 19 16:20:38 2013 (r41017) @@ -13,7 +13,6 @@ INSTALL_ONLY_COMPRESSED?= SRCS= book.xml # Use the local DSSSL file -DSLHTML?= ${.CURDIR}/freebsd.dsl DSLPRINT?= ${.CURDIR}/freebsd.dsl DOC_PREFIX?= ${.CURDIR}/../../.. Modified: projects/xml-tools/ja_JP.eucJP/books/porters-handbook/Makefile ============================================================================== --- projects/xml-tools/ja_JP.eucJP/books/porters-handbook/Makefile Tue Feb 19 16:14:00 2013 (r41016) +++ projects/xml-tools/ja_JP.eucJP/books/porters-handbook/Makefile Tue Feb 19 16:20:38 2013 (r41017) @@ -23,7 +23,6 @@ INSTALL_ONLY_COMPRESSED?= SRCS= book.xml # Use the local DSSSL file -DSLHTML?= ${.CURDIR}/freebsd.dsl DSLPRINT?= ${.CURDIR}/freebsd.dsl DOC_PREFIX?= ${.CURDIR}/../../.. Modified: projects/xml-tools/ru_RU.KOI8-R/books/design-44bsd/Makefile ============================================================================== --- projects/xml-tools/ru_RU.KOI8-R/books/design-44bsd/Makefile Tue Feb 19 16:14:00 2013 (r41016) +++ projects/xml-tools/ru_RU.KOI8-R/books/design-44bsd/Makefile Tue Feb 19 16:20:38 2013 (r41017) @@ -17,7 +17,6 @@ INSTALL_ONLY_COMPRESSED?= SRCS= book.xml # Use the local DSSSL file -DSLHTML?= ${.CURDIR}/freebsd.dsl DSLPRINT?= ${.CURDIR}/freebsd.dsl DOC_PREFIX?= ${.CURDIR}/../../.. Modified: projects/xml-tools/ru_RU.KOI8-R/books/porters-handbook/Makefile ============================================================================== --- projects/xml-tools/ru_RU.KOI8-R/books/porters-handbook/Makefile Tue Feb 19 16:14:00 2013 (r41016) +++ projects/xml-tools/ru_RU.KOI8-R/books/porters-handbook/Makefile Tue Feb 19 16:20:38 2013 (r41017) @@ -32,7 +32,6 @@ SRCS= book.xml #SRCS+= ../../../en_US.ISO8859-1/books/handbook/authors.ent # Use the local DSSSL file -DSLHTML?= ${.CURDIR}/freebsd.dsl DSLPRINT?= ${.CURDIR}/freebsd.dsl DOC_PREFIX?= ${.CURDIR}/../../.. Modified: projects/xml-tools/zh_CN.GB2312/books/porters-handbook/Makefile ============================================================================== --- projects/xml-tools/zh_CN.GB2312/books/porters-handbook/Makefile Tue Feb 19 16:14:00 2013 (r41016) +++ projects/xml-tools/zh_CN.GB2312/books/porters-handbook/Makefile Tue Feb 19 16:20:38 2013 (r41017) @@ -26,7 +26,6 @@ INSTALL_ONLY_COMPRESSED?= SRCS= book.xml # Use the local DSSSL file -DSLHTML?= ${.CURDIR}/freebsd.dsl DSLPRINT?= ${.CURDIR}/freebsd.dsl # Images from the cross-document image library Modified: projects/xml-tools/zh_TW.Big5/books/porters-handbook/Makefile ============================================================================== --- projects/xml-tools/zh_TW.Big5/books/porters-handbook/Makefile Tue Feb 19 16:14:00 2013 (r41016) +++ projects/xml-tools/zh_TW.Big5/books/porters-handbook/Makefile Tue Feb 19 16:20:38 2013 (r41017) @@ -22,7 +22,6 @@ INSTALL_ONLY_COMPRESSED?= SRCS= book.xml # Use the local DSSSL file -DSLHTML?= ${.CURDIR}/freebsd.dsl DSLPRINT?= ${.CURDIR}/freebsd.dsl # Images from the cross-document image library From owner-svn-doc-projects@FreeBSD.ORG Tue Feb 19 17:08:20 2013 Return-Path: Delivered-To: svn-doc-projects@freebsd.org Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id 1EF2A256; Tue, 19 Feb 2013 17:08:20 +0000 (UTC) (envelope-from gabor@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id 0F0416C0; Tue, 19 Feb 2013 17:08:20 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r1JH8KeZ092508; Tue, 19 Feb 2013 17:08:20 GMT (envelope-from gabor@svn.freebsd.org) Received: (from gabor@localhost) by svn.freebsd.org (8.14.5/8.14.5/Submit) id r1JH8Fov092471; Tue, 19 Feb 2013 17:08:15 GMT (envelope-from gabor@svn.freebsd.org) Message-Id: <201302191708.r1JH8Fov092471@svn.freebsd.org> From: Gabor Kovesdan Date: Tue, 19 Feb 2013 17:08:15 +0000 (UTC) To: doc-committers@freebsd.org, svn-doc-projects@freebsd.org Subject: svn commit: r41018 - in projects/xml-tools: da_DK.ISO8859-1/share/xml de_DE.ISO8859-1/books/porters-handbook de_DE.ISO8859-1/share/xml el_GR.ISO8859-7/share/xml en_US.ISO8859-1/books/porters-handbo... X-SVN-Group: doc-projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-doc-projects@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for doc projects trees List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 19 Feb 2013 17:08:20 -0000 Author: gabor Date: Tue Feb 19 17:08:14 2013 New Revision: 41018 URL: http://svnweb.freebsd.org/changeset/doc/41018 Log: - Clean up more DSSSL leftovers Deleted: projects/xml-tools/share/xml/freebsd-html.dsl Modified: projects/xml-tools/da_DK.ISO8859-1/share/xml/freebsd.dsl projects/xml-tools/de_DE.ISO8859-1/books/porters-handbook/freebsd.dsl projects/xml-tools/de_DE.ISO8859-1/share/xml/freebsd.dsl projects/xml-tools/el_GR.ISO8859-7/share/xml/freebsd.dsl projects/xml-tools/en_US.ISO8859-1/books/porters-handbook/freebsd.dsl projects/xml-tools/en_US.ISO8859-1/share/xml/freebsd.dsl projects/xml-tools/es_ES.ISO8859-1/share/xml/freebsd.dsl projects/xml-tools/fr_FR.ISO8859-1/books/porters-handbook/freebsd.dsl projects/xml-tools/fr_FR.ISO8859-1/share/xml/freebsd.dsl projects/xml-tools/hu_HU.ISO8859-2/share/xml/freebsd.dsl projects/xml-tools/it_IT.ISO8859-15/share/xml/freebsd.dsl projects/xml-tools/ja_JP.eucJP/books/porters-handbook/freebsd.dsl projects/xml-tools/ja_JP.eucJP/share/xml/freebsd.dsl projects/xml-tools/mn_MN.UTF-8/share/xml/freebsd.dsl projects/xml-tools/nl_NL.ISO8859-1/share/xml/freebsd.dsl projects/xml-tools/pl_PL.ISO8859-2/share/xml/freebsd.dsl projects/xml-tools/ru_RU.KOI8-R/books/porters-handbook/freebsd.dsl projects/xml-tools/ru_RU.KOI8-R/share/xml/freebsd.dsl projects/xml-tools/share/xml/freebsd-common.dsl projects/xml-tools/share/xml/freebsd-print.dsl projects/xml-tools/share/xml/freebsd.dsl projects/xml-tools/sr_YU.ISO8859-2/share/xml/freebsd.dsl projects/xml-tools/zh_CN.GB2312/books/porters-handbook/freebsd.dsl projects/xml-tools/zh_CN.GB2312/share/xml/freebsd.dsl projects/xml-tools/zh_TW.Big5/books/porters-handbook/freebsd.dsl projects/xml-tools/zh_TW.Big5/share/xml/freebsd.dsl Modified: projects/xml-tools/da_DK.ISO8859-1/share/xml/freebsd.dsl ============================================================================== --- projects/xml-tools/da_DK.ISO8859-1/share/xml/freebsd.dsl Tue Feb 19 16:20:38 2013 (r41017) +++ projects/xml-tools/da_DK.ISO8859-1/share/xml/freebsd.dsl Tue Feb 19 17:08:14 2013 (r41018) @@ -2,46 +2,11 @@ - - - ]> - - - .") - (make empty-element gi: "br") - (literal "For sprgsml angende denne dokumentation, e-mail <") - (create-link (list (list "HREF" "mailto:doc@FreeBSD.org")) - (literal "doc@FreeBSD.org")) - (literal ">."))))) - ]]> (define (local-da-label-title-sep) (list Modified: projects/xml-tools/de_DE.ISO8859-1/books/porters-handbook/freebsd.dsl ============================================================================== --- projects/xml-tools/de_DE.ISO8859-1/books/porters-handbook/freebsd.dsl Tue Feb 19 16:20:38 2013 (r41017) +++ projects/xml-tools/de_DE.ISO8859-1/books/porters-handbook/freebsd.dsl Tue Feb 19 17:08:14 2013 (r41018) @@ -13,33 +13,11 @@ - ]> - - ,") - (literal " Fragen zu diesem Dokument hingegen an <") - (create-link (list (list "HREF" "mailto:de-bsd-translators@de.FreeBSD.org")) - (literal "de-bsd-translators@de.FreeBSD.org")) - (literal ">."))) - - - (element quote - (make sequence - (literal "``") - (process-children) - (literal "''"))) - ]]> Modified: projects/xml-tools/de_DE.ISO8859-1/share/xml/freebsd.dsl ============================================================================== --- projects/xml-tools/de_DE.ISO8859-1/share/xml/freebsd.dsl Tue Feb 19 16:20:38 2013 (r41017) +++ projects/xml-tools/de_DE.ISO8859-1/share/xml/freebsd.dsl Tue Feb 19 17:08:14 2013 (r41018) @@ -6,37 +6,11 @@ - - -%freebsd.l10n; - - - ]> - - .") - (make empty-element gi: "br") - (literal "Wenn Sie Fragen zu dieser Dokumentation haben, schicken Sie eine E-Mail an <") - (make element gi: "a" - attributes: (list (list "href" "mailto:de-bsd-translators@de.FreeBSD.org")) - (literal "de-bsd-translators@de.FreeBSD.org")) - (literal ">."))))) - ]]> Modified: projects/xml-tools/el_GR.ISO8859-7/share/xml/freebsd.dsl ============================================================================== --- projects/xml-tools/el_GR.ISO8859-7/share/xml/freebsd.dsl Tue Feb 19 16:20:38 2013 (r41017) +++ projects/xml-tools/el_GR.ISO8859-7/share/xml/freebsd.dsl Tue Feb 19 17:08:14 2013 (r41018) @@ -11,57 +11,11 @@ - - -%freebsd.l10n; - - - - ]> - - - .") - (make empty-element gi: "br") - (literal " , e-mail <") - (create-link (list (list "HREF" "mailto:doc@FreeBSD.org")) - (literal "doc@FreeBSD.org")) - (literal ">."))))) - - (element quote - (make sequence - (make entity-ref name: "laquo") - (process-children) - (make entity-ref name: "raquo"))) - ]]> - (define (local-el-label-title-sep) (list (list (normalize "warning") ": ") @@ -79,11 +33,3 @@ - - Modified: projects/xml-tools/en_US.ISO8859-1/books/porters-handbook/freebsd.dsl ============================================================================== --- projects/xml-tools/en_US.ISO8859-1/books/porters-handbook/freebsd.dsl Tue Feb 19 16:20:38 2013 (r41017) +++ projects/xml-tools/en_US.ISO8859-1/books/porters-handbook/freebsd.dsl Tue Feb 19 17:08:14 2013 (r41018) @@ -6,33 +6,11 @@ - ]> - - .") - (make empty-element gi: "br") - (literal "For questions about this documentation, e-mail <") - (create-link (list (list "HREF" "mailto:doc@FreeBSD.org")) - (literal "doc@FreeBSD.org")) - (literal ">."))) - - - (element quote - (make sequence - (literal "``") - (process-children) - (literal "''"))) - ]]> Modified: projects/xml-tools/en_US.ISO8859-1/share/xml/freebsd.dsl ============================================================================== --- projects/xml-tools/en_US.ISO8859-1/share/xml/freebsd.dsl Tue Feb 19 16:20:38 2013 (r41017) +++ projects/xml-tools/en_US.ISO8859-1/share/xml/freebsd.dsl Tue Feb 19 17:08:14 2013 (r41018) @@ -2,13 +2,6 @@ - - -%freebsd.l10n; - - - - ]> Modified: projects/xml-tools/es_ES.ISO8859-1/share/xml/freebsd.dsl ============================================================================== --- projects/xml-tools/es_ES.ISO8859-1/share/xml/freebsd.dsl Tue Feb 19 16:20:38 2013 (r41017) +++ projects/xml-tools/es_ES.ISO8859-1/share/xml/freebsd.dsl Tue Feb 19 17:08:14 2013 (r41018) @@ -2,47 +2,11 @@ - - - ]> - - - .") - (make empty-element gi: "br") - (literal "Enve sus preguntas sobre la documentacin a <") - (create-link (list (list "HREF" "mailto:doc@FreeBSD.org")) - (literal "doc@FreeBSD.org")) - (literal ">."))))) - ]]> - Modified: projects/xml-tools/fr_FR.ISO8859-1/books/porters-handbook/freebsd.dsl ============================================================================== --- projects/xml-tools/fr_FR.ISO8859-1/books/porters-handbook/freebsd.dsl Tue Feb 19 16:20:38 2013 (r41017) +++ projects/xml-tools/fr_FR.ISO8859-1/books/porters-handbook/freebsd.dsl Tue Feb 19 17:08:14 2013 (r41018) @@ -12,33 +12,11 @@ - ]> - - .") - (make empty-element gi: "br") - (literal "Pour toutes questions a propos de la documentation, e-mail <") - (create-link (list (list "HREF" "mailto:doc@FreeBSD.org")) - (literal "doc@FreeBSD.org")) - (literal ">."))) - - - (element quote - (make sequence - (literal "``") - (process-children) - (literal "''"))) - ]]> Modified: projects/xml-tools/fr_FR.ISO8859-1/share/xml/freebsd.dsl ============================================================================== --- projects/xml-tools/fr_FR.ISO8859-1/share/xml/freebsd.dsl Tue Feb 19 16:20:38 2013 (r41017) +++ projects/xml-tools/fr_FR.ISO8859-1/share/xml/freebsd.dsl Tue Feb 19 17:08:14 2013 (r41018) @@ -10,53 +10,12 @@ - - - ]> - - (define (gentext-fr-nav-prev prev) - (make sequence (literal "Pr\U-00E9;c\U-00E9;dent"))) - - (define ($email-footer$) - (make sequence - (make element gi: "p" - attributes: (list (list "align" "center")) - (make element gi: "small" - (literal "Ce document, ainsi que d'autres peut tre tlcharg sur ") - (make element gi: "a" - attributes: (list (list "href" "ftp://ftp.FreeBSD.org/pub/FreeBSD/doc")) - (literal "ftp.FreeBSD.org/pub/FreeBSD/doc/")) - (literal "."))) - (make element gi: "p" - attributes: (list (list "align" "center")) - (make element gi: "small" - (literal "Pour toutes questions propos de FreeBSD, lisez la ") - (make element gi: "a" - attributes: (list (list "href" "http://www.freebsd.org/docs.html")) - (literal "documentation")) - (literal " avant de contacter <") - (make element gi: "a" - attributes: (list (list "href" "mailto:questions@FreeBSD.org")) - (literal "questions@FreeBSD.org")) - (literal ">.") - (make empty-element gi: "br") - (literal "Pour les questions sur cette documentation, contactez <") - (make element gi: "a" - attributes: (list (list "href" "mailto:doc@FreeBSD.org")) - (literal "doc@FreeBSD.org")) - (literal ">."))))) - ]]> (define (local-fr-label-title-sep) Modified: projects/xml-tools/hu_HU.ISO8859-2/share/xml/freebsd.dsl ============================================================================== --- projects/xml-tools/hu_HU.ISO8859-2/share/xml/freebsd.dsl Tue Feb 19 16:20:38 2013 (r41017) +++ projects/xml-tools/hu_HU.ISO8859-2/share/xml/freebsd.dsl Tue Feb 19 17:08:14 2013 (r41018) @@ -8,43 +8,11 @@ - - -%freebsd.l10n; - - - ]> - - .")) - (make empty-element gi: "br") - (literal "Ha ezzel a dokumentummal kapcsolatban van krdse, - krjk erre a cmre rjon: <") - (make element gi: "a" - attributes: (list (list "href" "mailto:gabor@FreeBSD.org")) - (literal "gabor@FreeBSD.org>.")) - )))) - - (define (local-hu-label-title-sep) - (list - (list (normalize "caution") ": ") - (list (normalize "warning") ": ") - )) - ]]> Modified: projects/xml-tools/it_IT.ISO8859-15/share/xml/freebsd.dsl ============================================================================== --- projects/xml-tools/it_IT.ISO8859-15/share/xml/freebsd.dsl Tue Feb 19 16:20:38 2013 (r41017) +++ projects/xml-tools/it_IT.ISO8859-15/share/xml/freebsd.dsl Tue Feb 19 17:08:14 2013 (r41018) @@ -7,45 +7,11 @@ - - - ]> - .") - (make empty-element gi: "br") - (literal "Per domande su questa documentazione, invia una e-mail a <") - (create-link (list (list "HREF" "mailto:doc@FreeBSD.org")) - (literal "doc@FreeBSD.org")) - (literal ">."))))) - ]]> - (define (local-it-label-title-sep) (list (list (normalize "warning") ": ") Modified: projects/xml-tools/ja_JP.eucJP/books/porters-handbook/freebsd.dsl ============================================================================== --- projects/xml-tools/ja_JP.eucJP/books/porters-handbook/freebsd.dsl Tue Feb 19 16:20:38 2013 (r41017) +++ projects/xml-tools/ja_JP.eucJP/books/porters-handbook/freebsd.dsl Tue Feb 19 17:08:14 2013 (r41018) @@ -12,33 +12,11 @@ - ]> - - ء") - (make empty-element gi: "br") - (literal "ʸθʸ˴ؤ뤪䤤碌ϡ(Ѹ) <") - (create-link (list (list "HREF" "mailto:doc@FreeBSD.org")) - (literal "doc@FreeBSD.org")) - (literal "> ޤǤꤤޤ"))) - - - (element quote - (make sequence - (literal "``") - (process-children) - (literal "''"))) - ]]> Modified: projects/xml-tools/ja_JP.eucJP/share/xml/freebsd.dsl ============================================================================== --- projects/xml-tools/ja_JP.eucJP/share/xml/freebsd.dsl Tue Feb 19 16:20:38 2013 (r41017) +++ projects/xml-tools/ja_JP.eucJP/share/xml/freebsd.dsl Tue Feb 19 17:08:14 2013 (r41018) @@ -2,46 +2,11 @@ - - -%freebsd.l10n; - - - ]> - ޤ (Ѹ) ϢƤ") - (make empty-element gi: "br") - (literal "ʸ˴ؤˤĤƤϡ<") - (create-link (list (list "HREF" "mailto:doc@FreeBSD.org")) - (literal "doc@FreeBSD.org")) - (literal "> ޤŻҥ᡼ (Ѹ) äƤ"))))) - ]]> Modified: projects/xml-tools/mn_MN.UTF-8/share/xml/freebsd.dsl ============================================================================== --- projects/xml-tools/mn_MN.UTF-8/share/xml/freebsd.dsl Tue Feb 19 16:20:38 2013 (r41017) +++ projects/xml-tools/mn_MN.UTF-8/share/xml/freebsd.dsl Tue Feb 19 17:08:14 2013 (r41018) @@ -8,56 +8,11 @@ - - - -%freebsd.l10n; - - - ]> - - (define ($email-footer$) - (make sequence - (make element gi: "p" - attributes: (list (list "align" "center")) - (make element gi: "small" - (literal "Энэ болон бусад баримтуудыг ") - (create-link - (list (list "HREF" "ftp://ftp.FreeBSD.org/pub/FreeBSD/doc/")) - (literal "ftp://ftp.FreeBSD.org/pub/FreeBSD/doc/")) - (literal " хаягаас татаж авч болно."))) - (make element gi: "p" - attributes: (list (list "align" "center")) - (make element gi: "small" - (literal "FreeBSD-ийн талаар <") - (create-link - (list (list "HREF" "mailto:questions@FreeBSD.org")) - (literal "questions@FreeBSD.org")) - (literal "> хаягтай холбоо барихаасаа өмнө ") - (create-link - (list (list "HREF" "http://www.FreeBSD.org/docs.html")) - (literal "баримтыг")) - (literal " уншина уу.") - (make empty-element gi: "br") - (literal "Энэ бичиг баримттай холбоотой асуулт байвал <") - (create-link (list (list "HREF" "mailto:doc@FreeBSD.org")) - (literal "doc@FreeBSD.org")) - (literal "> хаягаар цахим захидал явуулна уу.") - (make empty-element gi: "br") - (literal "Энэ бичиг баримтын орчуулгатай холбоотой асуулт байвал <") - (create-link (list (list "HREF" "mailto:admin@mnbsd.org")) - (literal "admin@mnbsd.org")) - (literal "> хаягаар цахим захидал явуулна уу."))))) - ]]> (define (local-mn-label-title-sep) (list Modified: projects/xml-tools/nl_NL.ISO8859-1/share/xml/freebsd.dsl ============================================================================== --- projects/xml-tools/nl_NL.ISO8859-1/share/xml/freebsd.dsl Tue Feb 19 16:20:38 2013 (r41017) +++ projects/xml-tools/nl_NL.ISO8859-1/share/xml/freebsd.dsl Tue Feb 19 17:08:14 2013 (r41018) @@ -8,12 +8,6 @@ - - -%freebsd.l10n; - - - ]> Modified: projects/xml-tools/pl_PL.ISO8859-2/share/xml/freebsd.dsl ============================================================================== --- projects/xml-tools/pl_PL.ISO8859-2/share/xml/freebsd.dsl Tue Feb 19 16:20:38 2013 (r41017) +++ projects/xml-tools/pl_PL.ISO8859-2/share/xml/freebsd.dsl Tue Feb 19 17:08:14 2013 (r41018) @@ -8,47 +8,11 @@ - - -%freebsd.l10n; - - - ]> - .") - (make empty-element gi: "br") - (literal "W sprawie zapyta o t dokumentacj prosimy o kontakt z <") - (create-link (list (list "HREF" "mailto:doc@FreeBSD.org")) - (literal "doc@FreeBSD.org")) - (literal ">."))))) - ]]> Modified: projects/xml-tools/ru_RU.KOI8-R/books/porters-handbook/freebsd.dsl ============================================================================== --- projects/xml-tools/ru_RU.KOI8-R/books/porters-handbook/freebsd.dsl Tue Feb 19 16:20:38 2013 (r41017) +++ projects/xml-tools/ru_RU.KOI8-R/books/porters-handbook/freebsd.dsl Tue Feb 19 17:08:14 2013 (r41018) @@ -13,33 +13,11 @@ - ]> - - .") - (make empty-element gi: "br") - (literal " , , <") - (create-link (list (list "HREF" "mailto:doc@FreeBSD.org")) - (literal "doc@FreeBSD.org")) - (literal ">."))) - - - (element quote - (make sequence - (literal "``") - (process-children) - (literal "''"))) - ]]> Modified: projects/xml-tools/ru_RU.KOI8-R/share/xml/freebsd.dsl ============================================================================== --- projects/xml-tools/ru_RU.KOI8-R/share/xml/freebsd.dsl Tue Feb 19 16:20:38 2013 (r41017) +++ projects/xml-tools/ru_RU.KOI8-R/share/xml/freebsd.dsl Tue Feb 19 17:08:14 2013 (r41018) @@ -9,65 +9,12 @@ - - - -%freebsd.l10n; - - - ]> - - - (define ($email-footer$) - (make sequence - (make element gi: "p" - attributes: (list (list "align" "center")) - (make element gi: "small" - (literal ", , ") - (create-link - (list (list "HREF" "ftp://ftp.FreeBSD.org/pub/FreeBSD/doc/")) - (literal "ftp://ftp.FreeBSD.org/pub/FreeBSD/doc/")) - (literal "."))) - (make element gi: "p" - attributes: (list (list "align" "center")) - (make element gi: "small" - (literal " , FreeBSD, ") - (create-link - (list (list "HREF" "http://www.FreeBSD.org/ru/docs.html")) - (literal "")) - (literal " <") - (create-link - (list (list "HREF" "mailto:questions@FreeBSD.org")) - (literal "questions@FreeBSD.org")) - (literal ">.") - (make empty-element gi: "br") - (literal " , , <") - (create-link (list (list "HREF" "mailto:doc@FreeBSD.org")) - (literal "doc@FreeBSD.org")) - (literal ">.") - (make empty-element gi: "br") - (literal " , , <") - (create-link (list (list "HREF" "mailto:frdp@FreeBSD.org.ua")) - (literal "frdp@FreeBSD.org.ua")) - (literal ">.") - (make empty-element gi: "br") - (literal " ") - (create-link - (list (list "HREF" "http://www.FreeBSD.org.ua/resources.html")) - (literal " ")) - (literal "."))))) - ]]> - (element quote (make sequence Modified: projects/xml-tools/share/xml/freebsd-common.dsl ============================================================================== --- projects/xml-tools/share/xml/freebsd-common.dsl Tue Feb 19 16:20:38 2013 (r41017) +++ projects/xml-tools/share/xml/freebsd-common.dsl Tue Feb 19 17:08:14 2013 (r41018) @@ -1,14 +1,6 @@ - -%freebsd.l10n; - -%freebsd.l10n-common; - - - -]> + @@ -153,9 +145,7 @@ (element errorname (make sequence - ($mono-seq$ (process-children)) - )) - - - -%freebsd.l10n; - -%freebsd.l10n-common; - - - -]]> - -]]> - ]> Modified: projects/xml-tools/sr_YU.ISO8859-2/share/xml/freebsd.dsl ============================================================================== --- projects/xml-tools/sr_YU.ISO8859-2/share/xml/freebsd.dsl Tue Feb 19 16:20:38 2013 (r41017) +++ projects/xml-tools/sr_YU.ISO8859-2/share/xml/freebsd.dsl Tue Feb 19 17:08:14 2013 (r41018) @@ -2,8 +2,6 @@ - - ]> @@ -15,36 +13,6 @@ (define %gentext-language% "sr") ]]> - .") - (make empty-element gi: "br") - (literal "For questions about this documentation, e-mail <") - (make element gi: "a" - attributes: (list (list "href" "mailto:doc@FreeBSD.org")) - (literal "doc@FreeBSD.org")) - (literal ">."))))) - ]]> Modified: projects/xml-tools/zh_CN.GB2312/books/porters-handbook/freebsd.dsl ============================================================================== --- projects/xml-tools/zh_CN.GB2312/books/porters-handbook/freebsd.dsl Tue Feb 19 16:20:38 2013 (r41017) +++ projects/xml-tools/zh_CN.GB2312/books/porters-handbook/freebsd.dsl Tue Feb 19 17:08:14 2013 (r41018) @@ -11,33 +11,11 @@ - ]> - - ") - (make empty-element gi: "br") - (literal "ڴĵκ⣬ º <") - (create-link (list (list "HREF" "mailto:doc@FreeBSD.org")) - (literal "doc@FreeBSD.org")) - (literal ">"))) - - - (element quote - (make sequence - (literal "") - (process-children) - (literal ""))) - ]]> Modified: projects/xml-tools/zh_CN.GB2312/share/xml/freebsd.dsl ============================================================================== --- projects/xml-tools/zh_CN.GB2312/share/xml/freebsd.dsl Tue Feb 19 16:20:38 2013 (r41017) +++ projects/xml-tools/zh_CN.GB2312/share/xml/freebsd.dsl Tue Feb 19 17:08:14 2013 (r41018) @@ -7,329 +7,11 @@ - - -%freebsd.l10n; - - - ]> - .") - (make empty-element gi: "br") - (literal "ڱĵ뷢ϵ <") - (create-link (list (list "HREF" "mailto:doc@FreeBSD.org")) - (literal "doc@FreeBSD.org")) - (literal ">."))))) - -;; ¼ɲϰߵ½ںš -;; ֣֪ -;; /usr/local/share/xml/docbook/dsssl/modular/common/dbl1zhcn.dsl -;; еzhcn-xref-stringsΪʲôá *** DIFF OUTPUT TRUNCATED AT 1000 LINES ***