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...
Rene Ladan
rene at FreeBSD.org
Fri Jul 5 21:12:47 UTC 2013
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:</para>
<informaltable frame="none" pgwide="1">
- <tgroup cols="2">
+ <tgroup cols="3">
<colspec colwidth="1*"/>
<colspec colwidth="1*"/>
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 "
<thead>
<row>
<entry>Nur lesbare Variablen</entry>
+ <entry>Bedeutung</entry>
</row>
</thead>
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:</para>
<informaltable frame="none" pgwide="1">
- <tgroup cols="2">
+ <tgroup cols="3">
<colspec colwidth="1*"/>
<colspec colwidth="1*"/>
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</emphasis></entry>
<entry><literal>svn+ssh://</literal><hostid
role="fqdn">svn.FreeBSD.org</hostid><filename>/base</filename>
- (see also <xref linkend="subversion-primer"/>).</entry>
+ (see also <xref
+ linkend="svn-getting-started-base-layout"/>).</entry>
</row>
<row>
@@ -93,7 +94,8 @@
Root</emphasis></entry>
<entry><literal>svn+ssh://</literal><hostid
role="fqdn">svn.FreeBSD.org</hostid><filename>/doc</filename>
- (see also <xref linkend="subversion-primer"/>).</entry>
+ (see also <xref
+ linkend="svn-getting-started-doc-layout"/>).</entry>
</row>
<row>
@@ -101,12 +103,12 @@
Root</emphasis></entry>
<entry><literal>svn+ssh://</literal><hostid
role="fqdn">svn.FreeBSD.org</hostid><filename>/ports</filename>
- (see also <xref linkend="subversion-primer"/>).</entry>
+ (see also <xref
+ linkend="svn-getting-started-ports-layout"/>).</entry>
</row>
<row>
<entry><emphasis>Internal Mailing Lists</emphasis></entry>
-
<entry>developers (technically called all-developers),
doc-developers, doc-committers, ports-developers,
ports-committers, src-developers, src-committers. (Each
@@ -149,7 +151,7 @@
</tgroup>
</informaltable>
- <para>&man.ssh.1; is required to connect to the projecte hosts.
+ <para>&man.ssh.1; is required to connect to the project hosts.
For more information, see <xref linkend="ssh.guide"/>.</para>
<para>Useful links:</para>
@@ -389,7 +391,7 @@
<para>There are a few ways to obtain a working copy of the tree
from Subversion. This section will explain them.</para>
- <sect3>
+ <sect3 id="svn-getting-started-direct-checkout">
<title>Direct Checkout</title>
<para>The first is to check out directly from the main
@@ -456,7 +458,7 @@
</note>
</sect3>
- <sect3>
+ <sect3 id="svn-getting-started-checkout-from-a-mirror">
<title>Checkout from a Mirror</title>
<para>Check out a working copy from a mirror by
@@ -466,13 +468,14 @@
using <command>svnsync</command>.</para>
<para>There is a serious disadvantage to this method: every
- time something is to be committed, a <command>svn switch
- --relocate</command> to the master repository has to be
- done, remembering to <command>svn switch</command> back to
- the mirror after the commit. Also, since <command>svn
- switch</command> 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.</para>
+ time something is to be committed, a
+ <command>svn relocate</command> to the master repository has
+ to be done, remembering to <command>svn relocate</command>
+ back to the mirror after the commit. Also, since
+ <command>svn relocate</command> 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.</para>
<para>Unlike with <acronym>CVS</acronym>,
the hassle of a local
@@ -482,7 +485,7 @@
information on how to set one up.</para>
</sect3>
- <sect3 id="subversion-primer-base-layout">
+ <sect3 id="svn-getting-started-base-layout">
<title><literal>RELENG_*</literal> Branches and General
Layout</title>
@@ -542,7 +545,7 @@
</itemizedlist>
</sect3>
- <sect3>
+ <sect3 id="svn-getting-started-doc-layout">
<title>&os; Documentation Project Branches and
Layout</title>
@@ -583,7 +586,7 @@
</itemizedlist>
</sect3>
- <sect3>
+ <sect3 id="svn-getting-started-ports-layout">
<title>&os; Ports Tree Branches and Layout</title>
<para>In <literal>svn+ssh://svn.freebsd.org/ports</literal>,
@@ -626,12 +629,11 @@
<para>This section will explain how to perform common day-to-day
operations with Subversion.</para>
- <sect3>
+ <sect3 id="svn-daily-use-help">
<title>Help</title>
- <para><acronym>SVN</acronym>
- has built in help documentation. It can be accessed by
- typing the following command:</para>
+ <para><acronym>SVN</acronym> has built in help documentation.
+ It can be accessed by typing the following command:</para>
<screen>&prompt.user; <userinput>svn help</userinput></screen>
@@ -640,7 +642,7 @@
Book</ulink>.</para>
</sect3>
- <sect3>
+ <sect3 id="svn-daily-use-checkout">
<title>Checkout</title>
<para>As seen earlier, to check out the &os; head
@@ -703,7 +705,7 @@
</note>
</sect3>
- <sect3>
+ <sect3 id="svn-daily-use-anonymous-checkout">
<title>Anonymous Checkout</title>
<para>It is possible to anonymously check out the &os;
@@ -719,7 +721,7 @@
mirror sites</ulink>.</para>
</sect3>
- <sect3>
+ <sect3 id="svn-daily-use-updating-the-tree">
<title>Updating the Tree</title>
<para>To update a working copy to either the latest revision,
@@ -729,7 +731,7 @@
&prompt.user; <userinput>svn update -<replaceable>r12345</replaceable></userinput></screen>
</sect3>
- <sect3>
+ <sect3 id="svn-daily-use-status">
<title>Status</title>
<para>To view the local changes that have been made to the
@@ -743,12 +745,11 @@
<screen>&prompt.user; <userinput>svn status --show-updates</userinput></screen>
</sect3>
- <sect3>
+ <sect3 id="svn-daily-use-editing-and-committing">
<title>Editing and Committing</title>
- <para>Unlike Perforce,
- <acronym>SVN</acronym> does not
- need to be told in advance about file editing.</para>
+ <para>Unlike Perforce, <acronym>SVN</acronym> does not need to
+ be told in advance about file editing.</para>
<para><command>svn commit</command> works like the equivalent
<acronym>CVS</acronym> command. To commit all changes in
@@ -764,15 +765,15 @@
<screen>&prompt.user; <userinput>svn commit <replaceable>lib/libfetch</replaceable> <replaceable>usr/bin/fetch</replaceable></userinput></screen>
- <para>There is also a commit wrapper for the ports tree
- to handle the properties and sanity checking your
+ <para>There is also a commit wrapper for the ports tree to
+ handle the properties and sanity checking your
changes:</para>
<screen>&prompt.user; <userinput>/usr/ports/Tools/scripts/psvn commit
</userinput></screen>
</sect3>
- <sect3 id="subversion-primer-add-remove">
+ <sect3 id="svn-daily-use-adding-and-removing">
<title>Adding and Removing Files</title>
<note>
@@ -798,85 +799,88 @@
<screen>&prompt.user; <userinput>svn add <replaceable>foo</replaceable></userinput></screen>
+ <note>
+ <para>Most new source files should include a
+ <literal>$&os;$</literal> string in the
+ new file. On commit, <command>svn</command> will expand
+ the <literal>$&os;$</literal> 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
+ <literal>$&os;$</literal> string.</para>
+ </note>
+
<para>Files can be removed with <command>svn
remove</command>:</para>
<screen>&prompt.user; <userinput>svn remove <replaceable>foo</replaceable></userinput></screen>
- <para>Subversion does not require <command>rm</command>ing the
- file before <command>svn rm</command>ing it, and indeed
- complains if that happens.</para>
+ <para>Subversion does not require deleting the file before
+ using <command>svn rm</command>, and indeed complains if
+ that happens.</para>
- <para>It is possible to add directories with <command>svn
- add</command>:</para>
+ <para>It is possible to add directories with
+ <command>svn add</command>:</para>
<screen>&prompt.user; <userinput>mkdir <replaceable>bar</replaceable></userinput>
&prompt.user; <userinput>svn add <replaceable>bar</replaceable></userinput></screen>
- <para>Although <command>svn mkdir</command> makes this
- easier by combining the creation of the directory and the
- adding of it:</para>
+ <para>Although <command>svn mkdir</command> makes this easier
+ by combining the creation of the directory and the adding of
+ it:</para>
<screen>&prompt.user; <userinput>svn mkdir <replaceable>bar</replaceable></userinput></screen>
- <para>The directory is not immediately
- created in the repository when you use <command>svn
- mkdir</command>. Subversion
- allows directories to be removed using <command>svn
- rm</command>, however there is no <command>svn
- rmdir</command>:</para>
+ <para>Like files, directories are removed with
+ <command>svn rm</command>. There is no separate command
+ specifically for removing directories.</para>
<screen>&prompt.user; <userinput>svn rm <replaceable>bar</replaceable></userinput></screen>
</sect3>
- <sect3>
+ <sect3 id="svn-daily-use-copying-and-moving">
<title>Copying and Moving Files</title>
- <para>The following (obviously) creates a copy of
- <filename>foo.c</filename>, named
- <filename>bar.c</filename>:</para>
+ <para>This command creates a copy of
+ <filename>foo.c</filename> named <filename>bar.c</filename>,
+ with the new file also under version control:</para>
<screen>&prompt.user; <userinput>svn copy <replaceable>foo.c</replaceable> <replaceable>bar.c</replaceable></userinput></screen>
- <para>To move and rename a file:</para>
+ <para>The example above is equivalent to:</para>
- <screen>&prompt.user; <userinput>svn move <replaceable>foo.c</replaceable> <replaceable>bar.c</replaceable></userinput></screen>
+ <screen>&prompt.user; <userinput>cp foo.c bar.c</userinput>
+&prompt.user; <userinput>svn add bar.c</userinput></screen>
- <para>The above command is the exact equivalent of:</para>
+ <para>To move and rename a file:</para>
- <screen>&prompt.user; <userinput>svn copy <replaceable>foo.c</replaceable> <replaceable>bar.c</replaceable></userinput>
-&prompt.user; <userinput>svn remove <replaceable>foo.c</replaceable></userinput></screen>
+ <screen>&prompt.user; <userinput>svn move <replaceable>foo.c</replaceable> <replaceable>bar.c</replaceable></userinput></screen>
</sect3>
- <sect3>
+ <sect3 id="svn-daily-use-log-and-annotate">
<title>Log and Annotate</title>
- <para><command>svn log</command> 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 <command>cvs log</command>
- in that <acronym>CVS</acronym> shows the complete log for
- each file in the directory, including duplicate entries for
- revisions that affect multiple files.</para>
+ <para><command>svn log</command> 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.</para>
<para><command>svn annotate</command>, or equally <command>svn
- praise</command> or <command>svn blame</command>, is
- equivalent to <command>cvs annotate</command> in everything
- but output format.</para>
+ praise</command> or <command>svn blame</command>, shows
+ the most recent revision number and who committed that
+ revision for each line of a file.</para>
</sect3>
- <sect3>
+ <sect3 id="svn-daily-use-diffs">
<title>Diffs</title>
<para><command>svn diff</command> displays changes to the
- working copy of the repository. Diffs generated by
- <acronym>SVN</acronym> are unified
- and include new files by default
- in the diff output.</para>
-
- <para><command>svn
- diff</command> can show the changes between two revisions
- of the same file:</para>
+ working copy. Diffs generated by <acronym>SVN</acronym> are
+ unified and include new files by default in the diff
+ output.</para>
+
+ <para><command>svn diff</command> can show the changes between
+ two revisions of the same file:</para>
<screen>&prompt.user; <userinput>svn diff -r179453:179454 ROADMAP.txt</userinput></screen>
@@ -888,20 +892,19 @@
<screen>&prompt.user; <userinput>svn diff -c179454 .</userinput></screen>
</sect3>
- <sect3>
+ <sect3 id="svn-daily-use-reverting">
<title>Reverting</title>
<para>Local changes (including additions and deletions) can be
- reverted using <command>svn revert</command>.
- It does not update out-of-date
- files—it just replaces them with pristine copies of
- the original version.</para>
+ reverted using <command>svn revert</command>. It does not
+ update out-of-date files, but just replaces them with
+ pristine copies of the original version.</para>
</sect3>
- <sect3>
+ <sect3 id="svn-daily-use-conflicts">
<title>Conflicts</title>
- <para>If a <command>svn update</command> resulted in a merge
+ <para>If an <command>svn update</command> 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 @@
<listitem>
<para><literal>theirs-full</literal>: use the version that
- was retrieved when you did <command>svn
- update</command>, discarding your own changes.</para>
+ was retrieved when you did
+ <command>svn update</command>, discarding your own
+ changes.</para>
</listitem>
</itemizedlist>
</sect3>
@@ -950,27 +954,15 @@
<sect2>
<title>Advanced Use</title>
- <sect3>
+ <sect3 id="svn-advanced-use-sparse-checkouts">
<title>Sparse Checkouts</title>
- <para>The equivalent to <command>cvs checkout -l</command>,
- which checks out a directory without its subdirectories, is
- <command>svn checkout -N</command>. Unlike
- <acronym>CVS</acronym>, <acronym>SVN</acronym> remembers the
- <literal>-N</literal> so that a <command>svn
- update</command> does not end up pulling down the
- subdirectories. In Subversion 1.5 and newer,
- <literal>-N</literal> has been deprecated in favour of the
- <literal>--depth</literal> option which allows for precise
- control. Therefore:</para>
+ <para><acronym>SVN</acronym> allows
+ <emphasis>sparse</emphasis>, or partial checkouts of a
+ directory by adding <option>--depth</option> to a
+ <command>svn checkout</command>.</para>
- <screen>&prompt.user; <userinput>svn checkout -N svn+ssh://svn.freebsd.org/base ~/freebsd</userinput></screen>
-
- <para>is equivalent to:</para>
-
- <screen>&prompt.user; <userinput>svn checkout --depth=empty svn+ssh://svn.freebsd.org/base ~/freebsd</userinput></screen>
-
- <para>Valid arguments to <literal>--depth</literal>
+ <para>Valid arguments to <option>--depth</option>
are:</para>
<itemizedlist>
@@ -989,6 +981,7 @@
files and directories it contains, but none of the
subdirectories' contents.</para>
</listitem>
+
<listitem>
<para><literal>infinity</literal>: anything.</para>
</listitem>
@@ -1013,19 +1006,20 @@
<filename>ROADMAP.txt</filename> and empty subdirectories,
and nothing will happen when <command>svn update</command>
is executed on the subdirectories. However, the following
- command will set the depth for head (in this case) to
- infinity, and fully populate it:</para>
+ command will set the depth for
+ <replaceable>head</replaceable> (in this case) to infinity,
+ and fully populate it:</para>
<screen>&prompt.user; <userinput>svn update --set-depth=infinity <replaceable>head</replaceable></userinput></screen>
</sect3>
- <sect3>
+ <sect3 id="svn-advanced-use-direct-operation">
<title>Direct Operation</title>
<para>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:</para>
+ repository without touching the working copy. Specifically,
+ this applies to any operation that does not require editing
+ a file, including:</para>
<itemizedlist>
<listitem>
@@ -1058,8 +1052,8 @@
<screen>&prompt.user; <userinput>svn copy svn+ssh://svn.freebsd.org/base/head svn+ssh://svn.freebsd.org/base/stable/8</userinput></screen>
- <para>This is equivalent to the following set of
- commands which take minutes and hours as opposed to seconds,
+ <para>This is equivalent to the following set of commands
+ which take minutes and hours as opposed to seconds,
depending on your network connection:</para>
<screen>&prompt.user; <userinput>svn checkout --depth=immediates svn+ssh://svn.freebsd.org/base</userinput>
@@ -1069,7 +1063,7 @@
&prompt.user; <userinput>svn commit stable/8</userinput></screen>
</sect3>
- <sect3 id="subversion-primer-merge">
+ <sect3 id="svn-advanced-use-merging">
<title>Merging with <acronym>SVN</acronym></title>
<para>This section deals with merging code from one branch to
@@ -1096,15 +1090,15 @@
<para>It is <emphasis>not</emphasis> inherited. For
instance, <filename
- class="directory">stable/6/contrib/openpam/</filename>
- does not implicitly inherit mergeinfo from <filename
- class="directory">stable/6/</filename>, or <filename
- class="directory">stable/6/contrib/</filename>. Doing
- so would make partial checkouts very hard to manage.
+ class="directory">stable/6/contrib/openpam/</filename>
+ does not implicitly inherit mergeinfo from
+ <filename class="directory">stable/6/</filename>, or
+ <filename class="directory">stable/6/contrib/</filename>.
+ Doing so would make partial checkouts very hard to manage.
Instead, mergeinfo is explicitly propagated down the tree.
- For merging something into <filename
- class="directory">branch/foo/bar/</filename>, the
- following rules apply:</para>
+ For merging something into
+ <filename class="directory">branch/foo/bar/</filename>,
+ the following rules apply:</para>
<orderedlist>
<listitem>
@@ -1126,9 +1120,9 @@
</listitem>
<listitem>
- <para>If a direct descendant of <filename
- class="directory">branch/foo/bar/</filename> (for
- instance, <filename
+ <para>If a direct descendant of
+ <filename class="directory">branch/foo/bar/</filename>
+ (for instance, <filename
class="directory">branch/foo/bar/baz/</filename>)
already has a mergeinfo record, information about the
current merge will be propagated down to it.</para>
@@ -1177,9 +1171,10 @@
<para>Changes to kernel code should be merged to
<filename class="directory">sys/</filename>. For
instance, a change to the &man.ichwd.4; driver should
- be merged to <filename
- class="directory">sys/</filename>, not <filename
- class="directory">sys/dev/ichwd/</filename>.
+ be merged to
+
+ <filename class="directory">sys/</filename>, not
+ <filename class="directory">sys/dev/ichwd/</filename>.
Likewise, a change to the TCP/IP stack should be
merged to <filename class="directory">sys/</filename>,
not <filename
@@ -1187,18 +1182,19 @@
</listitem>
<listitem>
- <para>Changes to code under <filename
- class="directory">etc/</filename> should be merged
- at <filename class="directory">etc/</filename>, not
- below it.</para>
+ <para>Changes to code under
+ <filename class="directory">etc/</filename> should be
+ merged at <filename class="directory">etc/</filename>,
+ not below it.</para>
</listitem>
<listitem>
- <para>Changes to vendor code (code in <filename
- class="directory">contrib/</filename>, <filename
- class="directory">crypto/</filename> and so on)
- should be merged to the directory where vendor imports
- happen. For instance, a change to <filename
+ <para>Changes to vendor code (code in
+
+ <filename class="directory">contrib/</filename>,
+ <filename class="directory">crypto/</filename> and so
+ on) should be merged to the directory where vendor
+ imports happen. For instance, a change to <filename
class="directory">crypto/openssl/util/</filename>
should be merged to <filename
class="directory">crypto/openssl/</filename>. This
@@ -1244,11 +1240,12 @@
</listitem>
<listitem>
- <para>Other changes to <filename
- class="directory">share/</filename> should be merged
- to the appropriate subdirectory and not to
+ <para>Other changes to
+ <filename class="directory">share/</filename> should
+ be merged to the appropriate subdirectory and not to
<filename class="directory">share/</filename>
directly.</para>
+
</listitem>
<listitem>
@@ -1385,12 +1382,12 @@ $target - head/$source:$P,$Q,$R</screen>
in r238987 is to be merged from CURRENT to 9-STABLE.
The file resides in <filename
class="directory">head/share/man/man4</filename> and
- according to <xref linkend="subversion-primer-merge"/>
+ according to <xref linkend="svn-advanced-use-merging"/>
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
- <xref linkend="subversion-primer-base-layout"/>.</para>
+ layout, see <xref
+ linkend="svn-getting-started-base-layout"/>.</para>
<para>The first step is to inspect the existing
mergeinfo.</para>
@@ -1467,7 +1464,7 @@ U stable/9/share/man/man4/netmap.4
</sect4>
</sect3>
- <sect3>
+ <sect3 id="svn-advanced-use-vendor-imports">
<title>Vendor Imports with <acronym>SVN</acronym></title>
<important>
@@ -1781,7 +1778,7 @@ U stable/9/share/man/man4/netmap.4
</sect4>
</sect3>
- <sect3>
+ <sect3 id="svn-advanced-use-reverting-a-commit">
<title>Reverting a Commit</title>
<para>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.</para>
</sect3>
- <sect3>
+ <sect3 id="svn-advanced-use-fixing-mistakes">
<title>Fixing Mistakes</title>
<para>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.</para>
</sect3>
- <sect3>
+ <sect3 id="svn-advanced-use-setting-up-svnsync">
<title>Setting up a <application>svnsync</application>
Mirror</title>
@@ -1895,7 +1892,7 @@ U stable/9/share/man/man4/netmap.4
<para>Use <literal>propset</literal> to change things.</para>
</sect3>
- <sect3>
+ <sect3 id="svn-advanced-use-committing-high-ascii-data">
<title>Committing High-<acronym>ASCII</acronym> Data</title>
<para>Files that have high-<acronym>ASCII</acronym> bits are
@@ -1913,7 +1910,7 @@ U stable/9/share/man/man4/netmap.4
<screen>&prompt.user; <userinput>svn propset fbsd:notbinary yes foo.data</userinput></screen>
</sect3>
- <sect3>
+ <sect3 id="svn-advanced-use-maintaining-a-project-branch">
<title>Maintaining a Project Branch</title>
<para>A project branch is one that is synced to head (or
@@ -2034,11 +2031,11 @@ ControlPersist yes</screen>
<command>svn:keywords</command> property will be
rejected when attempting to commit them to the
repository. Be sure to read
- <xref linkend="subversion-primer-add-remove"/> regarding
- adding and removing files, in addition to verifying that
- <filename>~/.subversion/config</filename> contains the
- necessary "auto-props" entries from
- <filename>auto-props.txt</filename> mentioned
+ <xref linkend="svn-daily-use-adding-and-removing"/>
+ regarding adding and removing files, in addition to
+ verifying that <filename>~/.subversion/config</filename>
+ contains the necessary "auto-props" entries
+ from <filename>auto-props.txt</filename> mentioned
there.</para>
</important>
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 @@
</listitem>
<listitem>
- <para>Luiz Otavio O Souza
- <email>loos.br at gmail.com</email></para>
- </listitem>
-
- <listitem>
<para>Lukasz Stelmach
<email>lukasz.stelmach at iem.pw.edu.pl</email></para>
</listitem>
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 @@
</listitem>
<listitem>
+ <para>&a.loos.email;</para>
+ </listitem>
+
+ <listitem>
<para>&a.uqs.email;</para>
</listitem>
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 @@
</row>
<row>
- <entry colname="col2" spanname="2to5">Together these
+ <entry spanname="2to5">Together these
bits specify the number of bits in each data
word.</entry>
</row>
@@ -1636,35 +1636,35 @@
<row>
<entry colname="col2">1</entry>
<entry colname="col3">0</entry>
- <entry colname="col4" spanname="4to5">Word
+ <entry spanname="4to5">Word
Length</entry>
</row>
<row>
<entry colname="col2">0</entry>
<entry colname="col3">0</entry>
- <entry colname="col4" spanname="4to5">5 Data
+ <entry spanname="4to5">5 Data
Bits</entry>
</row>
<row>
<entry colname="col2">0</entry>
<entry colname="col3">1</entry>
- <entry colname="col4" spanname="4to5">6 Data
+ <entry spanname="4to5">6 Data
Bits</entry>
</row>
<row>
<entry colname="col2">1</entry>
<entry colname="col3">0</entry>
- <entry colname="col4" spanname="4to5">7 Data
+ <entry spanname="4to5">7 Data
Bits</entry>
</row>
<row>
<entry colname="col2">1</entry>
<entry colname="col3">1</entry>
- <entry colname="col4" spanname="4to5">8 Data
+ <entry spanname="4to5">8 Data
Bits</entry>
</row>
</tbody>
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
<ulink
url="http://en.wikipedia.org/wiki/GUID_Partition_Table">GUID
Partition Tables</ulink>.</para>
+
+ <para>The link text can be omitted to show the actual
+ URL:</para>
+
+ <programlisting><![CDATA[<para>Wikipedia has an excellent reference on
+ GUID Partition Tables: <ulink
+ url="http://en.wikipedia.org/wiki/GUID_Partition_Table"></ulink>.</para>]]></programlisting>
+
+ <para>Appearance:</para>
+
+ <para>Wikipedia has an excellent reference on
+ GUID Partition Tables: <ulink
+ url="http://en.wikipedia.org/wiki/GUID_Partition_Table"></ulink>.</para>
</example>
</sect3>
</sect2>
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 <ulink
url="&url.books.handbook;/subversion-mirrors.html">Subversion
mirror sites</ulink>. If <filename
- role="directory">/usr/doc</filename> already exists, move
+ class="directory">/usr/doc</filename> already exists, move
or delete it first to prevent file conflicts.</para>
<screen>&prompt.user; <userinput>svn checkout https://<replaceable>svn0.us-west.FreeBSD.org</replaceable>/doc/head <replaceable>/usr/doc</replaceable></userinput></screen>
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 …</lite
not on this list, ask about it on the &a.doc;.</para>
<informaltable frame="none" pgwide="0">
- <tgroup cols="2">
+ <tgroup cols="3">
<thead>
<row>
<entry>Word</entry>
<entry>XML Code</entry>
+ <entry>Notes</entry>
</row>
</thead>
@@ -544,7 +545,6 @@ GB. Hardware compression …</lite
<row>
<entry>Ports Collection</entry>
- <entry>Ports Collection</entry>
</row>
<row>
@@ -556,6 +556,19 @@ GB. Hardware compression …</lite
</row>
<row>
+ <entry>Subversion</entry>
+
+ <entry><sgmltag
+ class="starttag">application</sgmltag><literal>Subversion</literal><sgmltag
+ class="endtag">application</sgmltag></entry>
+ <entry>Do not refer to the Subversion application as
+ <literal>SVN</literal> in upper case. To refer to the
+ command, use <sgmltag
+ class="starttag">command</sgmltag><literal>svn</literal><sgmltag
+ class="endtag">command</sgmltag>.</entry>
+ </row>
+
+ <row>
<entry>&unix;</entry>
<entry><literal>&unix;</literal></entry>
</row>
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 @@
<!ENTITY chap.disks SYSTEM "disks/chapter.xml">
<!ENTITY chap.geom SYSTEM "geom/chapter.xml">
<!ENTITY chap.filesystems SYSTEM "filesystems/chapter.xml">
- <!ENTITY chap.vinum SYSTEM "vinum/chapter.xml">
<!ENTITY chap.virtualization SYSTEM "virtualization/chapter.xml">
<!ENTITY chap.l10n SYSTEM "l10n/chapter.xml">
<!ENTITY chap.cutting-edge SYSTEM "cutting-edge/chapter.xml">
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.
<indexterm><primary>snapshot</primary></indexterm>
- <para>&os.current; is the latest working sources for &os;.
+ <para>&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</para>
+ source code was synced.</para>
</sect3>
<sect3>
@@ -1288,13 +1288,13 @@ Fetching 133 new ports or files... done.
</listitem>
<listitem>
- <para>A quick way of getting bug fixes, though the fix is
+ <para>A quick way of getting bug fixes. Any given commit is
just as likely to introduce new bugs as to fix existing
ones.</para>
</listitem>
<listitem>
- <para>In no way <quote>officially
+ <para>In any way <quote>officially
supported</quote>.</para>
</listitem>
</orderedlist>
@@ -1467,7 +1467,7 @@ Fetching 133 new ports or files... done.
<para>For these reasons, one should <emphasis>not</emphasis>
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.</para>
<para>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.</para>
- <para>Join the relevant <application>SVN</application>
+ <para>Join the relevant <application>svn</application>
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.
</listitem>
<listitem>
- <para>To install a new system in order to run monthly
+ <para>To install a new system running monthly
snapshots built from &os.stable;, refer to <ulink
- url="&url.base;/snapshots/">Snapshots</ulink>for more
+ url="&url.base;/snapshots/">Snapshots</ulink> for more
information. Alternatively, it is possible to install
the most recent &os.stable; release from the <link
linkend="mirrors">mirror sites</link> and follow the
@@ -1569,13 +1569,6 @@ Fetching 133 new ports or files... done.
</listitem>
<listitem>
- <para>If you need rapid on-demand access to the source and
- communications bandwidth is not a consideration, use
- <application>Subversion</application>. Otherwise, use
- <application>CTM</application>.</para>
- </listitem>
-
- <listitem>
<indexterm>
<primary>-STABLE</primary>
<secondary>compiling</secondary>
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:</para>
<informaltable frame="none" pgwide="1">
- <tgroup cols="3">
+ <tgroup cols="4">
<thead>
<row>
<entry>Type of Application</entry>
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"</programlisting
<screen>&prompt.root; <userinput>gbde detach /dev/ad4s1c</userinput></screen>
- <para>Also, since &man.vinum.4; does not use the
- &man.geom.4; subsystem,
- <application>gbde</application> can not be used with
- <application>vinum</application> volumes.</para>
</sect3>
</sect2>
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 @@
</listitem>
<listitem>
- <para><xref linkend="vinum-vinum"/>, 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.</para>
- </listitem>
-
- <listitem>
<para>A troubleshooting section has been added to <xref
linkend="ppp-and-slip"/>, PPP and SLIP.</para>
</listitem>
@@ -493,15 +486,6 @@
</listitem>
</varlistentry>
<varlistentry>
- <term><emphasis><xref linkend="vinum-vinum"/>,
*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
More information about the svn-doc-projects
mailing list