From owner-svn-doc-projects@FreeBSD.ORG Thu Jul 11 03:06:46 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 20253313; Thu, 11 Jul 2013 03:06:46 +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 1057C1CC8; Thu, 11 Jul 2013 03:06:46 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r6B36jfD095506; Thu, 11 Jul 2013 03:06:45 GMT (envelope-from gjb@svn.freebsd.org) Received: (from gjb@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r6B36iNP095497; Thu, 11 Jul 2013 03:06:44 GMT (envelope-from gjb@svn.freebsd.org) Message-Id: <201307110306.r6B36iNP095497@svn.freebsd.org> From: Glen Barber Date: Thu, 11 Jul 2013 03:06:44 +0000 (UTC) To: doc-committers@freebsd.org, svn-doc-projects@freebsd.org Subject: svn commit: r42244 - in projects/sysctl: . de_DE.ISO8859-1/books/handbook/firewalls de_DE.ISO8859-1/books/porters-handbook el_GR.ISO8859-7/books/handbook/firewalls el_GR.ISO8859-7/share/xml en_US.I... 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: Thu, 11 Jul 2013 03:06:46 -0000 Author: gjb Date: Thu Jul 11 03:06:43 2013 New Revision: 42244 URL: http://svnweb.freebsd.org/changeset/doc/42244 Log: MFH: Merged /head/Makefile:r41729-42242 Merged /head/README:r41729-42242 Merged /head/bn_BD.ISO10646-1:r41730-42242 Merged /head/da_DK.ISO8859-1:r41730-42242 Merged /head/de_DE.ISO8859-1:r41947-42242 Merged /head/el_GR.ISO8859-7:r41730-42242 Merged /head/en_US.ISO8859-1:r42010-42242 Merged /head/es_ES.ISO8859-1:r41730-42242 Merged /head/fr_FR.ISO8859-1:r41947-42242 Merged /head/hu_HU.ISO8859-2:r41730-42242 Merged /head/it_IT.ISO8859-15:r41947-42242 Merged /head/ja_JP.eucJP:r42010-42242 Merged /head/mn_MN.UTF-8:r41947-42242 Merged /head/nl_NL.ISO8859-1/share/xml/entities.ent:r41724-42242 Merged /head/nl_NL.ISO8859-1:r41947-42242 Merged /head/no_NO.ISO8859-1:r41730-42242 Merged /head/pl_PL.ISO8859-2:r41730-42242 Merged /head/pt_BR.ISO8859-1:r41730-42242 Merged /head/release:r41730-42242 Merged /head/ru_RU.KOI8-R:r41947-42242 Merged /head/share:r42010-42242 Merged /head/sr_YU.ISO8859-2:r41730-42242 Merged /head/tr_TR.ISO8859-9:r41730-42242 Merged /head/zh_CN.GB2312:r41947-42242 Merged /head/zh_TW.Big5:r41730-42242 Merged /projects/ISBN_1-57176-407-0/en_US.ISO8859-1:r40727-41455, 41457-41469,41472-41477,41479-41513,41515-41521,41523-41577, 41579-41581,41583-42013 Merged /projects/ISBN_1-57176-407-0/nl_NL.ISO8859-1/share/xml/entities.ent:r40727-42011 Merged /projects/ISBN_1-57176-407-0/nl_NL.ISO8859-1:r40727-42011 Merged /projects/ISBN_1-57176-407-0/share:r40727-42011 Merged /projects/entities/bn_BD.ISO10646-1:r40180-42225 Merged /projects/entities/da_DK.ISO8859-1:r40180-42225 Merged /projects/entities/de_DE.ISO8859-1:r40180-42225 Merged /projects/entities/el_GR.ISO8859-7:r40180-42225 Merged /projects/entities/en_US.ISO8859-1:r40180-42225 Merged /projects/entities/es_ES.ISO8859-1:r40180-42225 Merged /projects/entities/fr_FR.ISO8859-1:r40180-42225 Merged /projects/entities/hu_HU.ISO8859-2:r40180-42225 Merged /projects/entities/it_IT.ISO8859-15:r40180-42225 Merged /projects/entities/ja_JP.eucJP:r40180-42225 Merged /projects/entities/mn_MN.UTF-8:r40180-42225 Merged /projects/entities/nl_NL.ISO8859-1/share/xml/entities.ent:r40180-42225 Merged /projects/entities/nl_NL.ISO8859-1:r40180-42225 Merged /projects/entities/no_NO.ISO8859-1:r40180-42225 Merged /projects/entities/pl_PL.ISO8859-2:r40180-42225 Merged /projects/entities/pt_BR.ISO8859-1:r40180-42225 Merged /projects/entities/release:r40180-42225 Merged /projects/entities/ru_RU.KOI8-R:r40180-42225 Merged /projects/entities/share:r40180-42225 Merged /projects/entities/sr_YU.ISO8859-2:r40180-42225 Merged /projects/entities/tr_TR.ISO8859-9:r40180-42225 Merged /projects/entities/zh_CN.GB2312:r40180-42225 Merged /projects/entities/zh_TW.Big5:r40180-42225 Merged /projects/print2013/en_US.ISO8859-1:r40693-40726 Merged /projects/print2013/nl_NL.ISO8859-1/share/xml/entities.ent:r40693-40726 Merged /projects/print2013/nl_NL.ISO8859-1:r40693-40726 Merged /projects/print2013/share:r40693-40726 Approved by: doceng (implicit) Added: projects/sysctl/en_US.ISO8859-1/books/fdp-primer/xml-primer/ - copied from r42242, head/en_US.ISO8859-1/books/fdp-primer/xml-primer/ projects/sysctl/en_US.ISO8859-1/htdocs/java/links.xml - copied unchanged from r42242, head/en_US.ISO8859-1/htdocs/java/links.xml projects/sysctl/en_US.ISO8859-1/htdocs/news/status/report-2013-04-2013-06.xml - copied unchanged from r42242, head/en_US.ISO8859-1/htdocs/news/status/report-2013-04-2013-06.xml projects/sysctl/en_US.ISO8859-1/htdocs/news/status/report-2013-05-devsummit.xml - copied unchanged from r42242, head/en_US.ISO8859-1/htdocs/news/status/report-2013-05-devsummit.xml projects/sysctl/en_US.ISO8859-1/htdocs/releases/9.2R/ - copied from r42242, head/en_US.ISO8859-1/htdocs/releases/9.2R/ projects/sysctl/ja_JP.eucJP/htdocs/java/links.xml - copied unchanged from r42242, head/ja_JP.eucJP/htdocs/java/links.xml projects/sysctl/share/pgpkeys/feld.key - copied unchanged from r42242, head/share/pgpkeys/feld.key projects/sysctl/share/pgpkeys/loos.key - copied unchanged from r42242, head/share/pgpkeys/loos.key projects/sysctl/share/pgpkeys/marino.key - copied unchanged from r42242, head/share/pgpkeys/marino.key projects/sysctl/share/security/advisories/FreeBSD-EN-13:01.fxp.asc - copied unchanged from r42242, head/share/security/advisories/FreeBSD-EN-13:01.fxp.asc projects/sysctl/share/security/advisories/FreeBSD-EN-13:02.vtnet.asc - copied unchanged from r42242, head/share/security/advisories/FreeBSD-EN-13:02.vtnet.asc projects/sysctl/share/security/patches/EN-13:01/ - copied from r42242, head/share/security/patches/EN-13:01/ projects/sysctl/share/security/patches/EN-13:02/ - copied from r42242, head/share/security/patches/EN-13:02/ Deleted: projects/sysctl/en_US.ISO8859-1/books/fdp-primer/sgml-primer/ projects/sysctl/en_US.ISO8859-1/books/handbook/vinum/ projects/sysctl/en_US.ISO8859-1/htdocs/docproj/todo.xml projects/sysctl/en_US.ISO8859-1/htdocs/java/advocacy.xml projects/sysctl/en_US.ISO8859-1/htdocs/java/dists/15.xml projects/sysctl/en_US.ISO8859-1/htdocs/search/opensearch/cvsweb.xml projects/sysctl/ja_JP.eucJP/htdocs/java/advocacy.xml projects/sysctl/ja_JP.eucJP/htdocs/java/dists/15.xml projects/sysctl/ja_JP.eucJP/htdocs/java/links/ projects/sysctl/share/xml/developers.ent Modified: projects/sysctl/de_DE.ISO8859-1/books/handbook/firewalls/chapter.xml projects/sysctl/de_DE.ISO8859-1/books/porters-handbook/book.xml projects/sysctl/el_GR.ISO8859-7/books/handbook/firewalls/chapter.xml projects/sysctl/el_GR.ISO8859-7/share/xml/trademarks.ent projects/sysctl/en_US.ISO8859-1/articles/committers-guide/article.xml projects/sysctl/en_US.ISO8859-1/articles/console-server/article.xml projects/sysctl/en_US.ISO8859-1/articles/contributors/article.xml projects/sysctl/en_US.ISO8859-1/articles/contributors/contrib.additional.xml projects/sysctl/en_US.ISO8859-1/articles/contributors/contrib.committers.xml projects/sysctl/en_US.ISO8859-1/articles/contributors/contrib.corealumni.xml projects/sysctl/en_US.ISO8859-1/articles/contributors/contrib.develalumni.xml projects/sysctl/en_US.ISO8859-1/articles/contributors/contrib.develinmemoriam.xml projects/sysctl/en_US.ISO8859-1/articles/contributors/contrib.portmgralumni.xml projects/sysctl/en_US.ISO8859-1/articles/cvs-freebsd/article.xml projects/sysctl/en_US.ISO8859-1/articles/freebsd-update-server/article.xml projects/sysctl/en_US.ISO8859-1/articles/gjournal-desktop/article.xml projects/sysctl/en_US.ISO8859-1/articles/hubs/article.xml projects/sysctl/en_US.ISO8859-1/articles/linux-emulation/article.xml projects/sysctl/en_US.ISO8859-1/articles/mailing-list-faq/article.xml projects/sysctl/en_US.ISO8859-1/articles/nanobsd/article.xml projects/sysctl/en_US.ISO8859-1/articles/pam/article.xml projects/sysctl/en_US.ISO8859-1/articles/releng-packages/article.xml projects/sysctl/en_US.ISO8859-1/articles/releng/article.xml projects/sysctl/en_US.ISO8859-1/articles/remote-install/article.xml projects/sysctl/en_US.ISO8859-1/articles/serial-uart/article.xml projects/sysctl/en_US.ISO8859-1/articles/vm-design/article.xml projects/sysctl/en_US.ISO8859-1/books/dev-model/book.xml projects/sysctl/en_US.ISO8859-1/books/developers-handbook/testing/chapter.xml projects/sysctl/en_US.ISO8859-1/books/developers-handbook/x86/chapter.xml projects/sysctl/en_US.ISO8859-1/books/faq/book.xml projects/sysctl/en_US.ISO8859-1/books/fdp-primer/Makefile projects/sysctl/en_US.ISO8859-1/books/fdp-primer/book.xml projects/sysctl/en_US.ISO8859-1/books/fdp-primer/chapters.ent projects/sysctl/en_US.ISO8859-1/books/fdp-primer/docbook-markup/chapter.xml projects/sysctl/en_US.ISO8859-1/books/fdp-primer/overview/chapter.xml projects/sysctl/en_US.ISO8859-1/books/fdp-primer/the-website/chapter.xml projects/sysctl/en_US.ISO8859-1/books/fdp-primer/writing-style/chapter.xml projects/sysctl/en_US.ISO8859-1/books/handbook/Makefile projects/sysctl/en_US.ISO8859-1/books/handbook/advanced-networking/chapter.xml projects/sysctl/en_US.ISO8859-1/books/handbook/audit/chapter.xml projects/sysctl/en_US.ISO8859-1/books/handbook/basics/chapter.xml projects/sysctl/en_US.ISO8859-1/books/handbook/book.xml projects/sysctl/en_US.ISO8859-1/books/handbook/boot/chapter.xml projects/sysctl/en_US.ISO8859-1/books/handbook/bsdinstall/chapter.xml projects/sysctl/en_US.ISO8859-1/books/handbook/chapters.ent projects/sysctl/en_US.ISO8859-1/books/handbook/config/chapter.xml projects/sysctl/en_US.ISO8859-1/books/handbook/cutting-edge/chapter.xml projects/sysctl/en_US.ISO8859-1/books/handbook/desktop/chapter.xml projects/sysctl/en_US.ISO8859-1/books/handbook/disks/chapter.xml projects/sysctl/en_US.ISO8859-1/books/handbook/eresources/chapter.xml projects/sysctl/en_US.ISO8859-1/books/handbook/filesystems/chapter.xml projects/sysctl/en_US.ISO8859-1/books/handbook/firewalls/chapter.xml projects/sysctl/en_US.ISO8859-1/books/handbook/install/chapter.xml projects/sysctl/en_US.ISO8859-1/books/handbook/introduction/chapter.xml projects/sysctl/en_US.ISO8859-1/books/handbook/jails/chapter.xml projects/sysctl/en_US.ISO8859-1/books/handbook/kernelconfig/chapter.xml projects/sysctl/en_US.ISO8859-1/books/handbook/mac/chapter.xml projects/sysctl/en_US.ISO8859-1/books/handbook/mail/chapter.xml projects/sysctl/en_US.ISO8859-1/books/handbook/multimedia/chapter.xml projects/sysctl/en_US.ISO8859-1/books/handbook/network-servers/chapter.xml projects/sysctl/en_US.ISO8859-1/books/handbook/ports/chapter.xml projects/sysctl/en_US.ISO8859-1/books/handbook/preface/preface.xml projects/sysctl/en_US.ISO8859-1/books/handbook/security/chapter.xml projects/sysctl/en_US.ISO8859-1/books/handbook/users/chapter.xml projects/sysctl/en_US.ISO8859-1/books/pmake/gods/chapter.xml projects/sysctl/en_US.ISO8859-1/books/porters-handbook/book.xml projects/sysctl/en_US.ISO8859-1/books/porters-handbook/uses.xml projects/sysctl/en_US.ISO8859-1/htdocs/administration.xml projects/sysctl/en_US.ISO8859-1/htdocs/cgi/cgi-style.pl projects/sysctl/en_US.ISO8859-1/htdocs/cgi/monthly.cgi projects/sysctl/en_US.ISO8859-1/htdocs/docproj/Makefile projects/sysctl/en_US.ISO8859-1/htdocs/docproj/current.xml projects/sysctl/en_US.ISO8859-1/htdocs/docs/books.xml projects/sysctl/en_US.ISO8859-1/htdocs/internal/doceng.xml projects/sysctl/en_US.ISO8859-1/htdocs/java/Makefile projects/sysctl/en_US.ISO8859-1/htdocs/java/dists/Makefile projects/sysctl/en_US.ISO8859-1/htdocs/java/dists/index.xml projects/sysctl/en_US.ISO8859-1/htdocs/java/howhelp.xml projects/sysctl/en_US.ISO8859-1/htdocs/java/index.xml projects/sysctl/en_US.ISO8859-1/htdocs/java/install.xml projects/sysctl/en_US.ISO8859-1/htdocs/news/status/Makefile projects/sysctl/en_US.ISO8859-1/htdocs/news/status/status.xml projects/sysctl/en_US.ISO8859-1/htdocs/platforms/arm.xml projects/sysctl/en_US.ISO8859-1/htdocs/platforms/sparc.xml projects/sysctl/en_US.ISO8859-1/htdocs/platforms/xbox.xml projects/sysctl/en_US.ISO8859-1/htdocs/portmgr/index.xml projects/sysctl/en_US.ISO8859-1/htdocs/ports/references.xml projects/sysctl/en_US.ISO8859-1/htdocs/projects/Makefile projects/sysctl/en_US.ISO8859-1/htdocs/projects/projects.xml projects/sysctl/en_US.ISO8859-1/htdocs/projects/summerofcode-2005.xml projects/sysctl/en_US.ISO8859-1/htdocs/projects/summerofcode-2006.xml projects/sysctl/en_US.ISO8859-1/htdocs/releases/Makefile projects/sysctl/en_US.ISO8859-1/htdocs/releng/index.xml projects/sysctl/en_US.ISO8859-1/htdocs/search/opensearch/Makefile projects/sysctl/en_US.ISO8859-1/htdocs/search/opensearch/opensearch.xml projects/sysctl/en_US.ISO8859-1/htdocs/security/reporting.xml projects/sysctl/en_US.ISO8859-1/share/xml/mailing-lists.ent projects/sysctl/en_US.ISO8859-1/share/xml/teams.ent projects/sysctl/es_ES.ISO8859-1/books/handbook/disks/chapter.xml projects/sysctl/es_ES.ISO8859-1/share/xml/trademarks.ent projects/sysctl/fr_FR.ISO8859-1/articles/pam/article.xml projects/sysctl/fr_FR.ISO8859-1/books/fdp-primer/book.xml projects/sysctl/fr_FR.ISO8859-1/htdocs/releng/index.xml projects/sysctl/hu_HU.ISO8859-2/books/handbook/firewalls/chapter.xml projects/sysctl/hu_HU.ISO8859-2/books/handbook/install/chapter.xml projects/sysctl/hu_HU.ISO8859-2/books/handbook/linuxemu/chapter.xml projects/sysctl/it_IT.ISO8859-15/articles/vm-design/article.xml projects/sysctl/it_IT.ISO8859-15/books/handbook/install/chapter.xml projects/sysctl/it_IT.ISO8859-15/books/handbook/serialcomms/chapter.xml projects/sysctl/it_IT.ISO8859-15/books/unix-introduction/book.xml projects/sysctl/it_IT.ISO8859-15/books/unix-introduction/system-resource/chapter.xml projects/sysctl/ja_JP.eucJP/articles/contributors/article.xml projects/sysctl/ja_JP.eucJP/books/faq/book.xml projects/sysctl/ja_JP.eucJP/books/handbook/Makefile projects/sysctl/ja_JP.eucJP/books/handbook/book.xml projects/sysctl/ja_JP.eucJP/books/handbook/bsdinstall/chapter.xml projects/sysctl/ja_JP.eucJP/books/handbook/chapters.ent projects/sysctl/ja_JP.eucJP/books/handbook/cutting-edge/chapter.xml projects/sysctl/ja_JP.eucJP/books/handbook/desktop/chapter.xml projects/sysctl/ja_JP.eucJP/books/handbook/disks/chapter.xml projects/sysctl/ja_JP.eucJP/books/handbook/introduction/chapter.xml projects/sysctl/ja_JP.eucJP/books/handbook/kernelconfig/chapter.xml projects/sysctl/ja_JP.eucJP/books/handbook/preface/preface.xml projects/sysctl/ja_JP.eucJP/books/porters-handbook/book.xml projects/sysctl/ja_JP.eucJP/htdocs/docproj/Makefile projects/sysctl/ja_JP.eucJP/htdocs/docproj/current.xml projects/sysctl/ja_JP.eucJP/htdocs/docs/books.xml projects/sysctl/ja_JP.eucJP/htdocs/java/Makefile projects/sysctl/ja_JP.eucJP/htdocs/java/dists/Makefile projects/sysctl/ja_JP.eucJP/htdocs/java/dists/index.xml projects/sysctl/ja_JP.eucJP/htdocs/java/howhelp.xml projects/sysctl/ja_JP.eucJP/htdocs/java/index.xml projects/sysctl/ja_JP.eucJP/htdocs/java/install.xml projects/sysctl/ja_JP.eucJP/htdocs/platforms/arm.xml projects/sysctl/ja_JP.eucJP/htdocs/platforms/sparc.xml projects/sysctl/ja_JP.eucJP/htdocs/ports/references.xml projects/sysctl/ja_JP.eucJP/htdocs/ports/updating.xml projects/sysctl/ja_JP.eucJP/htdocs/releases/Makefile projects/sysctl/ja_JP.eucJP/htdocs/relnotes.xml projects/sysctl/ja_JP.eucJP/htdocs/security/reporting.xml projects/sysctl/ja_JP.eucJP/share/xml/mailing-lists.ent projects/sysctl/ja_JP.eucJP/share/xml/navibar.l10n.ent projects/sysctl/ja_JP.eucJP/share/xml/news.xml projects/sysctl/ja_JP.eucJP/share/xml/teams.ent projects/sysctl/mn_MN.UTF-8/books/handbook/firewalls/chapter.xml projects/sysctl/nl_NL.ISO8859-1/books/handbook/disks/chapter.xml projects/sysctl/nl_NL.ISO8859-1/books/handbook/filesystems/chapter.xml projects/sysctl/nl_NL.ISO8859-1/books/handbook/firewalls/chapter.xml projects/sysctl/nl_NL.ISO8859-1/books/handbook/jails/chapter.xml projects/sysctl/nl_NL.ISO8859-1/books/handbook/linuxemu/chapter.xml projects/sysctl/nl_NL.ISO8859-1/books/handbook/serialcomms/chapter.xml projects/sysctl/nl_NL.ISO8859-1/htdocs/administration.xml projects/sysctl/pl_PL.ISO8859-2/books/handbook/firewalls/chapter.xml projects/sysctl/pl_PL.ISO8859-2/books/handbook/install/chapter.xml projects/sysctl/pt_BR.ISO8859-1/books/handbook/mirrors/chapter.xml projects/sysctl/ru_RU.KOI8-R/articles/pam/article.xml projects/sysctl/ru_RU.KOI8-R/articles/vm-design/article.xml projects/sysctl/ru_RU.KOI8-R/books/handbook/book.xml projects/sysctl/ru_RU.KOI8-R/books/porters-handbook/book.xml projects/sysctl/ru_RU.KOI8-R/htdocs/portmgr/index.xml projects/sysctl/ru_RU.KOI8-R/htdocs/releng/index.xml projects/sysctl/ru_RU.KOI8-R/share/xsl/freebsd-xhtml-common.xsl projects/sysctl/share/mk/doc.docbook.mk projects/sysctl/share/pgpkeys/README projects/sysctl/share/pgpkeys/addkey.sh projects/sysctl/share/pgpkeys/gavin.key projects/sysctl/share/pgpkeys/pgpkeys-core.xml projects/sysctl/share/pgpkeys/pgpkeys-developers.xml projects/sysctl/share/pgpkeys/pgpkeys.ent projects/sysctl/share/xml/authors.ent projects/sysctl/share/xml/catalog.xml projects/sysctl/share/xml/events2013.xml projects/sysctl/share/xml/freebsd.ent projects/sysctl/share/xml/freebsd.sch projects/sysctl/share/xml/header.ent projects/sysctl/share/xml/man-refs.ent projects/sysctl/share/xml/mirrors.xml projects/sysctl/share/xml/navibar.ent projects/sysctl/share/xml/news.xml projects/sysctl/share/xml/notices.xml projects/sysctl/share/xml/press.xml projects/sysctl/share/xml/templates.events.xsl projects/sysctl/share/xml/xhtml.xsl projects/sysctl/share/xml/xhtml10-freebsd.dtd projects/sysctl/share/xml/xslt10-freebsd.dtd projects/sysctl/share/xsl/freebsd-xhtml-common.xsl projects/sysctl/zh_CN.GB2312/books/handbook/firewalls/chapter.xml projects/sysctl/zh_CN.GB2312/books/porters-handbook/book.xml projects/sysctl/zh_TW.Big5/books/handbook/firewalls/chapter.xml projects/sysctl/zh_TW.Big5/books/handbook/serialcomms/chapter.xml projects/sysctl/zh_TW.Big5/books/porters-handbook/book.xml Directory Properties: projects/sysctl/Makefile (props changed) projects/sysctl/README (props changed) projects/sysctl/bn_BD.ISO10646-1/ (props changed) projects/sysctl/da_DK.ISO8859-1/ (props changed) projects/sysctl/de_DE.ISO8859-1/ (props changed) projects/sysctl/el_GR.ISO8859-7/ (props changed) projects/sysctl/en_US.ISO8859-1/ (props changed) projects/sysctl/es_ES.ISO8859-1/ (props changed) projects/sysctl/fr_FR.ISO8859-1/ (props changed) projects/sysctl/hu_HU.ISO8859-2/ (props changed) projects/sysctl/it_IT.ISO8859-15/ (props changed) projects/sysctl/ja_JP.eucJP/ (props changed) projects/sysctl/mn_MN.UTF-8/ (props changed) projects/sysctl/nl_NL.ISO8859-1/ (props changed) projects/sysctl/nl_NL.ISO8859-1/share/xml/entities.ent (props changed) projects/sysctl/no_NO.ISO8859-1/ (props changed) projects/sysctl/pl_PL.ISO8859-2/ (props changed) projects/sysctl/pt_BR.ISO8859-1/ (props changed) projects/sysctl/release/ (props changed) projects/sysctl/ru_RU.KOI8-R/ (props changed) projects/sysctl/share/ (props changed) projects/sysctl/sr_YU.ISO8859-2/ (props changed) projects/sysctl/tr_TR.ISO8859-9/ (props changed) projects/sysctl/zh_CN.GB2312/ (props changed) projects/sysctl/zh_TW.Big5/ (props changed) Modified: projects/sysctl/de_DE.ISO8859-1/books/handbook/firewalls/chapter.xml ============================================================================== --- projects/sysctl/de_DE.ISO8859-1/books/handbook/firewalls/chapter.xml Thu Jul 11 03:05:05 2013 (r42243) +++ projects/sysctl/de_DE.ISO8859-1/books/handbook/firewalls/chapter.xml Thu Jul 11 03:06:43 2013 (r42244) @@ -1834,7 +1834,7 @@ block in log first quick on dc0 all Internet: - + Modified: projects/sysctl/de_DE.ISO8859-1/books/porters-handbook/book.xml ============================================================================== --- projects/sysctl/de_DE.ISO8859-1/books/porters-handbook/book.xml Thu Jul 11 03:05:05 2013 (r42243) +++ projects/sysctl/de_DE.ISO8859-1/books/porters-handbook/book.xml Thu Jul 11 03:06:43 2013 (r42244) @@ -6050,6 +6050,7 @@ PLIST_SUB+= NLS="@comment " Nur lesbare Variablen + Bedeutung Modified: projects/sysctl/el_GR.ISO8859-7/books/handbook/firewalls/chapter.xml ============================================================================== --- projects/sysctl/el_GR.ISO8859-7/books/handbook/firewalls/chapter.xml Thu Jul 11 03:05:05 2013 (r42243) +++ projects/sysctl/el_GR.ISO8859-7/books/handbook/firewalls/chapter.xml Thu Jul 11 03:06:43 2013 (r42244) @@ -1823,7 +1823,7 @@ block in log first quick on dc0 all Internet: - + Modified: projects/sysctl/el_GR.ISO8859-7/share/xml/trademarks.ent ============================================================================== --- projects/sysctl/el_GR.ISO8859-7/share/xml/trademarks.ent Thu Jul 11 03:05:05 2013 (r42243) +++ projects/sysctl/el_GR.ISO8859-7/share/xml/trademarks.ent Thu Jul 11 03:06:43 2013 (r42244) @@ -438,7 +438,7 @@ Coverity, Inc."> ένα από τα σύμβολα: ™ ή ®."> + Η διανομή και χρήση σε μορφή πηγαίου κώδικα (SGML DocBook) ή σε "μεταγλωττισμένη" μορφή (SGML, HTML, PDF, PostScript, RTF κοκ) με ή χωρίς αλλαγές, επιτρέπεται εφόσον οι παρακάτω προϋποθέσεις Modified: projects/sysctl/en_US.ISO8859-1/articles/committers-guide/article.xml ============================================================================== --- projects/sysctl/en_US.ISO8859-1/articles/committers-guide/article.xml Thu Jul 11 03:05:05 2013 (r42243) +++ projects/sysctl/en_US.ISO8859-1/articles/committers-guide/article.xml Thu Jul 11 03:06:43 2013 (r42244) @@ -26,7 +26,7 @@ 2011 2012 2013 - The FreeBSD Documentation Project + The &os; Documentation Project @@ -43,12 +43,12 @@ $FreeBSD$ - This document provides information for the FreeBSD + This document provides information for the &os; committer community. All new committers should read this document before they start, and existing committers are strongly encouraged to review it from time to time. - Almost all FreeBSD developers have commit rights to one or + Almost all &os; developers have commit rights to one or more repositories. However, a few developers do not, and some of the information here applies to them as well. (For instance, some people only have rights to work with the @@ -56,7 +56,7 @@ linkend="non-committers"/> for more information. This document may also be of interest to members of the - FreeBSD community who want to learn more about how the project + &os; community who want to learn more about how the project works. @@ -83,32 +83,32 @@ src/ Subversion Root - - svn+ssh://svn+ssh://svn.FreeBSD.org/base - (see also ). + (see also ). + doc/ Subversion Root - - svn+ssh://svn+ssh://svn.FreeBSD.org/doc - (see also ). + (see also ). ports/ Subversion Root - - svn+ssh://svn+ssh://svn.FreeBSD.org/ports - (see also ). + (see also ). Internal Mailing Lists - developers (technically called all-developers), doc-developers, doc-committers, ports-developers, ports-committers, src-developers, src-committers. (Each @@ -128,8 +128,7 @@ reports /home/core/public/monthly-reports on the FreeBSD.org - cluster. - + cluster. @@ -143,46 +142,47 @@ Noteworthy src/ SVN Branches - stable/8 (8.X-STABLE), stable/9 (9.X-STABLE), - head (-CURRENT) - + head (-CURRENT) - It is required that you use &man.ssh.1; - to connect to the project hosts. - If you do - not know anything about &man.ssh.1;, please see - . + &man.ssh.1; is required to connect to the project hosts. + For more information, see . Useful links: - FreeBSD - Project Internal Pages + + &os; + Project Internal Pages + - FreeBSD Project - Hosts - - FreeBSD Project - Administrative Groups + + &os; Project + Hosts + + + + &os; Project + Administrative Groups + Commit Bit Types - The FreeBSD repository has a number of components which, + The &os; repository has a number of components which, when combined, support the basic operating system source, documentation, third party application ports infrastructure, and - various maintained utilities. When FreeBSD commit bits are + various maintained utilities. When &os; commit bits are allocated, the areas of the tree where the bit may be used are specified. Generally, the areas associated with a bit reflect who authorized the allocation of the commit bit. Additional @@ -237,34 +237,40 @@ of the tree where the work is occurring. - Policy for <filename>doc/</filename> committer activity - in <filename>src/</filename> + Policy for <filename>doc/</filename> Committer Activity + in <filename>src/</filename> - doc committers may commit documentation - changes to src files, such as man pages, READMEs, fortune - databases, calendar files, and comment fixes without - approval from a src committer, subject to the normal care - and tending of commits. - - doc committers may commit minor src changes - and fixes, such as build fixes, small features, etc, with an - "Approved by" from a src committer. - - doc committers may seek an upgrade to a src - commit bit by acquiring a mentor, who will propose the doc - committer to core. When approved, they will be added to - 'access' and the normal mentoring period will ensue, which - will involve a continuing of Approved by for - some period. - - "Approved by" is only acceptable from - non-mentored src committers -- mentored committers can - provide a "Reviewed by" but not an "Approved - by". + + doc committers may commit documentation changes to src + files, such as man pages, READMEs, fortune databases, + calendar files, and comment fixes without approval from a + src committer, subject to the normal care and tending of + commits. + + + + doc committers may commit minor src changes and fixes, + such as build fixes, small features, etc, with an + "Approved by" from a src committer. + + + + doc committers may seek an upgrade to a src commit bit + by acquiring a mentor, who will propose the doc committer + to core. When approved, they will be added to 'access' + and the normal mentoring period will ensue, which will + involve a continuing of Approved by for + some period. + + + + "Approved by" is only acceptable from non-mentored src + committers -- mentored committers can provide a "Reviewed + by" but not an "Approved by". + - @@ -274,13 +280,13 @@ operation of the version control systems in use. Traditionally this was CVS. Subversion is used for the src tree as of May 2008, the doc/www tree as of - May 2012 and the ports tree as of July 2012. - + May 2012 and the ports tree as of July + 2012. There - is a list of things missing in Subversion when compared to CVS - . The notes at + is a list of things missing in Subversion when compared to + CVS. The notes at might also be useful. @@ -336,30 +342,37 @@ Commits are atomic. + Revision numbers apply across the repository—all files that were modified in the same commit have the same revision number. + Branching and tagging are namespace operations. + Directories are versioned. + Files and directories can have arbitrary, versioned metadata attached to them. + Files and directories can be copied, with full history tracking. + No more contortions due to CVS weakness such as applying &man.patch.1; files at compile time in order to avoid touching vendor branch code. + No more repo-copies. @@ -378,7 +391,7 @@ There are a few ways to obtain a working copy of the tree from Subversion. This section will explain them. - + Direct Checkout The first is to check out directly from the main @@ -445,7 +458,7 @@ - + Checkout from a Mirror Check out a working copy from a mirror by @@ -455,13 +468,14 @@ using svnsync. There is a serious disadvantage to this method: every - time something is to be committed, a svn switch - --relocate to the master repository has to be - done, remembering to svn switch back to - the mirror after the commit. Also, since svn - switch only works between repositories that have - the same UUID, some hacking of the local repository's UUID - has to occur before it is possible to start using it. + time something is to be committed, a + svn relocate to the master repository has + to be done, remembering to svn relocate + back to the mirror after the commit. Also, since + svn relocate only works between + repositories that have the same UUID, some hacking of the + local repository's UUID has to occur before it is possible + to start using it. Unlike with CVS, the hassle of a local @@ -471,7 +485,7 @@ information on how to set one up. - + <literal>RELENG_*</literal> Branches and General Layout @@ -489,26 +503,29 @@ - /head/ - which corresponds to HEAD, also known as - -CURRENT. - + /head/ which corresponds to + HEAD, also known as + -CURRENT. + /stable/n which corresponds to RELENG_n. + /releng/n.n which corresponds to RELENG_n_n. + /release/n.n.n which corresponds to RELENG_n_n_n_RELEASE. + /vendor* is the vendor branch import work area. This directory itself does not @@ -517,6 +534,7 @@ releng and release directories. + /projects and /user feature a branch work area, @@ -527,21 +545,21 @@ - + &os; Documentation Project Branches and Layout In svn+ssh://svn.freebsd.org/doc, - doc refers repository root of the - source tree. + doc refers to the repository root of + the source tree. In general, most &os; Documentation Project work will be done within the head/ branch of the - source tree. + documentation source tree. &os; documentation is written and/or translated to - various languages, each of which within a separate - directory within the head/ + various languages, each in a separate + directory in the head/ branch. Each translation set contains several subdirectories for @@ -554,11 +572,13 @@ code for articles written by various &os; contributors. + /books/ contains the source code for the different books, such as the &os; Handbook. + /htdocs/ contains the source code for the &os; website. @@ -566,7 +586,7 @@ - + &os; Ports Tree Branches and Layout In svn+ssh://svn.freebsd.org/ports, @@ -580,17 +600,20 @@ - /branches/RELENG_n_n_n - which corresponds to - RELENG_n_n_n + /branches/RELENG_n_n_n + which corresponds to + RELENG_n_n_n is used to merge back security updates in preparation for a release. + /tags/RELEASE_n_n_n - which corresponds to RELEASE_n_n_n + which corresponds to + RELEASE_n_n_n represents a release tag of the ports tree. + /tags/RELEASE_n_EOL represents the end of life tag of a specific &os; @@ -606,21 +629,20 @@ This section will explain how to perform common day-to-day operations with Subversion. - + Help - SVN - has built in help documentation. It can be accessed by - typing the following command: + SVN has built in help documentation. + It can be accessed by typing the following command: &prompt.user; svn help - Additional information can be found in the - Subversion Book. + Additional information can be found in the + Subversion + Book. - + Checkout As seen earlier, to check out the &os; head @@ -683,7 +705,7 @@ - + Anonymous Checkout It is possible to anonymously check out the &os; @@ -699,7 +721,7 @@ mirror sites. - + Updating the Tree To update a working copy to either the latest revision, @@ -709,7 +731,7 @@ &prompt.user; svn update -r12345 - + Status To view the local changes that have been made to the @@ -717,17 +739,17 @@ &prompt.user; svn status - To show local changes and files that are out-of-date do: + To show local changes and files that are out-of-date + do: &prompt.user; svn status --show-updates - + Editing and Committing - Unlike Perforce, - SVN does not - need to be told in advance about file editing. + Unlike Perforce, SVN does not need to + be told in advance about file editing. svn commit works like the equivalent CVS command. To commit all changes in @@ -743,15 +765,15 @@ &prompt.user; svn commit lib/libfetch usr/bin/fetch - There is also a commit wrapper for the ports tree - to handle the properties and sanity checking your + There is also a commit wrapper for the ports tree to + handle the properties and sanity checking your changes: &prompt.user; /usr/ports/Tools/scripts/psvn commit - + Adding and Removing Files @@ -762,13 +784,12 @@ ports tree specific version) and add it to ~/.subversion/config according to the instructions in the file. If you added - something before you've read this, you may use + something before reading this, use svn rm --keep-local for just added files, fix your config file and re-add them again. The initial config file is created when you first run a svn - command, even something as simple as svn - help. - + command, even something as simple as + svn help. Files are added to a @@ -778,85 +799,88 @@ &prompt.user; svn add foo + + Most new source files should include a + $&os;$ string in the + new file. On commit, svn will expand + the $&os;$ string, + adding the file path, revision number, date and time of + commit, and the username of the committer. Files which + cannot be modified may be committed without the + $&os;$ string. + + Files can be removed with svn remove: &prompt.user; svn remove foo - Subversion does not require rming the - file before svn rming it, and indeed - complains if that happens. + Subversion does not require deleting the file before + using svn rm, and indeed complains if + that happens. - It is possible to add directories with svn - add: + It is possible to add directories with + svn add: &prompt.user; mkdir bar &prompt.user; svn add bar - Although svn mkdir makes this - easier by combining the creation of the directory and the - adding of it: + Although svn mkdir makes this easier + by combining the creation of the directory and the adding of + it: &prompt.user; svn mkdir bar - The directory is not immediately - created in the repository when you use svn - mkdir. Subversion - allows directories to be removed using svn - rm, however there is no svn - rmdir: + Like files, directories are removed with + svn rm. There is no separate command + specifically for removing directories. &prompt.user; svn rm bar - + Copying and Moving Files - The following (obviously) creates a copy of - foo.c, named - bar.c: + This command creates a copy of + foo.c named bar.c, + with the new file also under version control: &prompt.user; svn copy foo.c bar.c - To move and rename a file: + The example above is equivalent to: - &prompt.user; svn move foo.c bar.c + &prompt.user; cp foo.c bar.c +&prompt.user; svn add bar.c - The above command is the exact equivalent of: + To move and rename a file: - &prompt.user; svn copy foo.c bar.c -&prompt.user; svn remove foo.c + &prompt.user; svn move foo.c bar.c - + Log and Annotate - svn log will show all the - revisions that affect a directory and files within that - directory in reverse chronological order, if run on a - directory. This contrasts with cvs log - in that CVS shows the complete log for - each file in the directory, including duplicate entries for - revisions that affect multiple files. + svn log shows revisions and commit + messages, most recent first, for files or directories. When + used on a directory, all revisions that affected the + directory and files within that directory are shown. svn annotate, or equally svn - praise or svn blame, is - equivalent to cvs annotate in everything - but output format. + praise or svn blame, shows + the most recent revision number and who committed that + revision for each line of a file. - + Diffs svn diff displays changes to the - working copy of the repository. Diffs generated by - SVN are unified - and include new files by default - in the diff output. - - svn - diff can show the changes between two revisions - of the same file: + working copy. Diffs generated by SVN are + unified and include new files by default in the diff + output. + + svn diff can show the changes between + two revisions of the same file: &prompt.user; svn diff -r179453:179454 ROADMAP.txt @@ -868,20 +892,19 @@ &prompt.user; svn diff -c179454 . - + Reverting Local changes (including additions and deletions) can be - reverted using svn revert. - It does not update out-of-date - files—it just replaces them with pristine copies of - the original version. + reverted using svn revert. It does not + update out-of-date files, but just replaces them with + pristine copies of the original version. - + Conflicts - If a svn update resulted in a merge + If an svn update resulted in a merge conflict, Subversion will remember which files have conflicts and refuse to commit any changes to those files until explicitly told that the conflicts have been resolved. @@ -903,22 +926,26 @@ working directory (which one presumes has been edited to resolve the conflicts). + base: use a pristine copy of the version you had before svn update, discarding your own changes, the conflicting changes, and possibly other intervening changes as well. + mine-full: use what you had before svn update, including your own changes, but discarding the conflicting changes, and possibly other intervening changes as well. + theirs-full: use the version that - was retrieved when you did svn - update, discarding your own changes. + was retrieved when you did + svn update, discarding your own + changes. @@ -927,27 +954,15 @@ Advanced Use - + Sparse Checkouts - The equivalent to cvs checkout -l, - which checks out a directory without its subdirectories, is - svn checkout -N. Unlike - CVS, SVN remembers the - -N so that a svn - update does not end up pulling down the - subdirectories. In Subversion 1.5 and newer, - -N has been deprecated in favour of the - --depth option which allows for precise - control. Therefore: - - &prompt.user; svn checkout -N svn+ssh://svn.freebsd.org/base ~/freebsd - - is equivalent to: + SVN allows + sparse, or partial checkouts of a + directory by adding to a + svn checkout. - &prompt.user; svn checkout --depth=empty svn+ssh://svn.freebsd.org/base ~/freebsd - - Valid arguments to --depth + Valid arguments to are: @@ -955,15 +970,18 @@ empty: the directory itself without any of its contents. + files: the directory and any files it contains. + immediates: the directory and any files and directories it contains, but none of the subdirectories' contents. + infinity: anything. @@ -988,39 +1006,44 @@ ROADMAP.txt and empty subdirectories, and nothing will happen when svn update is executed on the subdirectories. However, the following - command will set the depth for head (in this case) to - infinity, and fully populate it: + command will set the depth for + head (in this case) to infinity, + and fully populate it: &prompt.user; svn update --set-depth=infinity head - + Direct Operation Certain operations can be performed directly on the - repository, without touching the working copy. - Specifically, this applies to any operation that does not - require editing a file, including: + repository without touching the working copy. Specifically, + this applies to any operation that does not require editing + a file, including: log, - diff. + diff + - mkdir. + mkdir + remove, copy, - rename. + rename + propset, propedit, - propdel. + propdel + - merge. + merge @@ -1029,8 +1052,8 @@ &prompt.user; svn copy svn+ssh://svn.freebsd.org/base/head svn+ssh://svn.freebsd.org/base/stable/8 - This is equivalent to the following set of - commands which take minutes and hours as opposed to seconds, + This is equivalent to the following set of commands + which take minutes and hours as opposed to seconds, depending on your network connection: &prompt.user; svn checkout --depth=immediates svn+ssh://svn.freebsd.org/base @@ -1040,7 +1063,7 @@ &prompt.user; svn commit stable/8 - + Merging with <acronym>SVN</acronym> This section deals with merging code from one branch to @@ -1067,37 +1090,39 @@ It is not inherited. For instance, stable/6/contrib/openpam/ - does not implicitly inherit mergeinfo from stable/6/, or stable/6/contrib/. Doing - so would make partial checkouts very hard to manage. + class="directory">stable/6/contrib/openpam/ + does not implicitly inherit mergeinfo from + stable/6/, or + stable/6/contrib/. + Doing so would make partial checkouts very hard to manage. Instead, mergeinfo is explicitly propagated down the tree. - For merging something into branch/foo/bar/, the - following rules apply: + For merging something into + branch/foo/bar/, + the following rules apply: - If branch/foo/bar/ doesn't - already have a mergeinfo record, but a direct ancestor - (for instance, branch/foo/) does, - then that record will be propagated down to + If + branch/foo/bar/ + does not already have a mergeinfo record, but a direct + ancestor (for instance, + branch/foo/) + does, then that record will be propagated down to branch/foo/bar/ - before information - about the current merge is recorded. + before information about the current merge is + recorded. + Information about the current merge will not be propagated back up that ancestor. + - If a direct descendant of branch/foo/bar/ (for - instance, If a direct descendant of + branch/foo/bar/ + (for instance, branch/foo/bar/baz/) already has a mergeinfo record, information about the current merge will be propagated down to it. @@ -1132,43 +1157,51 @@ Never merge directly to a file. + Never, ever merge directly to a file. + Never, ever, ever merge directly to a file. + Changes to kernel code should be merged to sys/. For instance, a change to the &man.ichwd.4; driver should - be merged to sys/, not sys/dev/ichwd/. + be merged to *** DIFF OUTPUT TRUNCATED AT 1000 LINES ***