Update docs.HEADmaster

2 files changed, 27 insertions, 4 deletions

diff --git a/NEWS b/NEWS
index 0761870..38fa3b6 100644
--- a/NEWS
+++ b/NEWS
@@ -1,10 +1,27 @@
 The real ChangeLog is the git log. This is just a summary of the
 user-visible changes between releases.
 
+New in 0.9.6:
+=============
+
+sbolint:
+- Stop complaining about diff/patch files that have no newline at the end.
+  The patch command has no problem with them.
+- Patch/diff files that have CRLF line endings used to trigger an error.
+  This has been downgraded to a note, since in practice they no longer
+  cause problems like they did years ago.
+- When linting a tarball, the SlackBuild's permissions are no longer
+  required to be 0755 (0644 is acceptable). This reflects how the
+  submission and approval process actually works: the script's permissions
+  are explictly set during the process.
+- When linting a tarball, the enclosing directory is now checked for
+  0755 permissions. If a tarball without +x perms for the enclosing dir
+  gets submitted to the site, the submission will be rejected anyway.
+
 New in 0.9.5:
 =============
 
-sbolist:
+sbolint:
 - Check for leading blank lines in README, which are reported as an error.
 - Check for trailing blank lines in README. If one is found, it's reported
   as a note. If more than one, it's an error.
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