From owner-svn-doc-projects@FreeBSD.ORG Fri Jul 5 21:12:47 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 077DE619; Fri, 5 Jul 2013 21:12:47 +0000 (UTC) (envelope-from rene@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 EA836134F; Fri, 5 Jul 2013 21:12: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 r65LCkgG084023; Fri, 5 Jul 2013 21:12:46 GMT (envelope-from rene@svn.freebsd.org) Received: (from rene@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r65LChka083997; Fri, 5 Jul 2013 21:12:43 GMT (envelope-from rene@svn.freebsd.org) Message-Id: <201307052112.r65LChka083997@svn.freebsd.org> From: Rene Ladan Date: Fri, 5 Jul 2013 21:12:43 +0000 (UTC) To: doc-committers@freebsd.org, svn-doc-projects@freebsd.org Subject: svn commit: r42166 - in projects/entities: de_DE.ISO8859-1/books/handbook/firewalls de_DE.ISO8859-1/books/porters-handbook el_GR.ISO8859-7/books/handbook/firewalls en_US.ISO8859-1/articles/committe... 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: Fri, 05 Jul 2013 21:12:47 -0000 Author: rene Date: Fri Jul 5 21:12:42 2013 New Revision: 42166 URL: http://svnweb.freebsd.org/changeset/doc/42166 Log: MFH up to r42165 Added: projects/entities/en_US.ISO8859-1/htdocs/news/status/report-2013-05-devsummit.xml - copied unchanged from r42165, head/en_US.ISO8859-1/htdocs/news/status/report-2013-05-devsummit.xml projects/entities/ja_JP.eucJP/htdocs/java/links.xml - copied unchanged from r42165, head/ja_JP.eucJP/htdocs/java/links.xml projects/entities/share/pgpkeys/loos.key - copied unchanged from r42165, head/share/pgpkeys/loos.key Deleted: projects/entities/en_US.ISO8859-1/books/handbook/vinum/ projects/entities/ja_JP.eucJP/htdocs/java/advocacy.xml projects/entities/ja_JP.eucJP/htdocs/java/links/ Modified: projects/entities/de_DE.ISO8859-1/books/handbook/firewalls/chapter.xml projects/entities/de_DE.ISO8859-1/books/porters-handbook/book.xml projects/entities/el_GR.ISO8859-7/books/handbook/firewalls/chapter.xml projects/entities/en_US.ISO8859-1/articles/committers-guide/article.xml projects/entities/en_US.ISO8859-1/articles/contributors/contrib.additional.xml projects/entities/en_US.ISO8859-1/articles/contributors/contrib.committers.xml projects/entities/en_US.ISO8859-1/articles/serial-uart/article.xml projects/entities/en_US.ISO8859-1/books/fdp-primer/docbook-markup/chapter.xml projects/entities/en_US.ISO8859-1/books/fdp-primer/overview/chapter.xml projects/entities/en_US.ISO8859-1/books/fdp-primer/writing-style/chapter.xml projects/entities/en_US.ISO8859-1/books/handbook/Makefile projects/entities/en_US.ISO8859-1/books/handbook/book.xml projects/entities/en_US.ISO8859-1/books/handbook/chapters.ent 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/preface/preface.xml projects/entities/en_US.ISO8859-1/books/pmake/gods/chapter.xml projects/entities/en_US.ISO8859-1/books/porters-handbook/book.xml projects/entities/en_US.ISO8859-1/htdocs/java/install.xml projects/entities/en_US.ISO8859-1/htdocs/news/status/Makefile projects/entities/en_US.ISO8859-1/htdocs/news/status/report-2013-04-2013-06.xml projects/entities/en_US.ISO8859-1/htdocs/news/status/status.xml projects/entities/en_US.ISO8859-1/htdocs/ports/references.xml projects/entities/hu_HU.ISO8859-2/books/handbook/firewalls/chapter.xml projects/entities/hu_HU.ISO8859-2/books/handbook/linuxemu/chapter.xml projects/entities/it_IT.ISO8859-15/books/handbook/serialcomms/chapter.xml projects/entities/it_IT.ISO8859-15/books/unix-introduction/system-resource/chapter.xml projects/entities/ja_JP.eucJP/books/handbook/Makefile projects/entities/ja_JP.eucJP/books/handbook/book.xml projects/entities/ja_JP.eucJP/books/handbook/chapters.ent projects/entities/ja_JP.eucJP/books/handbook/cutting-edge/chapter.xml projects/entities/ja_JP.eucJP/books/handbook/desktop/chapter.xml projects/entities/ja_JP.eucJP/books/handbook/disks/chapter.xml projects/entities/ja_JP.eucJP/books/handbook/preface/preface.xml projects/entities/ja_JP.eucJP/books/porters-handbook/book.xml projects/entities/ja_JP.eucJP/htdocs/java/Makefile projects/entities/ja_JP.eucJP/htdocs/java/index.xml projects/entities/ja_JP.eucJP/htdocs/java/install.xml projects/entities/ja_JP.eucJP/htdocs/ports/references.xml projects/entities/ja_JP.eucJP/share/xml/navibar.l10n.ent projects/entities/ja_JP.eucJP/share/xml/news.xml projects/entities/mn_MN.UTF-8/books/handbook/firewalls/chapter.xml projects/entities/nl_NL.ISO8859-1/books/handbook/serialcomms/chapter.xml projects/entities/pl_PL.ISO8859-2/books/handbook/firewalls/chapter.xml projects/entities/pt_BR.ISO8859-1/books/handbook/mirrors/chapter.xml projects/entities/ru_RU.KOI8-R/books/porters-handbook/book.xml projects/entities/share/pgpkeys/gavin.key projects/entities/share/pgpkeys/pgpkeys-developers.xml projects/entities/share/pgpkeys/pgpkeys.ent projects/entities/share/xml/authors.ent projects/entities/share/xml/freebsd.sch projects/entities/share/xml/mirrors.xml projects/entities/share/xml/navibar.ent projects/entities/share/xml/news.xml projects/entities/zh_CN.GB2312/books/handbook/firewalls/chapter.xml projects/entities/zh_CN.GB2312/books/porters-handbook/book.xml projects/entities/zh_TW.Big5/books/handbook/firewalls/chapter.xml projects/entities/zh_TW.Big5/books/handbook/serialcomms/chapter.xml projects/entities/zh_TW.Big5/books/porters-handbook/book.xml Directory Properties: projects/entities/bn_BD.ISO10646-1/ (props changed) projects/entities/da_DK.ISO8859-1/ (props changed) projects/entities/de_DE.ISO8859-1/ (props changed) projects/entities/el_GR.ISO8859-7/ (props changed) projects/entities/en_US.ISO8859-1/ (props changed) projects/entities/es_ES.ISO8859-1/ (props changed) projects/entities/fr_FR.ISO8859-1/ (props changed) projects/entities/hu_HU.ISO8859-2/ (props changed) projects/entities/it_IT.ISO8859-15/ (props changed) projects/entities/ja_JP.eucJP/ (props changed) projects/entities/mn_MN.UTF-8/ (props changed) projects/entities/nl_NL.ISO8859-1/ (props changed) projects/entities/no_NO.ISO8859-1/ (props changed) projects/entities/pl_PL.ISO8859-2/ (props changed) projects/entities/pt_BR.ISO8859-1/ (props changed) projects/entities/release/ (props changed) projects/entities/ru_RU.KOI8-R/ (props changed) projects/entities/share/ (props changed) projects/entities/sr_YU.ISO8859-2/ (props changed) projects/entities/tr_TR.ISO8859-9/ (props changed) projects/entities/zh_CN.GB2312/ (props changed) projects/entities/zh_TW.Big5/ (props changed) Modified: projects/entities/de_DE.ISO8859-1/books/handbook/firewalls/chapter.xml ============================================================================== --- projects/entities/de_DE.ISO8859-1/books/handbook/firewalls/chapter.xml Fri Jul 5 19:19:13 2013 (r42165) +++ projects/entities/de_DE.ISO8859-1/books/handbook/firewalls/chapter.xml Fri Jul 5 21:12:42 2013 (r42166) @@ -1834,7 +1834,7 @@ block in log first quick on dc0 all Internet: - + Modified: projects/entities/de_DE.ISO8859-1/books/porters-handbook/book.xml ============================================================================== --- projects/entities/de_DE.ISO8859-1/books/porters-handbook/book.xml Fri Jul 5 19:19:13 2013 (r42165) +++ projects/entities/de_DE.ISO8859-1/books/porters-handbook/book.xml Fri Jul 5 21:12:42 2013 (r42166) @@ -6050,6 +6050,7 @@ PLIST_SUB+= NLS="@comment " Nur lesbare Variablen + Bedeutung Modified: projects/entities/el_GR.ISO8859-7/books/handbook/firewalls/chapter.xml ============================================================================== --- projects/entities/el_GR.ISO8859-7/books/handbook/firewalls/chapter.xml Fri Jul 5 19:19:13 2013 (r42165) +++ projects/entities/el_GR.ISO8859-7/books/handbook/firewalls/chapter.xml Fri Jul 5 21:12:42 2013 (r42166) @@ -1823,7 +1823,7 @@ block in log first quick on dc0 all Internet: - + Modified: projects/entities/en_US.ISO8859-1/articles/committers-guide/article.xml ============================================================================== --- projects/entities/en_US.ISO8859-1/articles/committers-guide/article.xml Fri Jul 5 19:19:13 2013 (r42165) +++ projects/entities/en_US.ISO8859-1/articles/committers-guide/article.xml Fri Jul 5 21:12:42 2013 (r42166) @@ -85,7 +85,8 @@ Root svn+ssh://svn.FreeBSD.org/base - (see also ). + (see also ). @@ -93,7 +94,8 @@ Root svn+ssh://svn.FreeBSD.org/doc - (see also ). + (see also ). @@ -101,12 +103,12 @@ Root 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 @@ -149,7 +151,7 @@ - &man.ssh.1; is required to connect to the projecte hosts. + &man.ssh.1; is required to connect to the project hosts. For more information, see . Useful links: @@ -389,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 @@ -456,7 +458,7 @@ - + Checkout from a Mirror Check out a working copy from a mirror by @@ -466,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 @@ -482,7 +485,7 @@ information on how to set one up. - + <literal>RELENG_*</literal> Branches and General Layout @@ -542,7 +545,7 @@ - + &os; Documentation Project Branches and Layout @@ -583,7 +586,7 @@ - + &os; Ports Tree Branches and Layout In svn+ssh://svn.freebsd.org/ports, @@ -626,12 +629,11 @@ 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 @@ -640,7 +642,7 @@ Book. - + Checkout As seen earlier, to check out the &os; head @@ -703,7 +705,7 @@ - + Anonymous Checkout It is possible to anonymously check out the &os; @@ -719,7 +721,7 @@ mirror sites. - + Updating the Tree To update a working copy to either the latest revision, @@ -729,7 +731,7 @@ &prompt.user; svn update -r12345 - + Status To view the local changes that have been made to the @@ -743,12 +745,11 @@ &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 @@ -764,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 @@ -798,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 @@ -888,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. @@ -940,8 +943,9 @@ 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. @@ -950,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: + SVN allows + sparse, or partial checkouts of a + directory by adding to a + svn checkout. - &prompt.user; svn checkout -N svn+ssh://svn.freebsd.org/base ~/freebsd - - is equivalent to: - - &prompt.user; svn checkout --depth=empty svn+ssh://svn.freebsd.org/base ~/freebsd - - Valid arguments to --depth + Valid arguments to are: @@ -989,6 +981,7 @@ files and directories it contains, but none of the subdirectories' contents. + infinity: anything. @@ -1013,19 +1006,20 @@ 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: @@ -1058,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 @@ -1069,7 +1063,7 @@ &prompt.user; svn commit stable/8 - + Merging with <acronym>SVN</acronym> This section deals with merging code from one branch to @@ -1096,15 +1090,15 @@ 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: @@ -1126,9 +1120,9 @@ - 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. @@ -1177,9 +1171,10 @@ 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 + + sys/, not + sys/dev/ichwd/. Likewise, a change to the TCP/IP stack should be merged to sys/, not - Changes to code under etc/ should be merged - at etc/, not - below it. + Changes to code under + etc/ should be + merged at etc/, + not below it. - Changes to vendor code (code in contrib/, crypto/ and so on) - should be merged to the directory where vendor imports - happen. For instance, a change to Changes to vendor code (code in + + contrib/, + crypto/ and so + on) should be merged to the directory where vendor + imports happen. For instance, a change to crypto/openssl/util/ should be merged to crypto/openssl/. This @@ -1244,11 +1240,12 @@ - Other changes to share/ should be merged - to the appropriate subdirectory and not to + Other changes to + share/ should + be merged to the appropriate subdirectory and not to share/ directly. + @@ -1385,12 +1382,12 @@ $target - head/$source:$P,$Q,$R in r238987 is to be merged from CURRENT to 9-STABLE. The file resides in head/share/man/man4 and - according to + according to this is also where to do the merge. Note that in this example all paths are relative to the top of the svn repository. For more information on the directory - layout, see - . + layout, see . The first step is to inspect the existing mergeinfo. @@ -1467,7 +1464,7 @@ U stable/9/share/man/man4/netmap.4 - + Vendor Imports with <acronym>SVN</acronym> @@ -1781,7 +1778,7 @@ U stable/9/share/man/man4/netmap.4 - + Reverting a Commit Reverting a commit to a previous version is fairly @@ -1824,7 +1821,7 @@ U stable/9/share/man/man4/netmap.4 cause history to be lost. - + Fixing Mistakes While we can do surgery in an emergency, do not plan on @@ -1850,7 +1847,7 @@ U stable/9/share/man/man4/netmap.4 This is a waste. - + Setting up a <application>svnsync</application> Mirror @@ -1895,7 +1892,7 @@ U stable/9/share/man/man4/netmap.4 Use propset to change things. - + Committing High-<acronym>ASCII</acronym> Data Files that have high-ASCII bits are @@ -1913,7 +1910,7 @@ U stable/9/share/man/man4/netmap.4 &prompt.user; svn propset fbsd:notbinary yes foo.data - + Maintaining a Project Branch A project branch is one that is synced to head (or @@ -2034,11 +2031,11 @@ ControlPersist yes svn:keywords property will be rejected when attempting to commit them to the repository. Be sure to read - regarding - adding and removing files, in addition to verifying that - ~/.subversion/config contains the - necessary "auto-props" entries from - auto-props.txt mentioned + + regarding adding and removing files, in addition to + verifying that ~/.subversion/config + contains the necessary "auto-props" entries + from auto-props.txt mentioned there. Modified: projects/entities/en_US.ISO8859-1/articles/contributors/contrib.additional.xml ============================================================================== --- projects/entities/en_US.ISO8859-1/articles/contributors/contrib.additional.xml Fri Jul 5 19:19:13 2013 (r42165) +++ projects/entities/en_US.ISO8859-1/articles/contributors/contrib.additional.xml Fri Jul 5 21:12:42 2013 (r42166) @@ -5964,11 +5964,6 @@ - Luiz Otavio O Souza - loos.br@gmail.com - - - Lukasz Stelmach lukasz.stelmach@iem.pw.edu.pl Modified: projects/entities/en_US.ISO8859-1/articles/contributors/contrib.committers.xml ============================================================================== --- projects/entities/en_US.ISO8859-1/articles/contributors/contrib.committers.xml Fri Jul 5 19:19:13 2013 (r42165) +++ projects/entities/en_US.ISO8859-1/articles/contributors/contrib.committers.xml Fri Jul 5 21:12:42 2013 (r42166) @@ -1424,6 +1424,10 @@ + &a.loos.email; + + + &a.uqs.email; Modified: projects/entities/en_US.ISO8859-1/articles/serial-uart/article.xml ============================================================================== --- projects/entities/en_US.ISO8859-1/articles/serial-uart/article.xml Fri Jul 5 19:19:13 2013 (r42165) +++ projects/entities/en_US.ISO8859-1/articles/serial-uart/article.xml Fri Jul 5 21:12:42 2013 (r42166) @@ -1628,7 +1628,7 @@ - Together these + Together these bits specify the number of bits in each data word. @@ -1636,35 +1636,35 @@ 1 0 - Word + Word Length 0 0 - 5 Data + 5 Data Bits 0 1 - 6 Data + 6 Data Bits 1 0 - 7 Data + 7 Data Bits 1 1 - 8 Data + 8 Data Bits Modified: projects/entities/en_US.ISO8859-1/books/fdp-primer/docbook-markup/chapter.xml ============================================================================== --- projects/entities/en_US.ISO8859-1/books/fdp-primer/docbook-markup/chapter.xml Fri Jul 5 19:19:13 2013 (r42165) +++ projects/entities/en_US.ISO8859-1/books/fdp-primer/docbook-markup/chapter.xml Fri Jul 5 21:12:42 2013 (r42166) @@ -2243,6 +2243,19 @@ IMAGES= chapter1/fig1.png GUID Partition Tables. + + The link text can be omitted to show the actual + URL: + + Wikipedia has an excellent reference on + GUID Partition Tables: .]]> + + Appearance: + + Wikipedia has an excellent reference on + GUID Partition Tables: . Modified: projects/entities/en_US.ISO8859-1/books/fdp-primer/overview/chapter.xml ============================================================================== --- projects/entities/en_US.ISO8859-1/books/fdp-primer/overview/chapter.xml Fri Jul 5 19:19:13 2013 (r42165) +++ projects/entities/en_US.ISO8859-1/books/fdp-primer/overview/chapter.xml Fri Jul 5 21:12:42 2013 (r42166) @@ -167,7 +167,7 @@ download, pick the nearest mirror from the list of Subversion mirror sites. If /usr/doc already exists, move + class="directory">/usr/doc already exists, move or delete it first to prevent file conflicts. &prompt.user; svn checkout https://svn0.us-west.FreeBSD.org/doc/head /usr/doc Modified: projects/entities/en_US.ISO8859-1/books/fdp-primer/writing-style/chapter.xml ============================================================================== --- projects/entities/en_US.ISO8859-1/books/fdp-primer/writing-style/chapter.xml Fri Jul 5 19:19:13 2013 (r42165) +++ projects/entities/en_US.ISO8859-1/books/fdp-primer/writing-style/chapter.xml Fri Jul 5 21:12:42 2013 (r42166) @@ -495,11 +495,12 @@ GB. Hardware compression … - + Word XML Code + Notes @@ -544,7 +545,6 @@ GB. Hardware compression … Ports Collection - Ports&nbsp;Collection @@ -556,6 +556,19 @@ GB. Hardware compression … + Subversion + + applicationSubversionapplication + Do not refer to the Subversion application as + SVN in upper case. To refer to the + command, use commandsvncommand. + + + &unix; &unix; Modified: projects/entities/en_US.ISO8859-1/books/handbook/Makefile ============================================================================== --- projects/entities/en_US.ISO8859-1/books/handbook/Makefile Fri Jul 5 19:19:13 2013 (r42165) +++ projects/entities/en_US.ISO8859-1/books/handbook/Makefile Fri Jul 5 21:12:42 2013 (r42166) @@ -178,13 +178,6 @@ IMAGES_EN+= security/ipsec-network.pic IMAGES_EN+= security/ipsec-crypt-pkt.pic IMAGES_EN+= security/ipsec-encap-pkt.pic IMAGES_EN+= security/ipsec-out-pkt.pic -IMAGES_EN+= vinum/vinum-concat.pic -IMAGES_EN+= vinum/vinum-mirrored-vol.pic -IMAGES_EN+= vinum/vinum-raid10-vol.pic -IMAGES_EN+= vinum/vinum-raid5-org.pic -IMAGES_EN+= vinum/vinum-simple-vol.pic -IMAGES_EN+= vinum/vinum-striped-vol.pic -IMAGES_EN+= vinum/vinum-striped.pic IMAGES_EN+= virtualization/parallels-freebsd1.png IMAGES_EN+= virtualization/parallels-freebsd2.png IMAGES_EN+= virtualization/parallels-freebsd3.png @@ -283,7 +276,6 @@ SRCS+= printing/chapter.xml SRCS+= security/chapter.xml SRCS+= serialcomms/chapter.xml SRCS+= users/chapter.xml -SRCS+= vinum/chapter.xml SRCS+= virtualization/chapter.xml SRCS+= x11/chapter.xml Modified: projects/entities/en_US.ISO8859-1/books/handbook/book.xml ============================================================================== --- projects/entities/en_US.ISO8859-1/books/handbook/book.xml Fri Jul 5 19:19:13 2013 (r42165) +++ projects/entities/en_US.ISO8859-1/books/handbook/book.xml Fri Jul 5 21:12:42 2013 (r42166) @@ -236,7 +236,6 @@ &chap.disks; &chap.geom; &chap.filesystems; - &chap.vinum; &chap.virtualization; &chap.l10n; &chap.cutting-edge; Modified: projects/entities/en_US.ISO8859-1/books/handbook/chapters.ent ============================================================================== --- projects/entities/en_US.ISO8859-1/books/handbook/chapters.ent Fri Jul 5 19:19:13 2013 (r42165) +++ projects/entities/en_US.ISO8859-1/books/handbook/chapters.ent Fri Jul 5 21:12:42 2013 (r42166) @@ -39,7 +39,6 @@ - Modified: projects/entities/en_US.ISO8859-1/books/handbook/cutting-edge/chapter.xml ============================================================================== --- projects/entities/en_US.ISO8859-1/books/handbook/cutting-edge/chapter.xml Fri Jul 5 19:19:13 2013 (r42165) +++ projects/entities/en_US.ISO8859-1/books/handbook/cutting-edge/chapter.xml Fri Jul 5 21:12:42 2013 (r42166) @@ -1233,7 +1233,7 @@ Fetching 133 new ports or files... done. snapshot - &os.current; is the latest working sources for &os;. + &os.current; is the very latest source code for &os;. This includes work in progress, experimental changes, and transitional mechanisms that might or might not be present in the next official release of the software. While many @@ -1242,7 +1242,7 @@ Fetching 133 new ports or files... done. buildable. These problems are resolved as quickly as possible, but whether or not &os.current; brings disaster or greatly desired functionality can be a matter of when the - source code was synced + source code was synced. @@ -1288,13 +1288,13 @@ Fetching 133 new ports or files... done. - A quick way of getting bug fixes, though the fix is + A quick way of getting bug fixes. Any given commit is just as likely to introduce new bugs as to fix existing ones. - In no way officially + In any way officially supported. @@ -1467,7 +1467,7 @@ Fetching 133 new ports or files... done. For these reasons, one should not blindly track &os.stable;. It is particularly important not to update any production servers to &os.stable; without - first thoroughly testing the code in that development + first thoroughly testing the code in a development/testing environment. Except for those users who have the resources to perform @@ -1494,7 +1494,7 @@ Fetching 133 new ports or files... done. to respond if they have any issues to raise concerning the proposed change. - Join the relevant SVN + Join the relevant svn list for the branch being tracked. For example, users tracking the 9-STABLE branch should join the &a.svn-src-stable-9.name; list. This list records the @@ -1510,9 +1510,9 @@ Fetching 133 new ports or files... done. - To install a new system in order to run monthly + To install a new system running monthly snapshots built from &os.stable;, refer to Snapshotsfor more + url="&url.base;/snapshots/">Snapshots for more information. Alternatively, it is possible to install the most recent &os.stable; release from the mirror sites and follow the @@ -1569,13 +1569,6 @@ Fetching 133 new ports or files... done. - If you need rapid on-demand access to the source and - communications bandwidth is not a consideration, use - Subversion. Otherwise, use - CTM. - - - -STABLE compiling Modified: projects/entities/en_US.ISO8859-1/books/handbook/desktop/chapter.xml ============================================================================== --- projects/entities/en_US.ISO8859-1/books/handbook/desktop/chapter.xml Fri Jul 5 19:19:13 2013 (r42165) +++ projects/entities/en_US.ISO8859-1/books/handbook/desktop/chapter.xml Fri Jul 5 21:12:42 2013 (r42166) @@ -41,7 +41,7 @@ desktop applications: - + Type of Application Modified: projects/entities/en_US.ISO8859-1/books/handbook/disks/chapter.xml ============================================================================== --- projects/entities/en_US.ISO8859-1/books/handbook/disks/chapter.xml Fri Jul 5 19:19:13 2013 (r42165) +++ projects/entities/en_US.ISO8859-1/books/handbook/disks/chapter.xml Fri Jul 5 21:12:42 2013 (r42166) @@ -2999,10 +2999,6 @@ gbde_lockdir="/etc/gbde"&prompt.root; gbde detach /dev/ad4s1c - Also, since &man.vinum.4; does not use the - &man.geom.4; subsystem, - gbde can not be used with - vinum volumes. Modified: projects/entities/en_US.ISO8859-1/books/handbook/preface/preface.xml ============================================================================== --- projects/entities/en_US.ISO8859-1/books/handbook/preface/preface.xml Fri Jul 5 19:19:13 2013 (r42165) +++ projects/entities/en_US.ISO8859-1/books/handbook/preface/preface.xml Fri Jul 5 21:12:42 2013 (r42166) @@ -108,13 +108,6 @@ - , Vinum, is a new chapter - with this edition. It describes how to use Vinum, a logical - volume manager which provides device-independent logical - disks, and software RAID-0, RAID-1 and RAID-5. - - - A troubleshooting section has been added to , PPP and SLIP. @@ -493,15 +486,6 @@ - , *** DIFF OUTPUT TRUNCATED AT 1000 LINES ***