Date: Sun, 11 Mar 2012 09:15:53 GMT From: Chris Rees <crees@physics.org> To: FreeBSD-gnats-submit@FreeBSD.org Subject: docs/165920: [PATCH] Committer's Guide: Various fixes Message-ID: <201203110915.q2B9FrWK062263@pegasus.bayofrum.net> Resent-Message-ID: <201203110920.q2B9K9EN097883@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 165920 >Category: docs >Synopsis: [PATCH] Committer's Guide: Various fixes >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-doc >State: open >Quarter: >Keywords: >Date-Required: >Class: doc-bug >Submitter-Id: current-users >Arrival-Date: Sun Mar 11 09:20:09 UTC 2012 >Closed-Date: >Last-Modified: >Originator: Chris Rees >Release: FreeBSD 9.0-RELEASE amd64 >Organization: >Environment: System: FreeBSD pegasus.bayofrum.net 9.0-RELEASE FreeBSD 9.0-RELEASE #0: Sat Jan 28 15:45:27 GMT 2012 root@pegasus.bayofrum.net:/usr/obj/usr/src/sys/PEGASUS amd64 >Description: - Link to Subversion Primer in Committer's Guide rather than the wiki - Use <note> rather than "It is important to note that" - Spelling fixes >How-To-Repeat: >Fix: --- patch.txt begins here --- ? article.html ? docbook.css ? patch.txt Index: article.sgml =================================================================== RCS file: /home/dcvs/doc/en_US.ISO8859-1/articles/committers-guide/article.sgml,v retrieving revision 1.312 diff -u -r1.312 article.sgml --- article.sgml 11 Mar 2012 01:17:35 -0000 1.312 +++ article.sgml 11 Mar 2012 09:12:58 -0000 @@ -857,10 +857,8 @@ </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 +1220,7 @@ <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 wherever suits. If it is moved, <filename>~/.svk/config</filename> should be amended manually to reflect the move.</para> @@ -1246,8 +1244,7 @@ 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 +1441,9 @@ <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 +1492,13 @@ <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,14 +1604,14 @@ <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 - diff</command> can show the changes between two revisions + <para>As with <acronym>CVS</acronym>, <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> --- patch.txt ends here --- -- This message has been scanned for viruses and dangerous content by MailScanner, and is believed to be clean. >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201203110915.q2B9FrWK062263>