Merge from origin/emacs-25

1eaf68f * test/automated/file-notify-tests.el (file-notify-test06-many-events):
d333716 ; * etc/NEWS: Expand news entry for scss-mode
c32c16f ; Better document changes in ls-lisp default behavior
dc6eed2 Fix doc string of tls-program

3 files changed, 17 insertions, 6 deletions

diff --git a/etc/NEWS b/etc/NEWS
index a49bed14750..c2c5950891c 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -1352,7 +1352,8 @@ The main entry points are `cl-defgeneric' and `cl-defmethod'.  See the
 node "Generic Functions" in the Emacs Lisp manual for more details.
 
 ---
-** scss-mode (a minor variant of css-mode)
+** scss-mode (a minor variant of css-mode) is a major mode for editing
+SCSS (Sassy CSS) files.
 
 ---
 ** let-alist is a new macro (and a package) that allows one to easily
@@ -1663,8 +1664,14 @@ counterparts `string-lessp' and `string-equal'.
 
 ---
 *** The ls-lisp package uses `string-collate-lessp' to sort file names.
-If you want the old, locale-independent sorting, customize the new
-option `ls-lisp-use-string-collate' to a nil value.
+The effect is that, on systems that use ls-lisp for Dired, the default
+sort order of the files in Dired is now different from what it was in
+previous versions of Emacs.  In particular, the file names are sorted
+disregarding punctuation, accents, and diacritics, and letter case is
+ignored.  For example, files whose name begin with a period will no
+longer appear near the beginning of the directory listing.  If you
+want the old, locale-independent sorting, customize the new option
+`ls-lisp-use-string-collate' to the nil value.
 
 +++
 *** The MS-Windows specific variable `w32-collate-ignore-punctuation',
diff --git a/lisp/net/tls.el b/lisp/net/tls.el
index 30895d043c8..f1219fdddbd 100644
--- a/lisp/net/tls.el
+++ b/lisp/net/tls.el
@@ -82,7 +82,8 @@ and `gnutls-cli' (version 2.0.1) output."
     "openssl s_client -connect %h:%p -no_ssl2 -ign_eof")
   "List of strings containing commands to start TLS stream to a host.
 Each entry in the list is tried until a connection is successful.
-%h is replaced with server hostname, %p with port to connect to.
+%h is replaced with the server hostname, %p with the port to
+connect to, and %t with a file name containing trusted certificates.
 The program should read input on stdin and write output to stdout.
 
 See `tls-checktrust' on how to check trusted root certs.
diff --git a/test/lisp/filenotify-tests.el b/test/lisp/filenotify-tests.el
index de64f5086d2..629d85be1ef 100644
--- a/test/lisp/filenotify-tests.el
+++ b/test/lisp/filenotify-tests.el
@@ -596,7 +596,7 @@ longer than timeout seconds for the events to be delivered."
             (should (string-match "another text" (buffer-string)))
 
             ;; Stop file notification.  Autorevert shall still work via polling.
-            ;; It doesn't work for `w32notify'.
+            ;; It doesn't work for w32notify.
             (unless (string-equal (file-notify--test-library) "w32notify")
               (file-notify-rm-watch auto-revert-notify-watch-descriptor)
               (file-notify--wait-for-events
@@ -797,7 +797,10 @@ longer than timeout seconds for the events to be delivered."
           file-notify--test-tmpfile
           '(change) 'file-notify--test-event-handler)))
   (unwind-protect
-      (let ((n 1000)
+      ;; In case of w32notify, the upper limit of events to handle
+      ;; seems to be 260.  Reason unknown.
+      (let ((n (if (string-equal (file-notify--test-library) "w32notify")
+                   250 1000))
             source-file-list target-file-list
             (default-directory file-notify--test-tmpfile))
         (dotimes (i n)