From owner-svn-doc-projects@FreeBSD.ORG Wed Feb 26 04:16:31 2014 Return-Path: Delivered-To: svn-doc-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 5025A109; Wed, 26 Feb 2014 04:16:31 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 3510116DC; Wed, 26 Feb 2014 04:16:31 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s1Q4GV97093560; Wed, 26 Feb 2014 04:16:31 GMT (envelope-from gjb@svn.freebsd.org) Received: (from gjb@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s1Q4GSmB093539; Wed, 26 Feb 2014 04:16:28 GMT (envelope-from gjb@svn.freebsd.org) Message-Id: <201402260416.s1Q4GSmB093539@svn.freebsd.org> From: Glen Barber Date: Wed, 26 Feb 2014 04:16:27 +0000 (UTC) To: doc-committers@freebsd.org, svn-doc-projects@freebsd.org Subject: svn commit: r44072 - in projects/relnotes-restructure: en_US.ISO8859-1/articles/committers-guide en_US.ISO8859-1/articles/contributors en_US.ISO8859-1/articles/nanobsd en_US.ISO8859-1/books/faq en_... 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.17 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: Wed, 26 Feb 2014 04:16:31 -0000 Author: gjb Date: Wed Feb 26 04:16:27 2014 New Revision: 44072 URL: http://svnweb.freebsd.org/changeset/doc/44072 Log: MFH up to r44071. Pull mergeinfo to top-level directory. Approved by: doceng (implicit) Sponsored by: The FreeBSD Foundation Added: projects/relnotes-restructure/ru_RU.KOI8-R/books/porters-handbook/appendices/ - copied from r44071, head/ru_RU.KOI8-R/books/porters-handbook/appendices/ projects/relnotes-restructure/ru_RU.KOI8-R/books/porters-handbook/chapters.ent - copied unchanged from r44071, head/ru_RU.KOI8-R/books/porters-handbook/chapters.ent projects/relnotes-restructure/ru_RU.KOI8-R/books/porters-handbook/keeping-up/ - copied from r44071, head/ru_RU.KOI8-R/books/porters-handbook/keeping-up/ projects/relnotes-restructure/ru_RU.KOI8-R/books/porters-handbook/makefiles/ - copied from r44071, head/ru_RU.KOI8-R/books/porters-handbook/makefiles/ projects/relnotes-restructure/ru_RU.KOI8-R/books/porters-handbook/new-port/ - copied from r44071, head/ru_RU.KOI8-R/books/porters-handbook/new-port/ projects/relnotes-restructure/ru_RU.KOI8-R/books/porters-handbook/pkg-files/ - copied from r44071, head/ru_RU.KOI8-R/books/porters-handbook/pkg-files/ projects/relnotes-restructure/ru_RU.KOI8-R/books/porters-handbook/plist/ - copied from r44071, head/ru_RU.KOI8-R/books/porters-handbook/plist/ projects/relnotes-restructure/ru_RU.KOI8-R/books/porters-handbook/porting-dads/ - copied from r44071, head/ru_RU.KOI8-R/books/porters-handbook/porting-dads/ projects/relnotes-restructure/ru_RU.KOI8-R/books/porters-handbook/porting-samplem/ - copied from r44071, head/ru_RU.KOI8-R/books/porters-handbook/porting-samplem/ projects/relnotes-restructure/ru_RU.KOI8-R/books/porters-handbook/porting-why/ - copied from r44071, head/ru_RU.KOI8-R/books/porters-handbook/porting-why/ projects/relnotes-restructure/ru_RU.KOI8-R/books/porters-handbook/quick-porting/ - copied from r44071, head/ru_RU.KOI8-R/books/porters-handbook/quick-porting/ projects/relnotes-restructure/ru_RU.KOI8-R/books/porters-handbook/security/ - copied from r44071, head/ru_RU.KOI8-R/books/porters-handbook/security/ projects/relnotes-restructure/ru_RU.KOI8-R/books/porters-handbook/slow-porting/ - copied from r44071, head/ru_RU.KOI8-R/books/porters-handbook/slow-porting/ projects/relnotes-restructure/ru_RU.KOI8-R/books/porters-handbook/special/ - copied from r44071, head/ru_RU.KOI8-R/books/porters-handbook/special/ projects/relnotes-restructure/ru_RU.KOI8-R/books/porters-handbook/testing/ - copied from r44071, head/ru_RU.KOI8-R/books/porters-handbook/testing/ projects/relnotes-restructure/ru_RU.KOI8-R/books/porters-handbook/upgrading/ - copied from r44071, head/ru_RU.KOI8-R/books/porters-handbook/upgrading/ projects/relnotes-restructure/share/pgpkeys/truckman.key - copied unchanged from r44071, head/share/pgpkeys/truckman.key Modified: projects/relnotes-restructure/en_US.ISO8859-1/articles/committers-guide/article.xml projects/relnotes-restructure/en_US.ISO8859-1/articles/contributors/contrib.develinmemoriam.xml projects/relnotes-restructure/en_US.ISO8859-1/articles/nanobsd/article.xml projects/relnotes-restructure/en_US.ISO8859-1/books/faq/book.xml projects/relnotes-restructure/en_US.ISO8859-1/books/fdp-primer/doc-build/chapter.xml projects/relnotes-restructure/en_US.ISO8859-1/books/fdp-primer/docbook-markup/chapter.xml projects/relnotes-restructure/en_US.ISO8859-1/books/fdp-primer/editor-config/chapter.xml projects/relnotes-restructure/en_US.ISO8859-1/books/fdp-primer/examples/appendix.xml projects/relnotes-restructure/en_US.ISO8859-1/books/fdp-primer/overview/chapter.xml projects/relnotes-restructure/en_US.ISO8859-1/books/fdp-primer/structure/chapter.xml projects/relnotes-restructure/en_US.ISO8859-1/books/fdp-primer/the-website/chapter.xml projects/relnotes-restructure/en_US.ISO8859-1/books/fdp-primer/translations/chapter.xml projects/relnotes-restructure/en_US.ISO8859-1/books/fdp-primer/working-copy/chapter.xml projects/relnotes-restructure/en_US.ISO8859-1/books/fdp-primer/xml-primer/chapter.xml projects/relnotes-restructure/en_US.ISO8859-1/books/handbook/advanced-networking/chapter.xml projects/relnotes-restructure/en_US.ISO8859-1/books/handbook/bsdinstall/chapter.xml projects/relnotes-restructure/en_US.ISO8859-1/books/handbook/cutting-edge/chapter.xml projects/relnotes-restructure/en_US.ISO8859-1/books/handbook/disks/chapter.xml projects/relnotes-restructure/en_US.ISO8859-1/books/handbook/firewalls/chapter.xml projects/relnotes-restructure/en_US.ISO8859-1/books/handbook/mirrors/chapter.xml projects/relnotes-restructure/en_US.ISO8859-1/books/handbook/ports/chapter.xml projects/relnotes-restructure/en_US.ISO8859-1/books/porters-handbook/makefiles/chapter.xml projects/relnotes-restructure/en_US.ISO8859-1/books/porters-handbook/plist/chapter.xml projects/relnotes-restructure/en_US.ISO8859-1/books/porters-handbook/quick-porting/chapter.xml projects/relnotes-restructure/en_US.ISO8859-1/books/porters-handbook/security/chapter.xml projects/relnotes-restructure/en_US.ISO8859-1/books/porters-handbook/slow-porting/chapter.xml projects/relnotes-restructure/en_US.ISO8859-1/books/porters-handbook/special/chapter.xml projects/relnotes-restructure/en_US.ISO8859-1/books/porters-handbook/testing/chapter.xml projects/relnotes-restructure/en_US.ISO8859-1/books/porters-handbook/uses.xml projects/relnotes-restructure/en_US.ISO8859-1/books/porters-handbook/versions.xml projects/relnotes-restructure/en_US.ISO8859-1/htdocs/cgi/man.cgi projects/relnotes-restructure/en_US.ISO8859-1/htdocs/developers/cvs.xml projects/relnotes-restructure/en_US.ISO8859-1/htdocs/docs/books.xml projects/relnotes-restructure/en_US.ISO8859-1/htdocs/donations/donors.xml projects/relnotes-restructure/en_US.ISO8859-1/htdocs/features.xml projects/relnotes-restructure/en_US.ISO8859-1/htdocs/releases/Makefile projects/relnotes-restructure/en_US.ISO8859-1/htdocs/releases/index.xml projects/relnotes-restructure/fr_FR.ISO8859-1/share/xml/l10n.ent projects/relnotes-restructure/ja_JP.eucJP/articles/contributors/Makefile projects/relnotes-restructure/ja_JP.eucJP/articles/contributors/article.xml projects/relnotes-restructure/ja_JP.eucJP/books/fdp-primer/psgml-mode/chapter.xml projects/relnotes-restructure/ja_JP.eucJP/books/handbook/cutting-edge/chapter.xml projects/relnotes-restructure/ja_JP.eucJP/books/handbook/mirrors/chapter.xml projects/relnotes-restructure/ja_JP.eucJP/books/handbook/ports/chapter.xml projects/relnotes-restructure/ja_JP.eucJP/books/handbook/preface/preface.xml projects/relnotes-restructure/ja_JP.eucJP/htdocs/developers/cvs.xml projects/relnotes-restructure/ja_JP.eucJP/htdocs/docs/books.xml projects/relnotes-restructure/ja_JP.eucJP/htdocs/ports/installing.xml projects/relnotes-restructure/ja_JP.eucJP/share/xml/libcommon.xsl projects/relnotes-restructure/ru_RU.KOI8-R/books/porters-handbook/Makefile projects/relnotes-restructure/ru_RU.KOI8-R/books/porters-handbook/book.xml projects/relnotes-restructure/ru_RU.KOI8-R/books/porters-handbook/uses.xml projects/relnotes-restructure/ru_RU.KOI8-R/books/porters-handbook/versions.xml projects/relnotes-restructure/ru_RU.KOI8-R/htdocs/releases/index.xml projects/relnotes-restructure/ru_RU.KOI8-R/share/xml/l10n.ent projects/relnotes-restructure/share/misc/docbook.css projects/relnotes-restructure/share/pgpkeys/lioux.key projects/relnotes-restructure/share/pgpkeys/pgpkeys-developers.xml projects/relnotes-restructure/share/pgpkeys/pgpkeys.ent projects/relnotes-restructure/share/tools/webupdate (contents, props changed) projects/relnotes-restructure/share/tools/webupdate.wrapper projects/relnotes-restructure/share/xml/commercial.consult.xml projects/relnotes-restructure/share/xml/commercial.isp.xml projects/relnotes-restructure/share/xml/libcommon.xsl projects/relnotes-restructure/share/xml/man-refs.ent projects/relnotes-restructure/share/xml/mirrors.xml Directory Properties: projects/relnotes-restructure/ (props changed) projects/relnotes-restructure/en_US.ISO8859-1/ (props changed) projects/relnotes-restructure/fr_FR.ISO8859-1/ (props changed) projects/relnotes-restructure/ja_JP.eucJP/ (props changed) projects/relnotes-restructure/ru_RU.KOI8-R/ (props changed) projects/relnotes-restructure/share/ (props changed) Modified: projects/relnotes-restructure/en_US.ISO8859-1/articles/committers-guide/article.xml ============================================================================== --- projects/relnotes-restructure/en_US.ISO8859-1/articles/committers-guide/article.xml Wed Feb 26 04:13:22 2014 (r44071) +++ projects/relnotes-restructure/en_US.ISO8859-1/articles/committers-guide/article.xml Wed Feb 26 04:16:27 2014 (r44072) @@ -446,18 +446,6 @@ You need a Passphrase to protect your se The first real SVN commit is r300894. - There are mechanisms in place to automatically merge - changes back from the Subversion src - repository to the CVS repository for - some &os; branches (releng/6 through - releng/9), however this is purely to - support pre-existing end-user installs and should not be - relied upon, recommended or advertised. Future branches - will not be exported to CVS at all. The - ports repository was exported to CVS - for a period of time to aid end user migration, but as of - 28th February 2013 is no longer exported. - Subversion is not that different from CVS when it comes to daily use, but there are differences. Subversion has a number of features that @@ -2118,9 +2106,6 @@ U stable/9/share/man/man4/netmap.4 In commit logs etc., rev 179872 should be spelled r179872 as per convention. - Do not remove and re-add the same file in a single commit - as this will break the CVS exporter. - Speeding up svn is possible by adding the following to ~/.ssh/config: Modified: projects/relnotes-restructure/en_US.ISO8859-1/articles/contributors/contrib.develinmemoriam.xml ============================================================================== --- projects/relnotes-restructure/en_US.ISO8859-1/articles/contributors/contrib.develinmemoriam.xml Wed Feb 26 04:13:22 2014 (r44071) +++ projects/relnotes-restructure/en_US.ISO8859-1/articles/contributors/contrib.develinmemoriam.xml Wed Feb 26 04:16:27 2014 (r44072) @@ -40,7 +40,7 @@ &a.itojun.email; (1997 - 2001; RIP 2008) Known to everyone as itojun, - Jun-ichiro Hagino was was a core researcher at the + Jun-ichiro Hagino was a core researcher at the KAME Project, which aimed to provide IPv6 and IPsec technology in freely redistributable form. Much of this code was incorporated Modified: projects/relnotes-restructure/en_US.ISO8859-1/articles/nanobsd/article.xml ============================================================================== --- projects/relnotes-restructure/en_US.ISO8859-1/articles/nanobsd/article.xml Wed Feb 26 04:13:22 2014 (r44071) +++ projects/relnotes-restructure/en_US.ISO8859-1/articles/nanobsd/article.xml Wed Feb 26 04:16:27 2014 (r44072) @@ -350,37 +350,36 @@ NANO_KERNEL=MYKERNEL NANO_IMAGES=2 CONF_BUILD=' -NO_KLDLOAD=YES -NO_NETGRAPH=YES -NO_PAM=YES +WITHOUT_KLDLOAD=YES +WITHOUT_NETGRAPH=YES +WITHOUT_PAM=YES ' CONF_INSTALL=' -NO_ACPI=YES -NO_BLUETOOTH=YES -NO_CVS=YES -NO_FORTRAN=YES -NO_HTML=YES -NO_LPR=YES -NO_MAN=YES -NO_SENDMAIL=YES -NO_SHAREDOCS=YES -NO_EXAMPLES=YES -NO_INSTALLLIB=YES -NO_CALENDAR=YES -NO_MISC=YES -NO_SHARE=YES +WITHOUT_ACPI=YES +WITHOUT_BLUETOOTH=YES +WITHOUT_FORTRAN=YES +WITHOUT_HTML=YES +WITHOUT_LPR=YES +WITHOUT_MAN=YES +WITHOUT_SENDMAIL=YES +WITHOUT_SHAREDOCS=YES +WITHOUT_EXAMPLES=YES +WITHOUT_INSTALLLIB=YES +WITHOUT_CALENDAR=YES +WITHOUT_MISC=YES +WITHOUT_SHARE=YES ' CONF_WORLD=' -NO_BIND=YES -NO_MODULES=YES -NO_KERBEROS=YES -NO_GAMES=YES -NO_RESCUE=YES -NO_LOCALES=YES -NO_SYSCONS=YES -NO_INFO=YES +WITHOUT_BIND=YES +WITHOUT_MODULES=YES +WITHOUT_KERBEROS=YES +WITHOUT_GAMES=YES +WITHOUT_RESCUE=YES +WITHOUT_LOCALES=YES +WITHOUT_SYSCONS=YES +WITHOUT_INFO=YES ' FlashDevice SanDisk 1G Modified: projects/relnotes-restructure/en_US.ISO8859-1/books/faq/book.xml ============================================================================== --- projects/relnotes-restructure/en_US.ISO8859-1/books/faq/book.xml Wed Feb 26 04:13:22 2014 (r44071) +++ projects/relnotes-restructure/en_US.ISO8859-1/books/faq/book.xml Wed Feb 26 04:16:27 2014 (r44072) @@ -2,25 +2,26 @@ - -10-CURRENT"> -X"> + +11-CURRENT"> +X"> head/"> - -X"> -9-STABLE"> -stable/9/"> - - -X"> -8-STABLE"> -stable/8/"> - - +X"> +10-STABLE"> +stable/10/"> + +X"> +9-STABLE"> +stable/9/"> + +X"> +8-STABLE"> +stable/8/"> + ]> Frequently Asked Questions for &os; - &rel2.relx;, &rel.relx; and &rel.head.relx; + &rel3.relx;, &rel2.relx; and &rel.relx; The &os; Documentation Project @@ -45,6 +46,7 @@ 2011 2012 2013 + 2014 The &os; Documentation Project @@ -68,7 +70,7 @@ $FreeBSD$ - This is the FAQ for &os; versions &rel2.relx; and + This is the FAQ for &os; versions &rel3.relx;, &rel2.relx; and &rel.relx;. Every effort has been made to make this FAQ as informative as possible; if you have any suggestions as to how it may be improved, please feel free to mail them to the @@ -2381,7 +2383,7 @@ kern.timecounter.hardware: TSC -> i82 periodic updates on new entries. Most ports should work on the - &rel2.relx;, and &rel.relx; branches. + &rel3.relx;, &rel2.relx;, and &rel.relx; branches. Each time a &os; release is made, a snapshot of the ports tree at the time of release in also included in the ports/ @@ -2395,40 +2397,13 @@ kern.timecounter.hardware: TSC -> i82 to know the gory details of which files it includes. Use - &man.pkg.add.1; on the specific package files + &man.pkg.7; on the specific package files you are interested in installing. Package files can usually - be identified by their .tbz suffix and + be identified by their .txz suffix and CD-ROM distribution people will have a packages/All directory on their CD which contains such files. They can also be downloaded over - the net for various versions of &os; at the following - locations: - - - - for &rel2.relx; -RELEASE/&rel2.stable; - - - ftp://ftp.FreeBSD.org/pub/FreeBSD/ports/i386/&rel2.packages; - - - - - for &rel.relx; -RELEASE/&rel.stable; - - - ftp://ftp.FreeBSD.org/pub/FreeBSD/ports/i386/&rel.packages; - - - - - or your nearest local mirror site. - - Note that all ports may not be available as packages - since new ones are constantly being added. It is always a - good idea to check back periodically to see which packages - are available at the ftp.FreeBSD.org - master site. + the net for various versions of &os;. @@ -7653,6 +7628,11 @@ hint.sio.7.irq="12" + &rel3.releng; AKA + &rel3.stable; + + + &rel2.releng; AKA &rel2.stable; Modified: projects/relnotes-restructure/en_US.ISO8859-1/books/fdp-primer/doc-build/chapter.xml ============================================================================== --- projects/relnotes-restructure/en_US.ISO8859-1/books/fdp-primer/doc-build/chapter.xml Wed Feb 26 04:13:22 2014 (r44071) +++ projects/relnotes-restructure/en_US.ISO8859-1/books/fdp-primer/doc-build/chapter.xml Wed Feb 26 04:16:27 2014 (r44072) @@ -92,7 +92,7 @@ Make includes are the glue that perform the document production, and are usually of the form - doc.xxx.mk. + doc.xxx.mk. @@ -338,9 +338,9 @@ PRI_LANG?= en_US.ISO8859-1 Targets and Macros Dependencies are described by - target: - dependency1 dependency2 - ... tuples, where to build + target: + dependency1 dependency2 + ... tuples, where to build target, the given dependencies must be built first. Modified: projects/relnotes-restructure/en_US.ISO8859-1/books/fdp-primer/docbook-markup/chapter.xml ============================================================================== --- projects/relnotes-restructure/en_US.ISO8859-1/books/fdp-primer/docbook-markup/chapter.xml Wed Feb 26 04:13:22 2014 (r44071) +++ projects/relnotes-restructure/en_US.ISO8859-1/books/fdp-primer/docbook-markup/chapter.xml Wed Feb 26 04:16:27 2014 (r44072) @@ -196,7 +196,7 @@ - &man.command.sectionnumber; + &man.command.sectionnumber; link to command manual page in section @@ -232,7 +232,7 @@ - &a.listname; + &a.listname; link to listname Entities are defined for all the - &url.books.bookname; + &url.books.bookname; relative path to bookname Entities are defined for all the - &url.articles.articlename; + &url.articles.articlename; relative path to articlename Entities are defined for all the general entities have been created to make this easier. Each entity takes the form - &man.manual-page.manual-section;. + &man.manual-page.manual-section;. The file that contains these entities is in doc/share/xml/man-refs.ent, and can be @@ -1497,7 +1497,7 @@ This is the file called 'foo2' When referring to the same command multiple times in close proximity, it is preferred to use the - &man.command.section; + &man.command.section; notation to markup the first reference and use command to markup subsequent references. This makes the generated output, especially @@ -1549,7 +1549,7 @@ This is the file called 'foo2' Notice how the - &man.command.section; + &man.command.section; notation is easier to follow. @@ -1980,7 +1980,7 @@ This is the file called 'foo2' Appearance: The - maxusers n + maxusers n line in the kernel configuration file determines the size of many system tables, and is a rough guide to how many simultaneous logins the system will support. Modified: projects/relnotes-restructure/en_US.ISO8859-1/books/fdp-primer/editor-config/chapter.xml ============================================================================== --- projects/relnotes-restructure/en_US.ISO8859-1/books/fdp-primer/editor-config/chapter.xml Wed Feb 26 04:13:22 2014 (r44071) +++ projects/relnotes-restructure/en_US.ISO8859-1/books/fdp-primer/editor-config/chapter.xml Wed Feb 26 04:16:27 2014 (r44072) @@ -117,7 +117,7 @@ color ,yellow "^(.{71})|(TAB.{63})|(TAB{ Specify additional helpful options when running the editor: - &prompt.user; nano -AKipwz -r 70 -T8 chapter.xml + &prompt.user; nano -AKipwz -r 70 -T8 chapter.xml Users of &man.csh.1; can define an alias in ~/.cshrc to automate these @@ -128,7 +128,7 @@ color ,yellow "^(.{71})|(TAB.{63})|(TAB{ After the alias is defined, the options will be added automatically: - &prompt.user; nano chapter.xml + &prompt.user; nano chapter.xml Modified: projects/relnotes-restructure/en_US.ISO8859-1/books/fdp-primer/examples/appendix.xml ============================================================================== --- projects/relnotes-restructure/en_US.ISO8859-1/books/fdp-primer/examples/appendix.xml Wed Feb 26 04:13:22 2014 (r44071) +++ projects/relnotes-restructure/en_US.ISO8859-1/books/fdp-primer/examples/appendix.xml Wed Feb 26 04:16:27 2014 (r44072) @@ -171,7 +171,7 @@ -c /usr/local/share/xml/docbook/catalog \ -c /usr/local/share/xml/jade/catalog \ -d /usr/local/share/xml/docbook/dsssl/modular/html/docbook.dsl \ - -t sgml file.xml > file.html + -t sgml file.xml > file.html @@ -226,7 +226,7 @@ -c /usr/local/share/xml/docbook/catalog \ -c /usr/local/share/xml/jade/catalog \ -d /usr/local/share/xml/docbook/dsssl/modular/html/docbook.dsl \ - -t sgml file.xml + -t sgml file.xml @@ -283,7 +283,7 @@ -c /usr/local/share/xml/docbook/catalog \ -c /usr/local/share/xml/jade/catalog \ -d /usr/local/share/xml/docbook/dsssl/modular/print/docbook.dsl \ - -t tex file.xml + -t tex file.xml @@ -319,7 +319,7 @@ run through tex, specifying the &jadetex macro package. - &prompt.user; tex "&jadetex" file.tex + &prompt.user; tex "&jadetex" file.tex tex commands must be run at least three times. The first run @@ -341,12 +341,12 @@ necessary. The output from this stage will be - file.dvi. + file.dvi. Finally, run dvips to convert the .dvi file to &postscript;. - &prompt.user; dvips -o file.ps file.dvi + &prompt.user; dvips -o file.ps file.dvi @@ -361,12 +361,12 @@ However, use the &pdfjadetex macro package instead. - &prompt.user; pdftex "&pdfjadetex" file.tex + &prompt.user; pdftex "&pdfjadetex" file.tex Again, run this command three times. This will generate - file.pdf, + file.pdf, which does not need to be processed any further. Modified: projects/relnotes-restructure/en_US.ISO8859-1/books/fdp-primer/overview/chapter.xml ============================================================================== --- projects/relnotes-restructure/en_US.ISO8859-1/books/fdp-primer/overview/chapter.xml Wed Feb 26 04:13:22 2014 (r44071) +++ projects/relnotes-restructure/en_US.ISO8859-1/books/fdp-primer/overview/chapter.xml Wed Feb 26 04:16:27 2014 (r44072) @@ -156,7 +156,7 @@ ~/doc (see ). - &prompt.user; svn checkout https://svn0.us-west.FreeBSD.org/doc/head ~/doc + &prompt.user; svn checkout https://svn0.us-west.FreeBSD.org/doc/head ~/doc @@ -184,7 +184,7 @@ Update the local working copy: - &prompt.user; svn up ~/doc + &prompt.user; svn up ~/doc @@ -224,7 +224,7 @@ diff file: &prompt.user; cd /usr/doc -&prompt.user; svn diff > bsdinstall.diff.txt +&prompt.user; svn diff > bsdinstall.diff.txt Give the diff file a descriptive name. In the example above, changes have been made to the Modified: projects/relnotes-restructure/en_US.ISO8859-1/books/fdp-primer/structure/chapter.xml ============================================================================== --- projects/relnotes-restructure/en_US.ISO8859-1/books/fdp-primer/structure/chapter.xml Wed Feb 26 04:13:22 2014 (r44071) +++ projects/relnotes-restructure/en_US.ISO8859-1/books/fdp-primer/structure/chapter.xml Wed Feb 26 04:16:27 2014 (r44072) @@ -94,7 +94,8 @@ - lang.encoding + lang.encoding One directory exists for each available translation and encoding of the documentation, for example @@ -114,7 +115,7 @@ The - <filename>lang.encoding/</filename> + <filename><replaceable>lang</replaceable>.<replaceable>encoding</replaceable>/</filename> Directories These directories contain the documents themselves. The @@ -158,7 +159,7 @@ man For translations of the system manual pages. This - directory will contain one or more mann + directory will contain one or more mann directories, corresponding to the sections that have been translated. @@ -166,7 +167,7 @@ - Not every lang.encoding + Not every lang.encoding directory will have all of these subdirectories. It depends on how much translation has been accomplished by that translation team. @@ -236,7 +237,7 @@ - <filename>directory/chapter.xml</filename> + <filename role="directory"><replaceable>directory</replaceable>/chapter.xml</filename> Each chapter in the Handbook is stored in a file called chapter.xml in a separate Modified: projects/relnotes-restructure/en_US.ISO8859-1/books/fdp-primer/the-website/chapter.xml ============================================================================== --- projects/relnotes-restructure/en_US.ISO8859-1/books/fdp-primer/the-website/chapter.xml Wed Feb 26 04:13:22 2014 (r44071) +++ projects/relnotes-restructure/en_US.ISO8859-1/books/fdp-primer/the-website/chapter.xml Wed Feb 26 04:16:27 2014 (r44072) @@ -38,7 +38,7 @@ Having obtained the documentation and web site source files, the web site can be built. In this example, the build directory - is ~/doc + is ~/doc and all the required files are already in place. The web site is built from the @@ -76,7 +76,7 @@ jru in their home directory, /usr/home/jru/doc. &prompt.root; cd /home/jru/doc/en_US.ISO8859-1/htdocs -&prompt.root; env DESTDIR=/usr/local/www make install +&prompt.root; env DESTDIR=/usr/local/www make install The install process will not delete any old or outdated files that existed previously in the same directory. If a new @@ -84,7 +84,7 @@ will find and delete all files that have not been updated in three days. - &prompt.root; find /usr/local/www -ctime 3 -delete + &prompt.root; find /usr/local/www -ctime 3 -delete @@ -129,7 +129,7 @@ If set, build or install only for the languages - specified by this variable inside the ~/doc + specified by this variable inside the ~/doc directory. All other languages except English will be ignored. E.g.: Modified: projects/relnotes-restructure/en_US.ISO8859-1/books/fdp-primer/translations/chapter.xml ============================================================================== --- projects/relnotes-restructure/en_US.ISO8859-1/books/fdp-primer/translations/chapter.xml Wed Feb 26 04:13:22 2014 (r44071) +++ projects/relnotes-restructure/en_US.ISO8859-1/books/fdp-primer/translations/chapter.xml Wed Feb 26 04:16:27 2014 (r44072) @@ -135,7 +135,7 @@ copy of the FreeBSD Subversion repository (at least the documentation part). This can be done by running: - &prompt.user; svn checkout https://svn0.us-east.FreeBSD.org/doc/head/ head + &prompt.user; svn checkout https://svn0.us-east.FreeBSD.org/doc/head/ head svn0.us-east.FreeBSD.org is a public SVN server. @@ -158,7 +158,7 @@ en_US.ISO8859-1/books/fdp-primer/book.xml, run: - &prompt.user; svn diff -r33733:33734 en_US.ISO8859-1/books/fdp-primer/book.xml + &prompt.user; svn diff -r33733:33734 en_US.ISO8859-1/books/fdp-primer/book.xml @@ -284,7 +284,7 @@ sv_SE.ISO8859-1 is the name of the translation, in - lang.encoding + lang.encoding form. Note the two Makefiles, which will be used to build the documentation. @@ -465,7 +465,7 @@ Your translated documents should include their own $FreeBSD$ line, and change the FreeBSD Documentation Project line to - The FreeBSD language + The FreeBSD language Documentation Project. In addition, you should add a third line which indicates Modified: projects/relnotes-restructure/en_US.ISO8859-1/books/fdp-primer/working-copy/chapter.xml ============================================================================== --- projects/relnotes-restructure/en_US.ISO8859-1/books/fdp-primer/working-copy/chapter.xml Wed Feb 26 04:13:22 2014 (r44071) +++ projects/relnotes-restructure/en_US.ISO8859-1/books/fdp-primer/working-copy/chapter.xml Wed Feb 26 04:16:27 2014 (r44072) @@ -98,12 +98,12 @@ copy of the latest version (head) of the main documentation tree: - &prompt.user; svn checkout https://svn0.us-west.FreeBSD.org/doc/head ~/doc + &prompt.user; svn checkout https://svn0.us-west.FreeBSD.org/doc/head ~/doc A checkout of the source code to work on manual pages is very similar: - &prompt.user; svn checkout https://svn0.us-west.FreeBSD.org/base/head ~/src + &prompt.user; svn checkout https://svn0.us-west.FreeBSD.org/base/head ~/src @@ -118,7 +118,7 @@ svn update on the directory containing the local working copy: - &prompt.user; svn update ~/doc + &prompt.user; svn update ~/doc Get in the protective habit of using svn update before editing document files. @@ -152,8 +152,8 @@ by redirecting the output of svn diff into a file: - &prompt.user; cd ~/doc -&prompt.user; svn diff > doc-fix-spelling.diff + &prompt.user; cd ~/doc +&prompt.user; svn diff > doc-fix-spelling.diff Give the file a meaningful name that identifies the contents. The example above is for spelling fixes to the whole @@ -172,8 +172,8 @@ be submitted yet, provide a list of only the files that are to be included: - &prompt.user; cd ~/doc -&prompt.user; svn diff disks/chapter.xml printers/chapter.xml > disks-printers.diff + &prompt.user; cd ~/doc +&prompt.user; svn diff disks/chapter.xml printers/chapter.xml > disks-printers.diff Modified: projects/relnotes-restructure/en_US.ISO8859-1/books/fdp-primer/xml-primer/chapter.xml ============================================================================== --- projects/relnotes-restructure/en_US.ISO8859-1/books/fdp-primer/xml-primer/chapter.xml Wed Feb 26 04:13:22 2014 (r44071) +++ projects/relnotes-restructure/en_US.ISO8859-1/books/fdp-primer/xml-primer/chapter.xml Wed Feb 26 04:16:27 2014 (r44072) @@ -312,7 +312,7 @@ An element's attributes are written inside the start tag for that element, and take the form - attribute-name="attribute-value". + attribute-name="attribute-value". In XHTML, the p element has an attribute called @@ -615,9 +615,9 @@ example.xml:5: element head: validity er superset) of XML. Otherwise, this string will either look like - -//Owner + -//Owner or - +//Owner + +//Owner (notice the only difference is the leading + or -). @@ -898,7 +898,7 @@ example.xml:5: element head: validity er To include the text of a general entity in the document, include - &entity-name; + &entity-name; in the text. For example, consider a general entity called current.version which expands to the current version number of a product. To use it in the @@ -962,7 +962,7 @@ example.xml:5: element head: validity er Parameter entity definitons are similar to those for general entities. However, parameter entries are included with - %entity-name;. + %entity-name;. The definition also includes the % between the ENTITY keyword and the name of the entity. @@ -1226,7 +1226,7 @@ example.xml:5: element head: validity er Load example.html into the web browser and confirm that the - paran.xml + paran.xml files have been included in example.html. @@ -1287,7 +1287,7 @@ example.xml:5: element head: validity er Load example.html into the web browser and confirm that the - paran.xml + paran.xml files have been included in example.html. Modified: projects/relnotes-restructure/en_US.ISO8859-1/books/handbook/advanced-networking/chapter.xml ============================================================================== --- projects/relnotes-restructure/en_US.ISO8859-1/books/handbook/advanced-networking/chapter.xml Wed Feb 26 04:13:22 2014 (r44071) +++ projects/relnotes-restructure/en_US.ISO8859-1/books/handbook/advanced-networking/chapter.xml Wed Feb 26 04:16:27 2014 (r44072) @@ -4,7 +4,10 @@ $FreeBSD$ --> - + + Advanced Networking @@ -89,15 +92,26 @@ Gateways and Routes - - CoranthGryphonContributed - by + + + + Coranth + Gryphon + + Contributed by + - routing - gateway - subnet + + routing + + + gateway + + + subnet + For one machine to be able to find another over a network, there must be a mechanism in place to describe how to get from @@ -135,12 +149,18 @@ host2 0:e0:a8:37:8:1e UHLW host2.example.com link#1 UC 0 0 224 link#1 UC 0 0 - default route + + default route + + The first two lines specify the default route, described in more detail in , and the localhost route. - loopback device + + loopback device + + The interface (Netif column) that this routing table specifies to use for localhost is lo0, @@ -152,6 +172,7 @@ host2.example.com link#1 UC Ethernet MAC address + The addresses beginning with 0:e0: are Ethernet hardware addresses, also known as MAC @@ -167,7 +188,9 @@ host2.example.com link#1 UC calculates routes to local hosts based upon a shortest path determination. - subnet + + subnet + &os; will add subnet routes for the local subnet. 10.20.30.255 is the @@ -263,7 +286,9 @@ host2.example.com link#1 UC Default Routes - default route + + default route + When the local system needs to make a connection to a remote host, it checks the routing table to determine if a @@ -400,9 +425,11 @@ host2.example.com link#1 UC Dual Homed Hosts - dual homed hosts + + dual homed hosts + - A a dual-homed system is a host which resides on two + A dual-homed system is a host which resides on two different networks. The dual-homed machine might have two Ethernet cards, each @@ -428,7 +455,9 @@ host2.example.com link#1 UC Building a Router - router + + router + A network router is a system that forwards packets from one interface to another. Internet standards and good @@ -444,9 +473,16 @@ host2.example.com link#1 UC 1. To stop routing, reset this to 0. - BGP - RIP - OSPF + + BGP + + + RIP + + + OSPF + + The new router will need routes to know where to send the traffic. If the network is simple enough, static routes can be used. &os; comes with the standard BSD routing daemon @@ -463,8 +499,13 @@ host2.example.com link#1 UC Setting Up Static Routes - AlHoangContributed - by + + + Al + Hoang + + Contributed by + @@ -641,6 +682,7 @@ route_net2="-net 192.168.1.0/24 192.168. kernel options MROUTING + &os; natively supports both multicast applications and multicast routing. Multicast applications do not require any special configuration of &os;; as applications will generally @@ -672,15 +714,29 @@ route_net2="-net 192.168.1.0/24 192.168. Wireless Networking - Loader - - MarcFonvieille - - MurrayStokely + + + Loader + + + + + Marc + Fonvieille + + + + + Murray + Stokely + + - wireless networking + + wireless networking + 802.11 wireless networking @@ -2239,7 +2295,9 @@ freebsdap 00:11:95:c3:0d:ac 1 USB Tethering - tether + + tether + Many cellphones provide the option to share their data connection over USB (often called "tethering"). This feature @@ -2264,14 +2322,21 @@ freebsdap 00:11:95:c3:0d:ac 1 Bluetooth - PavLucistnikWritten - by -
pav@FreeBSD.org
- + + + Pav + Lucistnik + + Written by + pav@FreeBSD.org + - Bluetooth + + Bluetooth + + Introduction @@ -2343,7 +2408,9 @@ Number of SCO packets: 8 Host Controller Interface (<acronym>HCI</acronym>) - HCI + + HCI + The Host Controller Interface (HCI) provides a command interface to the baseband controller and @@ -2404,8 +2471,8 @@ Name: Pav's T39 If an inquiry is performed on a remote Bluetooth device, it will find the computer as - your.host.name (ubt0). The name assigned to the - local device can be changed at any time. + your.host.name (ubt0). The name assigned to + the local device can be changed at any time. The Bluetooth system provides a point-to-point connection between two Bluetooth units, or a point-to-multipoint @@ -2437,7 +2504,9 @@ Reason: Connection terminated by local h Logical Link Control and Adaptation Protocol (<acronym>L2CAP</acronym>) - L2CAP + + L2CAP + The Logical Link Control and Adaptation Protocol (L2CAP) provides connection-oriented and @@ -2611,7 +2680,9 @@ hcsecd[16484]: Sending PIN_Code_Reply to Service Discovery Protocol (<acronym>SDP</acronym>) - SDP + + SDP + The Service Discovery Protocol (SDP) provides the means for client applications to discover the @@ -2795,7 +2866,10 @@ Bluetooth Profile Descriptor List: <acronym>OBEX</acronym> Object Push (<acronym>OPUSH</acronym>) Profile - OBEX + + OBEX + + OBEX is a widely used protocol for simple file transfers between mobile devices. Its main use is in infrared communication, where it is used for generic @@ -2915,17 +2989,26 @@ rfcomm_sppd[94692]: Starting on /dev/tty Bridging - AndrewThompsonWritten - by + + + Andrew + Thompson + + Written by + Introduction - IP - subnet - bridge + + IP subnet + *** DIFF OUTPUT TRUNCATED AT 1000 LINES ***