From utisoft@hotmail.com  Sat Aug 13 15:30:05 2011
Return-Path: <utisoft@hotmail.com>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 443BD106564A
	for <FreeBSD-gnats-submit@freebsd.org>; Sat, 13 Aug 2011 15:30:05 +0000 (UTC)
	(envelope-from utisoft@hotmail.com)
Received: from blu0-omc1-s36.blu0.hotmail.com (blu0-omc1-s36.blu0.hotmail.com [65.55.116.47])
	by mx1.freebsd.org (Postfix) with ESMTP id E45AA8FC08
	for <FreeBSD-gnats-submit@freebsd.org>; Sat, 13 Aug 2011 15:30:04 +0000 (UTC)
Received: from BLU0-SMTP294 ([65.55.116.8]) by blu0-omc1-s36.blu0.hotmail.com with Microsoft SMTPSVC(6.0.3790.4675);
	 Sat, 13 Aug 2011 08:30:04 -0700
Received: from zeus.bayofrum.net ([90.216.242.219]) by BLU0-SMTP294.phx.gbl over TLS secured channel with Microsoft SMTPSVC(6.0.3790.4675);
	 Sat, 13 Aug 2011 08:30:02 -0700
Received: from zeus.bayofrum.net (crees@localhost [127.0.0.1])
	by zeus.bayofrum.net (8.14.4/8.14.4) with ESMTP id p7DFTj0V062274
	(version=TLSv1/SSLv3 cipher=DHE-DSS-AES256-SHA bits=256 verify=NO)
	for <FreeBSD-gnats-submit@freebsd.org>; Sat, 13 Aug 2011 16:29:45 +0100 (BST)
	(envelope-from crees@zeus.bayofrum.net)
Received: (from crees@localhost)
	by zeus.bayofrum.net (8.14.4/8.14.4/Submit) id p7DFTjTE062273;
	Sat, 13 Aug 2011 16:29:45 +0100 (BST)
	(envelope-from crees)
Message-Id: <BLU0-SMTP294558DA7655E9A3B4E33DDA9240@phx.gbl>
Date: Sat, 13 Aug 2011 16:29:45 +0100
From: Chris Rees <utisoft@gmail.com>
Sender: <utisoft@hotmail.com>
Reply-To: Chris Rees <crees@freebsd.org>
To: FreeBSD-gnats-submit@freebsd.org
Cc:
Subject: [PATCH] articles/contributing-ports diff gives incorrect instructions
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         159742
>Category:       docs
>Synopsis:       [PATCH] articles/contributing-ports diff gives incorrect instructions
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    ryusuke
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          doc-bug
>Submitter-Id:   current-users
>Arrival-Date:   Sat Aug 13 15:40:10 UTC 2011
>Closed-Date:    Sun Aug 14 11:16:13 UTC 2011
>Last-Modified:  Sun Aug 14 11:20:10 UTC 2011
>Originator:     Chris Rees
>Release:        FreeBSD 8.2-RELEASE-p1 i386
>Organization:
>Environment:
System: FreeBSD zeus.bayofrum.net 8.2-RELEASE-p1 FreeBSD 8.2-RELEASE-p1 #0: Sat Apr 30 15:09:06 BST 2011 root@zeus.bayofrum.net:/usr/obj/usr/src/sys/ZEUS i386


	
>Description:
	The guy at ports/159735 was censured for sending in a normal diff for his port, and meekly replied that he was following instructions -- he was indeed!
>How-To-Repeat:
	
>Fix:

	

--- contributing-ports-diff.diff begins here ---
Index: article.sgml
===================================================================
RCS file: /home/dcvs/doc/en_US.ISO8859-1/articles/contributing-ports/article.sgml,v
retrieving revision 1.5
diff -u -r1.5 article.sgml
--- article.sgml	26 Nov 2009 21:20:01 -0000	1.5
+++ article.sgml	13 Aug 2011 15:26:45 -0000
@@ -373,7 +373,7 @@
 
 	    <note>
 	      <para>Please do not submit a &man.shar.1; archive of the
-		entire port; instead, use &man.diff.1; <literal>-r</literal>.
+		entire port; instead, use &man.diff.1; <literal>-ruN</literal>.
 		In this way, committers can much more easily see exactly
 		what changes are being made.  The Porter's Handbook
 		section on
--- contributing-ports-diff.diff ends here ---



-- 
PS- I haven't munged the whitespace, you can blame GNATS for that

>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-doc->ryusuke 
Responsible-Changed-By: ryusuke 
Responsible-Changed-When: Sun Aug 14 09:15:37 UTC 2011 
Responsible-Changed-Why:  
I'll take this. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=159742 
State-Changed-From-To: open->closed 
State-Changed-By: ryusuke 
State-Changed-When: Sun Aug 14 11:14:03 UTC 2011 
State-Changed-Why:  
Committed. Thanks! 

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

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: docs/159742: commit references a PR
Date: Sun, 14 Aug 2011 11:13:55 +0000 (UTC)

 ryusuke     2011-08-14 11:13:47 UTC
 
   FreeBSD doc repository
 
   Modified files:
     en_US.ISO8859-1/articles/contributing-ports article.sgml 
   Log:
   PR: docs/159742
   
   Change the option of diff so that submitter will not send in a normal diff.
   
   Submitted by:   crees@
   
   Revision  Changes    Path
   1.6       +1 -1      doc/en_US.ISO8859-1/articles/contributing-ports/article.sgml
 _______________________________________________
 cvs-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/cvs-all
 To unsubscribe, send any mail to "cvs-all-unsubscribe@freebsd.org"
 
>Unformatted:
