* patch.man: Try to improve the documentation of patch's CRLF handling

behavior.

2 files changed, 8 insertions, 5 deletions

diff --git a/ChangeLog b/ChangeLog
index 0449df7..ad4b433 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -8,6 +8,9 @@
 	output format for conflicts.
 	* tests/merge: Add test cases for the diff3 output format.
 
+	* patch.man: Try to improve the documentation of patch's CRLF handling
+	behavior.
+
 2009-12-28  Andreas Gruenbacher  <agruen@suse.de>
 
 	* tests/create-delete: Clean up a syntactic glitch.
diff --git a/patch.man b/patch.man
index 758f25a..cc1c263 100644
--- a/patch.man
+++ b/patch.man
@@ -64,9 +64,8 @@ Thus you could feed an article or message containing a
 diff listing to
 .BR patch ,
 and it should work.
-If the entire diff is indented by a consistent amount,
-or if a context diff contains lines ending in \s-1CRLF\s0
-or is encapsulated one or more times by prepending
+If the entire diff is indented by a consistent amount, if lines end in \s-1CRLF\s0,
+or if a diff is encapsulated one or more times by prepending
 "\fB\- \fP" to lines starting with "\fB\-\fP" as specified by Internet RFC 934,
 this is taken into account.
 After removing indenting or encapsulation,
@@ -307,8 +306,9 @@ is
 Write all files in binary mode, except for standard output and
 .BR /dev/tty .
 When reading, disable the heuristic for transforming CRLF line endings into LF
-line endings.
-(On \s-1POSIX\s0-conforming systems, reads and writes never transform line
+line endings.  This option is needed on \s-1POSIX\s0 systems when applying patches
+generated on non-\s-1POSIX\s0 systems to non-\s-1POSIX\s0 files.
+(On \s-1POSIX\s0 systems, file reads and writes never transform line
 endings. On Windows, reads and writes do transform line endings by default,
 and patches should be generated by
 .B "diff\ \*=binary"