From bryan@shatow.net  Mon Apr 30 19:09:38 2012
Return-Path: <bryan@shatow.net>
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 9EE02106564A
	for <FreeBSD-gnats-submit@freebsd.org>; Mon, 30 Apr 2012 19:09:38 +0000 (UTC)
	(envelope-from bryan@shatow.net)
Received: from secure.xzibition.com (secure.xzibition.com [173.160.118.92])
	by mx1.freebsd.org (Postfix) with ESMTP id 0C9A98FC17
	for <FreeBSD-gnats-submit@freebsd.org>; Mon, 30 Apr 2012 19:09:37 +0000 (UTC)
Received: (qmail 48766 invoked from network); 30 Apr 2012 14:09:34 -0500
Received: from unknown (HELO test8.xzibition.com) (10.10.0.34)
  by sweb.xzibition.com with SMTP; 30 Apr 2012 14:09:34 -0500
Received: by test8.xzibition.com (sSMTP sendmail emulation); Mon, 30 Apr 2012 14:09:34 -0500
Message-Id: <20120430190938.9EE02106564A@hub.freebsd.org>
Date: Mon, 30 Apr 2012 14:09:34 -0500
From: "Bryan Drewery" <bryan@shatow.net>
Reply-To: Bryan Drewery <bryan@shatow.net>
To: FreeBSD-gnats-submit@freebsd.org
Cc: eadler@freebsd.org
Subject: [PATCH] (src) Update references of cvsup(1) to csup(1)
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         167459
>Category:       docs
>Synopsis:       [PATCH] (src) Update references of cvsup(1) to csup(1)
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    eadler
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          doc-bug
>Submitter-Id:   current-users
>Arrival-Date:   Mon Apr 30 19:10:14 UTC 2012
>Closed-Date:    Thu May 17 00:04:56 UTC 2012
>Last-Modified:  Thu May 17 00:04:56 UTC 2012
>Originator:     Bryan Drewery
>Release:        FreeBSD 8.3-RELEASE i386
>Organization:
>Environment:
	
>Description:
	This updates (HEAD) development.7 and make.conf.5 to reference csup(1) instead of cvsup(1)
>How-To-Repeat:
	
>Fix:

	

--- src-csup.patch.txt begins here ---
diff --git share/man/man5/make.conf.5 share/man/man5/make.conf.5
index d9967ea..1353e89 100644
--- share/man/man5/make.conf.5
+++ share/man/man5/make.conf.5
@@ -318,7 +318,7 @@ The hostname of the sup server to use when doing
 .It Va SUP_UPDATE
 .Pq Vt bool
 Set this to use
-.Xr cvsup 1
+.Xr csup 1
 to update your
 .Pa src , ports , doc
 and
diff --git share/man/man7/development.7 share/man/man7/development.7
index af8db3a..1cbd6f7 100644
--- share/man/man7/development.7
+++ share/man/man7/development.7
@@ -23,7 +23,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd December 21, 2002
+.Dd April 30, 2012
 .Dt DEVELOPMENT 7
 .Os
 .Sh NAME
@@ -89,7 +89,7 @@ I recommend a
 partition of at least 5GB.
 .Pp
 On the master server, use
-.Xr cvsup 1 Pq Pa ports/net/cvsup
+.Xr csup 1
 to automatically pull down and maintain
 the
 .Fx
@@ -108,23 +108,23 @@ The
 job should look something like this (please randomize the time of
 day!).
 Note that you can use the
-.Xr cvsup 1
+.Xr csup 1
 configuration file example directly from
 .Pa /usr/share/examples
 without modification by supplying appropriate arguments
 to
-.Xr cvsup 1 .
+.Xr csup 1 .
 .Bd -literal -offset 4n
-33 6 * * *      /usr/local/bin/cvsup -g -r 20 -L 2 -h cvsup.freebsd.org /usr/share/examples/cvsup/cvs-supfile
+33 6 * * *      /usr/bin/csup -g -r 20 -L 2 -h cvsup.freebsd.org /usr/share/examples/cvsup/cvs-supfile
 .Ed
 .Pp
 Run the
-.Xr cvsup 1
+.Xr csup 1
 manually the first time to pull down the archive.
 It could take
 all day depending on how fast your connection is!
 You will run all
-.Xr cvsup 1
+.Xr csup 1
 and
 .Xr cvs 1
 operations as
@@ -555,7 +555,7 @@ Since the main
 tree is based on CVS, the former is convenient.
 .Pp
 First, you need to modify your
-.Xr cvsup 1
+.Xr csup 1
 environment to avoid it modifying
 the local changes you have committed to the repository.
 It is important to remove the
@@ -568,7 +568,7 @@ subdirectory to your
 .Pa refuse
 file.
 For more information, see
-.Xr cvsup 1 .
+.Xr csup 1 .
 .Pp
 The
 .Fx
@@ -598,13 +598,13 @@ For more information on using CVS, see
 .Pp
 .Sy WARNING!
 The
-.Xr cvsup 1
+.Xr csup 1
 utility may blow away changes made on a local branch in
 some situations.
 This has been reported to occur when the master CVS repository is
 directly manipulated or an RCS file is changed.
 At this point,
-.Xr cvsup 1
+.Xr csup 1
 notices that the client and server have entirely
 different RCS files, so it does a full replace instead of trying to
 send just deltas.
@@ -619,7 +619,7 @@ Bottom line is, if you value your local branch then you
 should back it up before every update.
 .Sh UPDATING VIA CVS
 The advantage of using
