Update docs.HEADmaster

1 files changed, 9 insertions, 3 deletions

diff --git a/sbolint b/sbolint
index e34cdca..2b9b537 100755
--- a/sbolint
+++ b/sbolint
@@ -313,12 +313,18 @@ and correctness (must not be truncated/corrupt).
 
 Patch files (anything named *.diff or *.patch) are checked for
 permissions (0644) and DOS/Windows CRLF line endings. If a patch
-file has CRLF endings, it B<cannot> be checked into SBo's repository,
-because git will strip the CR (\r) from every line, meaning the patch
-will fail to apply. In this case, the best solution is to gzip the
+file has CRLF endings, it should not be checked into SBo's repository,
+because git may strip the CR (\r) from every line, meaning the patch
+would fail to apply. In this case, the best solution is to gzip the
 patch, and have the SlackBuild use e.g. "zcat $CWD/blah.diff.gz |
 patch -p1" to apply it.
 
+Note that the line-ending problem only triggers a note, not a warning
+or error. The trouble with git stripping \r's has become mostly a
+thing of the past in recent versions of git. It's still possible for
+this to happen if e.g. you're for some reason editing a SlackBuild on
+a Windows machine (but why would you do that?)
+
 =back
 
 =head1 EXIT STATUS