os/doc
3
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

- Link to Subversion Primer in Committer's Guide rather than the wiki

Browse source 
- Use <note> rather than "It is important to note that"
- Grammar fixes

PR:		165920
Submitted by:	crees
This commit is contained in:
Glen Barber 2012-03-11 15:32:12 +00:00
parent 3aa8133e89
commit 53f56c7b9d
Notes: svn2git 2020-12-08 03:00:23 +00:00 
svn path=/head/; revision=38584
1 changed files with 17 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
en_US.ISO8859-1/articles/committers-guide/article.sgml
View file

@ -857,10 +857,9 @@ alias projcvs cvs -d <replaceable>user</replaceable>@projcvs.FreeBSD.org:/home/p
</table>
<para>The following are some Subversion examples related to the
src repository. More (in-depth) information can be found at
<ulink
url="http://wiki.freebsd.org/SubversionPrimer">Subversion
Primer</ulink> and <ulink
src repository. More (in-depth) information can be found in
the Subversion Primer at <xref linkend="subversion-primer">
and <ulink
url="http://wiki.freebsd.org/SubversionMissing">List of
things missing in Subversion when compared to CVS</ulink>.
The notes at <ulink
@ -1222,7 +1221,7 @@ Host pcvs.FreeBSD.org
<para>The local <acronym>SVK</acronym> repository will be
stored in <filename
class="directory">~/.svk/local/</filename>, but can be
moved to whereever suits. If it is moved,
moved to an alternate location. If it is moved,
<filename>~/.svk/config</filename> should be amended
manually to reflect the move.</para>
@ -1246,8 +1245,7 @@ Host pcvs.FreeBSD.org
already.</para>
</note>
<para>To use &a.peter;'s tarball mentioned in the note
above:</para>
<para>To use the tarball referenced above:</para>
<screen>&prompt.user; <userinput>cd ~</userinput>
&prompt.user; <userinput>scp freefall:/home/peter/dot_svk_r179646.tbz2 .</userinput>
@ -1444,8 +1442,10 @@ Host pcvs.FreeBSD.org
<literal>stable/7</literal>; it will not pull down the whole
tree.</para>
<para>It is useful to note that decreasing the depth of a
working copy is not possible.</para>
<note>
<para>Decreasing the depth of a working copy is not
possible.</para>
</note>
</sect3>
<sect3>
@ -1494,13 +1494,13 @@ Host pcvs.FreeBSD.org
<acronym>SVN</acronym> and <acronym>SVK</acronym> do not
need to be told in advance about file editing.</para>
<para><command>svn commit</command>works like the equivalent
<para><command>svn commit</command> works like the equivalent
<acronym>CVS</acronym> command. To commit all changes in
the current directory and all subdirectories:</para>
<screen>&prompt.user; <userinput>svn commit</userinput></screen>
<para>To commit all changes in, for example, the <filename
<para>To commit all changes in, for example, <filename
class="directory"><replaceable>lib/libfetch/</replaceable></filename>
and <filename
class="directory"><replaceable>usr/bin/fetch/</replaceable></filename>
@ -1606,13 +1606,13 @@ Host pcvs.FreeBSD.org
<sect3>
<title>Diffs</title>
<para>The <command>svn diff</command> displays changes to the
working copy of the repository. <acronym>SVN</acronym>'s
diffs are unified by default, unlike
<acronym>CVS</acronym>'s, and <acronym>SVN</acronym>'s
include new files by default in the diff output.</para>
<para><command>svn diff</command> displays changes to the
working copy of the repository. Diffs generated by
<acronym>SVN</acronym> are unified by default, unlike
<acronym>CVS</acronym>, and include new files by default
in the diff output.</para>
<para>Like <command>cvs diff</command>, <command>svn
<para>As with <acronym>CVS</acronym>, <command>svn
diff</command> can show the changes between two revisions
of the same file:</para>