-.Xr cvsup 1
+.Xr csup 1
 to maintain an updated copy of the CVS
 repository instead of using it to maintain source trees directly is that you
 can then pick and choose when you bring your source tree (or pieces of your
--- src-csup.patch.txt ends here ---


>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-doc->eadler 
Responsible-Changed-By: eadler 
Responsible-Changed-When: Mon Apr 30 20:02:20 UTC 2012 
Responsible-Changed-Why:  
I'll take it. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=167459 
State-Changed-From-To: open->patched 
State-Changed-By: eadler 
State-Changed-When: Tue May 1 02:12:45 UTC 2012 
State-Changed-Why:  
awaiting approval 

http://www.freebsd.org/cgi/query-pr.cgi?pr=167459 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: docs/167459: commit references a PR
Date: Wed,  2 May 2012 21:50:28 +0000 (UTC)

 Author: eadler
 Date: Wed May  2 21:50:13 2012
 New Revision: 234935
 URL: http://svn.freebsd.org/changeset/base/234935
 
 Log:
   Prefer the use of csup to cvsup when talking about the binary.
   
   PR:		docs/167459
   Submitted by:	"Bryan Drewery" <bryan@shatow.net>
   Approved by:	bcr
   MFC after:	1 week
 
 Modified:
   head/share/man/man5/make.conf.5
   head/share/man/man7/development.7
 
 Modified: head/share/man/man5/make.conf.5
 ==============================================================================
 --- head/share/man/man5/make.conf.5	Wed May  2 21:24:08 2012	(r234934)
 +++ head/share/man/man5/make.conf.5	Wed May  2 21:50:13 2012	(r234935)
 @@ -24,7 +24,7 @@
  .\"
  .\" $FreeBSD$
  .\"
 -.Dd December 11, 2011
 +.Dd May 02, 2012
  .Dt MAKE.CONF 5
  .Os
  .Sh NAME
 @@ -318,7 +318,7 @@ The hostname of the sup server to use wh
  .It Va SUP_UPDATE
  .Pq Vt bool
  Set this to use
 -.Xr cvsup 1
 +.Xr csup 1
  to update your
  .Pa src , ports , doc
  and
 
 Modified: head/share/man/man7/development.7
 ==============================================================================
 --- head/share/man/man7/development.7	Wed May  2 21:24:08 2012	(r234934)
 +++ head/share/man/man7/development.7	Wed May  2 21:50:13 2012	(r234935)
 @@ -23,7 +23,7 @@
  .\"
  .\" $FreeBSD$
  .\"
 -.Dd December 21, 2002
 +.Dd May 02, 2012
  .Dt DEVELOPMENT 7
  .Os
  .Sh NAME
 @@ -89,7 +89,7 @@ I recommend a
  partition of at least 5GB.
  .Pp
  On the master server, use
 -.Xr cvsup 1 Pq Pa ports/net/cvsup
 +.Xr csup 1
  to automatically pull down and maintain
  the
  .Fx
 @@ -108,23 +108,23 @@ The
  job should look something like this (please randomize the time of
  day!).
  Note that you can use the
 -.Xr cvsup 1
 +.Xr csup 1
  configuration file example directly from
  .Pa /usr/share/examples
  without modification by supplying appropriate arguments
  to
 -.Xr cvsup 1 .
 +.Xr csup 1 .
  .Bd -literal -offset 4n
 -33 6 * * *      /usr/local/bin/cvsup -g -r 20 -L 2 -h cvsup.freebsd.org /usr/share/examples/cvsup/cvs-supfile
 +33 6 * * *      /usr/bin/csup -r 20 -L 2 -h cvsup.freebsd.org /usr/share/examples/cvsup/cvs-supfile
  .Ed
  .Pp
  Run the
 -.Xr cvsup 1
 +.Xr csup 1
  manually the first time to pull down the archive.
  It could take
  all day depending on how fast your connection is!
  You will run all
 -.Xr cvsup 1
 +.Xr csup 1
  and
  .Xr cvs 1
  operations as
 @@ -555,7 +555,7 @@ Since the main
  tree is based on CVS, the former is convenient.
  .Pp
  First, you need to modify your
 -.Xr cvsup 1
 +.Xr csup 1
  environment to avoid it modifying
  the local changes you have committed to the repository.
  It is important to remove the
 @@ -568,7 +568,7 @@ subdirectory to your
  .Pa refuse
  file.
  For more information, see
 -.Xr cvsup 1 .
 +.Xr csup 1 .
  .Pp
  The
  .Fx
 @@ -598,13 +598,13 @@ For more information on using CVS, see
  .Pp
  .Sy WARNING!
  The
 -.Xr cvsup 1
 +.Xr csup 1
  utility may blow away changes made on a local branch in
  some situations.
  This has been reported to occur when the master CVS repository is
  directly manipulated or an RCS file is changed.
  At this point,
 -.Xr cvsup 1
 +.Xr csup 1
  notices that the client and server have entirely
  different RCS files, so it does a full replace instead of trying to
  send just deltas.
 @@ -619,7 +619,7 @@ Bottom line is, if you value your local 
  should back it up before every update.
  .Sh UPDATING VIA CVS
  The advantage of using
 -.Xr cvsup 1
 +.Xr csup 1
  to maintain an updated copy of the CVS
  repository instead of using it to maintain source trees directly is that you
  can then pick and choose when you bring your source tree (or pieces of your
 _______________________________________________
 svn-src-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/svn-src-all
 To unsubscribe, send any mail to "svn-src-all-unsubscribe@freebsd.org"
 
State-Changed-From-To: patched->closed 
State-Changed-By: eadler 
State-Changed-When: Thu May 17 00:04:54 UTC 2012 
State-Changed-Why:  
Committed. Thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=167459 
>Unformatted:
