From owner-svn-src-user@FreeBSD.ORG  Fri Mar 29 11:53:58 2013
Return-Path: <owner-svn-src-user@FreeBSD.ORG>
Delivered-To: svn-src-user@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by hub.freebsd.org (Postfix) with ESMTP id 475CCC36;
 Fri, 29 Mar 2013 11:53:58 +0000 (UTC) (envelope-from des@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 3A86EDB5;
 Fri, 29 Mar 2013 11:53:58 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r2TBrwJJ070959;
 Fri, 29 Mar 2013 11:53:58 GMT (envelope-from des@svn.freebsd.org)
Received: (from des@localhost)
 by svn.freebsd.org (8.14.6/8.14.5/Submit) id r2TBrwM7070958;
 Fri, 29 Mar 2013 11:53:58 GMT (envelope-from des@svn.freebsd.org)
Message-Id: <201303291153.r2TBrwM7070958@svn.freebsd.org>
From: Dag-Erling Smørgrav <des@FreeBSD.org>
Date: Fri, 29 Mar 2013 11:53:58 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
Subject: svn commit: r248875 - user/des/tinderbox
X-SVN-Group: user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the experimental &quot; user&quot;
 src tree" <svn-src-user.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-user>,
 <mailto:svn-src-user-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-user>
List-Post: <mailto:svn-src-user@freebsd.org>
List-Help: <mailto:svn-src-user-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
 <mailto:svn-src-user-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 29 Mar 2013 11:53:58 -0000

Author: des
Date: Fri Mar 29 11:53:57 2013
New Revision: 248875
URL: http://svnweb.freebsd.org/changeset/base/248875

Log:
  Update and correct the documentation of the --branch option.

Modified:
  user/des/tinderbox/tinderbox.1

Modified: user/des/tinderbox/tinderbox.1
==============================================================================
--- user/des/tinderbox/tinderbox.1	Fri Mar 29 11:53:20 2013	(r248874)
+++ user/des/tinderbox/tinderbox.1	Fri Mar 29 11:53:57 2013	(r248875)
@@ -25,7 +25,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd February 5, 2012
+.Dd March 29, 2013
 .Dt TINDERBOX 1
 .Os
 .Sh NAME
@@ -53,21 +53,26 @@ The default value is whatever the host s
 .Xr uname 1
 reports.
 .It Fl -branch Ns = Ns Ar BRANCH
-The branch to specify to
+The branch to check out from
+.Xr svn 1 ,
 .Xr cvs 1
 or
 .Xr cvsup 1
 when updating the source tree.
-Ignored when using
-.Xr svn 1 .
-The default is to use
-.Fl A
-instead, to get the head.
-Specifying
-.Va HEAD
-as the argument to
-.Fl -branch
-is equivalent to leaving it unspecified.
+The default is to check out HEAD.
+When using
+.Xr svn 1 ,
+.Xr cvs 1 Ns -style
+branch names are translated to
+.Xr svn 1
+paths; for instance,
+.Dv RELENG_9
+becomes
+.Pa stable/9
+and
+.Dv RELENG_9_1
+becomes
+.Pa releng/9.1 .
 .It Fl -cvsup Ns = Ns Ar NAME
 The name of the
 .Xr cvsup 1