diff options
Diffstat (limited to 'tools-reference/diff-and-patch/text.xml')
| -rw-r--r-- | tools-reference/diff-and-patch/text.xml | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/tools-reference/diff-and-patch/text.xml b/tools-reference/diff-and-patch/text.xml index dcbbf18..7a5e932 100644 --- a/tools-reference/diff-and-patch/text.xml +++ b/tools-reference/diff-and-patch/text.xml @@ -1,7 +1,7 @@ -<?xml version="1.0"?> +<?xml version="1.0" encoding="UTF-8"?> <guide self="tools-reference/diff-and-patch/"> <chapter> -<title><c>diff</c> and <c>patch</c> — File Differences</title> +<title><c>diff</c> and <c>patch</c> — file differences</title> <body> <p> @@ -30,20 +30,20 @@ format. This is generally the best format to use when sending patches upstream too <d/> however, occasionally you may be asked to provide context diffs, which are more portable than unifieds (but don't handle conflicts as cleanly). In this case, use <c>-c</c> rather -than <c>-u</c>. +than <c>-u</c>. For a verbose guide into patches and patching, see +<uri link="::ebuild-writing/misc-files/patches/"/>. </p> <p> To apply a patch, use <c>patch -pX < whatever.patch</c>, where <c>X</c> is a number representing the number of path components which must be removed (typically this is <c>0</c> or <c>1</c>). Within -ebuilds, use the <c>epatch</c> function, or <c>eapply</c> function -beginning with EAPI=6, instead — see -<uri link="::ebuild-writing/functions/src_prepare/epatch"/>. +ebuilds, use the <c>eapply</c> function instead <d/> see +<uri link="::ebuild-writing/functions/src_prepare/eapply/"/>. </p> <p> -The diff-1 and patch-1 manual pages provide more information. +The <c>diff(1)</c> and <c>patch(1)</c> manual pages provide more information. </p> </body> |