Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs

diff --cc etc/NEWS
index e76c8ccaa6a028551e6639bc00512ccba245bd9b,17816e5f17298e0d430dd490e7d1bb34f31b8737..6dd0f9b5e4ea0c2d8eba3506357b4583d2faec9c
--- 1/etc/NEWS
--- 2/etc/NEWS
+++ b/etc/NEWS
@@@ -651,10 -651,10 +651,10 @@@ the minibuffer contents instead.  This 
  controlled with the new user option 'completion-auto-deselect', which
  is t by default.
  
 -*** New value 'historical' for user option 'completions-sort'
 +*** New value 'historical' for user option 'completions-sort'.
  When 'completions-sort' is set to 'historical', completion candidates
- will be sorted by their chronological order in the minibuffer history,
- with more recent candidates appearing first.
+ will be first sorted alphabetically, and then re-sorted by their order
+ in the minibuffer history, with more recent candidates appearing first.
  
  ** Pcomplete