From owner-freebsd-doc@FreeBSD.ORG Sun Mar 11 09:20:11 2012 Return-Path: Delivered-To: freebsd-doc@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 38F4A1065676 for ; Sun, 11 Mar 2012 09:20:11 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id AA02E8FC1A for ; Sun, 11 Mar 2012 09:20:09 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.5/8.14.5) with ESMTP id q2B9K98H097884 for ; Sun, 11 Mar 2012 09:20:09 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.5/8.14.5/Submit) id q2B9K9EN097883; Sun, 11 Mar 2012 09:20:09 GMT (envelope-from gnats) Resent-Date: Sun, 11 Mar 2012 09:20:09 GMT Resent-Message-Id: <201203110920.q2B9K9EN097883@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-doc@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Chris Rees Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id E689F1065743 for ; Sun, 11 Mar 2012 09:16:14 +0000 (UTC) (envelope-from crees@pegasus.bayofrum.net) Received: from mk-outboundfilter-2.mail.uk.tiscali.com (mk-outboundfilter-2.mail.uk.tiscali.com [212.74.114.38]) by mx1.freebsd.org (Postfix) with ESMTP id 6AE2E8FC1D for ; Sun, 11 Mar 2012 09:16:13 +0000 (UTC) Received: from host-2-102-107-151.as13285.net (HELO pegasus.bayofrum.net) ([2.102.107.151]) by smtp.pipex.tiscali.co.uk with ESMTP; 11 Mar 2012 09:16:12 +0000 Received: from pegasus.bayofrum.net (localhost [127.0.0.1]) by pegasus.bayofrum.net (8.14.5/8.14.5) with ESMTP id q2B9FrPB062264 (version=TLSv1/SSLv3 cipher=DHE-DSS-AES256-SHA bits=256 verify=NO) for ; Sun, 11 Mar 2012 09:15:53 GMT (envelope-from crees@pegasus.bayofrum.net) Received: (from crees@localhost) by pegasus.bayofrum.net (8.14.5/8.14.5/Submit) id q2B9FrWK062263; Sun, 11 Mar 2012 09:15:53 GMT (envelope-from crees) Message-Id: <201203110915.q2B9FrWK062263@pegasus.bayofrum.net> Date: Sun, 11 Mar 2012 09:15:53 GMT From: Chris Rees To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: Subject: docs/165920: [PATCH] Committer's Guide: Various fixes X-BeenThere: freebsd-doc@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: Chris Rees List-Id: Documentation project List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 11 Mar 2012 09:20:11 -0000 >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 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 @@ The following are some Subversion examples related to the - src repository. More (in-depth) information can be found at - Subversion - Primer and and List of things missing in Subversion when compared to CVS. The notes at The local SVK repository will be stored in ~/.svk/local/, but can be - moved to whereever suits. If it is moved, + moved to wherever suits. If it is moved, ~/.svk/config should be amended manually to reflect the move. @@ -1246,8 +1244,7 @@ already. - To use &a.peter;'s tarball mentioned in the note - above: + To use the tarball referenced above: &prompt.user; cd ~ &prompt.user; scp freefall:/home/peter/dot_svk_r179646.tbz2 . @@ -1444,8 +1441,9 @@ stable/7; it will not pull down the whole tree. - It is useful to note that decreasing the depth of a - working copy is not possible. + + Decreasing the depth of a working copy is not possible. + @@ -1494,13 +1492,13 @@ SVN and SVK do not need to be told in advance about file editing. - svn commitworks like the equivalent + svn commit works like the equivalent CVS command. To commit all changes in the current directory and all subdirectories: &prompt.user; svn commit - To commit all changes in, for example, the To commit all changes in, for example, lib/libfetch/ and usr/bin/fetch/ @@ -1606,14 +1604,14 @@ Diffs - The svn diff displays changes to the - working copy of the repository. SVN's - diffs are unified by default, unlike - CVS's, and SVN's - include new files by default in the diff output. + svn diff displays changes to the + working copy of the repository. Diffs generated by + SVN are unified by default, unlike + CVS, and include new files by default + in the diff output. - Like cvs diff, svn - diff can show the changes between two revisions + As with CVS, svn diff can + show the changes between two revisions of the same file: &prompt.user; svn diff -r179453:179454 ROADMAP.txt --- 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: