diff --git a/en_US.ISO8859-1/articles/contributing/article.sgml b/en_US.ISO8859-1/articles/contributing/article.sgml index 73126ba73b..c3bce09c75 100644 --- a/en_US.ISO8859-1/articles/contributing/article.sgml +++ b/en_US.ISO8859-1/articles/contributing/article.sgml @@ -315,22 +315,39 @@ FreeBSD Entities//EN"> %freebsd; Assuming that you can manage to secure fairly up-to-date sources to base your changes on, the next step is to produce a set of diffs to send to the FreeBSD maintainers. This is done with the &man.diff.1; - command, with the unified diff form - being preferred. For example: + command. + + 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. diff + + For example: + - &prompt.user; diff -u -c oldfile newfile + &prompt.user; diff -c oldfile newfile or - &prompt.user; diff -u -c -r olddir newdir + &prompt.user; diff -c -r olddir newdir would generate such a set of context diffs for the given - source file or directory hierarchy. See the manual page for - &man.diff.1; for more details. + source file or directory hierarchy. + + Likewise, + &prompt.user; diff -u oldfile newfile + or + &prompt.user; diff -u -r olddir newdir + + would do the same, except in the unified diff format. + + See the manual page for &man.diff.1; for more details. Once you have a set of diffs (which you may test with the &man.patch.1; command), you should submit them for inclusion