From owner-svn-doc-all@FreeBSD.ORG Sun Jun 30 01:37:37 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 AA804FBB; Sun, 30 Jun 2013 01:37:37 +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 8CB621CC5; Sun, 30 Jun 2013 01:37:37 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r5U1bbQn091552; Sun, 30 Jun 2013 01:37:37 GMT (envelope-from wblock@svn.freebsd.org) Received: (from wblock@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r5U1bbqA091551; Sun, 30 Jun 2013 01:37:37 GMT (envelope-from wblock@svn.freebsd.org) Message-Id: <201306300137.r5U1bbqA091551@svn.freebsd.org> From: Warren Block Date: Sun, 30 Jun 2013 01:37:37 +0000 (UTC) To: doc-committers@freebsd.org, svn-doc-all@freebsd.org, svn-doc-head@freebsd.org Subject: svn commit: r42088 - 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 01:37:37 -0000 Author: wblock Date: Sun Jun 30 01:37:37 2013 New Revision: 42088 URL: http://svnweb.freebsd.org/changeset/doc/42088 Log: Additional 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 01:00:50 2013 (r42087) +++ head/en_US.ISO8859-1/articles/committers-guide/article.xml Sun Jun 30 01:37:37 2013 (r42088) @@ -140,7 +140,6 @@ Noteworthy src/ SVN Branches - stable/8 (8.X-STABLE), stable/9 (9.X-STABLE), @@ -241,30 +240,36 @@ in src/ - doc committers may commit documentation - changes to src files, such as man pages, READMEs, fortune - databases, calendar files, and comment fixes without - approval from a src committer, subject to the normal care - and tending of commits. - - doc committers may commit minor src changes - and fixes, such as build fixes, small features, etc, with an - "Approved by" from a src committer. - - doc committers may seek an upgrade to a src - commit bit by acquiring a mentor, who will propose the doc - committer to core. When approved, they will be added to - 'access' and the normal mentoring period will ensue, which - will involve a continuing of Approved by for - some period. - - "Approved by" is only acceptable from - non-mentored src committers -- mentored committers can - provide a "Reviewed by" but not an "Approved - by". + + doc committers may commit documentation changes to src + files, such as man pages, READMEs, fortune databases, + calendar files, and comment fixes without approval from a + src committer, subject to the normal care and tending of + commits. + + + + doc committers may commit minor src changes and fixes, + such as build fixes, small features, etc, with an + "Approved by" from a src committer. + + + + doc committers may seek an upgrade to a src commit bit + by acquiring a mentor, who will propose the doc committer + to core. When approved, they will be added to 'access' + and the normal mentoring period will ensue, which will + involve a continuing of Approved by for + some period. + + + + "Approved by" is only acceptable from non-mentored src + committers -- mentored committers can provide a "Reviewed + by" but not an "Approved by". + - @@ -336,30 +341,37 @@ Commits are atomic. + Revision numbers apply across the repository—all files that were modified in the same commit have the same revision number. + Branching and tagging are namespace operations. + Directories are versioned. + Files and directories can have arbitrary, versioned metadata attached to them. + Files and directories can be copied, with full history tracking. + No more contortions due to CVS weakness such as applying &man.patch.1; files at compile time in order to avoid touching vendor branch code. + No more repo-copies. @@ -520,6 +532,7 @@ releng and release directories. + /projects and /user feature a branch work area, @@ -557,11 +570,13 @@ code for articles written by various &os; contributors. + /books/ contains the source code for the different books, such as the &os; Handbook. + /htdocs/ contains the source code for the &os; website. @@ -909,18 +924,21 @@ working directory (which one presumes has been edited to resolve the conflicts). + base: use a pristine copy of the version you had before svn update, discarding your own changes, the conflicting changes, and possibly other intervening changes as well. + mine-full: use what you had before svn update, including your own changes, but discarding the conflicting changes, and possibly other intervening changes as well. + theirs-full: use the version that was retrieved when you did svn @@ -961,10 +979,12 @@ empty: the directory itself without any of its contents. + files: the directory and any files it contains. + immediates: the directory and any files and directories it contains, but none of the @@ -1013,18 +1033,22 @@ log, diff + mkdir + remove, copy, rename + propset, propedit, propdel + merge @@ -1311,13 +1335,16 @@ revision $R + in directory $target in stable branch $B + from directory $source in head + $FSVN is svn+ssh://svn.freebsd.org/base @@ -1531,6 +1558,7 @@ U stable/9/share/man/man4/netmap.4 similar, and putting the svn commit off until the end of the process. + Cleaning Up @@ -1634,6 +1662,7 @@ U stable/9/share/man/man4/netmap.4 svn stat and svn diff commands. + Tagging @@ -1858,9 +1887,9 @@ U stable/9/share/man/man4/netmap.4 The seed mirror is set to fetch from svn://svn.freebsd.org/base. The - configuration for the mirror is stored in revprop - 0 on the local mirror. To see the - configuration, try: + configuration for the mirror is stored in + revprop 0 on the local mirror. To see + the configuration, try: &prompt.user; svn proplist -v --revprop -r 0 file:///home/svnmirror/base @@ -1929,6 +1958,7 @@ U stable/9/share/man/man4/netmap.4 To collapse everything back at the end: &prompt.user; svn write me + --> @@ -1950,8 +1980,9 @@ ControlPath ~/.ssh/sockets/master-%l-%r@ ControlMaster auto ControlPersist yes - and then typing - mkdir ~/.ssh/sockets + and then typing + + mkdir ~/.ssh/sockets Checking out a working copy with a stock Subversion client without &os;-specific patches