From owner-svn-doc-all@FreeBSD.ORG Sun Jun 30 23:26:59 2013 Return-Path: Delivered-To: svn-doc-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id 04172357; Sun, 30 Jun 2013 23:26:59 +0000 (UTC) (envelope-from wblock@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 D40F51F92; Sun, 30 Jun 2013 23:26:58 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r5UNQwRq073837; Sun, 30 Jun 2013 23:26:58 GMT (envelope-from wblock@svn.freebsd.org) Received: (from wblock@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r5UNQwEQ073836; Sun, 30 Jun 2013 23:26:58 GMT (envelope-from wblock@svn.freebsd.org) Message-Id: <201306302326.r5UNQwEQ073836@svn.freebsd.org> From: Warren Block Date: Sun, 30 Jun 2013 23:26:58 +0000 (UTC) To: doc-committers@freebsd.org, svn-doc-all@freebsd.org, svn-doc-head@freebsd.org Subject: svn commit: r42101 - head/en_US.ISO8859-1/articles/committers-guide X-SVN-Group: doc-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-doc-all@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "SVN commit messages for the entire doc trees \(except for " user" , " projects" , and " translations" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 30 Jun 2013 23:26:59 -0000 Author: wblock Date: Sun Jun 30 23:26:58 2013 New Revision: 42101 URL: http://svnweb.freebsd.org/changeset/doc/42101 Log: Whitespace-only fixes. Translators, please ignore. Modified: head/en_US.ISO8859-1/articles/committers-guide/article.xml Modified: head/en_US.ISO8859-1/articles/committers-guide/article.xml ============================================================================== --- head/en_US.ISO8859-1/articles/committers-guide/article.xml Sun Jun 30 23:11:05 2013 (r42100) +++ head/en_US.ISO8859-1/articles/committers-guide/article.xml Sun Jun 30 23:26:58 2013 (r42101) @@ -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 @@ -467,12 +469,13 @@ There is a serious disadvantage to this method: every 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. + 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 @@ -629,9 +632,8 @@ 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 @@ -746,9 +748,8 @@ 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,8 +765,8 @@ &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 @@ -814,19 +815,19 @@ &prompt.user; svn remove foo - Subversion does not require deleting the - file before using svn rm, 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 @@ -841,8 +842,8 @@ Copying and Moving Files This command creates a copy of - foo.c named - bar.c, with the new file also under version control: + foo.c named bar.c, + with the new file also under version control: &prompt.user; svn copy foo.c bar.c @@ -859,10 +860,10 @@ Log and Annotate - 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 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, shows @@ -874,14 +875,12 @@ Diffs svn diff displays changes to the - 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: + 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 @@ -897,10 +896,9 @@ Reverting Local changes (including additions and deletions) can be - reverted using svn revert. - It does not update out-of-date - files, but 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. @@ -945,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. @@ -982,6 +981,7 @@ files and directories it contains, but none of the subdirectories' contents. + infinity: anything. @@ -1006,8 +1006,9 @@ 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 @@ -1016,9 +1017,9 @@ 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: @@ -1051,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 @@ -1089,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: @@ -1119,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. @@ -1170,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 @@ -1237,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. + @@ -1382,8 +1386,8 @@ $target - head/$source:$P,$Q,$R 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. @@ -2027,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.