From owner-svn-doc-all@FreeBSD.ORG Fri Nov 9 13:46:44 2012 Return-Path: Delivered-To: svn-doc-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id C0178750; Fri, 9 Nov 2012 13:46:44 +0000 (UTC) (envelope-from eadler@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 8BFB28FC08; Fri, 9 Nov 2012 13:46:44 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qA9DkixB082592; Fri, 9 Nov 2012 13:46:44 GMT (envelope-from eadler@svn.freebsd.org) Received: (from eadler@localhost) by svn.freebsd.org (8.14.5/8.14.5/Submit) id qA9Dkibw082591; Fri, 9 Nov 2012 13:46:44 GMT (envelope-from eadler@svn.freebsd.org) Message-Id: <201211091346.qA9Dkibw082591@svn.freebsd.org> From: Eitan Adler Date: Fri, 9 Nov 2012 13:46:44 +0000 (UTC) To: doc-committers@freebsd.org, svn-doc-all@freebsd.org, svn-doc-head@freebsd.org Subject: svn commit: r39964 - head/en_US.ISO8859-1/articles/contributing 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: Fri, 09 Nov 2012 13:46:44 -0000 Author: eadler Date: Fri Nov 9 13:46:44 2012 New Revision: 39964 URL: http://svnweb.freebsd.org/changeset/doc/39964 Log: Always prefer unified diff to context diff. While here add '-N' to the diff line for directories Approved by: jkois (mentor) Modified: head/en_US.ISO8859-1/articles/contributing/article.xml Modified: head/en_US.ISO8859-1/articles/contributing/article.xml ============================================================================== --- head/en_US.ISO8859-1/articles/contributing/article.xml Fri Nov 9 13:46:41 2012 (r39963) +++ head/en_US.ISO8859-1/articles/contributing/article.xml Fri Nov 9 13:46:44 2012 (r39964) @@ -342,39 +342,22 @@ The preferred &man.diff.1; format for submitting patches is the unified output format generated by diff - -u. However, for patches that substantially - change a region of code, a context output format diff - generated by diff -c may be more readable - and thus preferable. + -u. diff - For example: - - &prompt.user; diff -c oldfile newfile - - or - - &prompt.user; diff -c -r olddir newdir - - would generate such a set of context diffs for the given - source file or directory hierarchy. - - Likewise, - &prompt.user; diff -u oldfile newfile or - &prompt.user; diff -u -r olddir newdir + &prompt.user; diff -u -r -N olddir newdir - would do the same, except in the unified diff - format. + would generate a set of unified diffs for the given source + file or directory hierarchy. - See the manual page for &man.diff.1; for more - details. + See &man.diff.1; for more information. Once you have a set of diffs (which you may test with the &man.patch.1; command), you should submit them for inclusion