Merge from origin/emacs-25

26d4da0 New input method "probhat" for Bengali
4f445bf ; Spelling fix
f403f03 ; Fix typo

2 files changed, 3 insertions, 3 deletions

diff --git a/etc/AUTHORS b/etc/AUTHORS
index dc5a28eac4c..721f0d5be3f 100644
--- a/etc/AUTHORS
+++ b/etc/AUTHORS
@@ -533,7 +533,7 @@ Brian Jenkins: changed frame.c frames.texi hooks.texi
 
 Brian Marick: co-wrote hideif.el
 
-Brian Mckenna: changed eww.el
+Brian McKenna: changed eww.el
 
 Brian Palmer: changed erc.el erc-list.el
 
diff --git a/etc/NEWS b/etc/NEWS
index fadf4c2af04..f845c1d776b 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -808,7 +808,7 @@ random values; in particular, the Emacs server now uses this facility
 to produce its authentication key.
 
 ---
-** New input methods: 'tamil-dvorak' and 'programmer-dvorak'.
+** New input methods: 'tamil-dvorak', 'programmer-dvorak' and 'probhat'.
 
 
 * Editing Changes in Emacs 25.1
@@ -928,7 +928,7 @@ recommended to do this as soon as you have firmly upgraded to Emacs
 to version 206, you can do this with 'C-u C-u M-x desktop-save'.
 
 ---
-*** desktop-restore-in-current-display now defaults to t, not nil.
+*** 'desktop-restore-in-current-display' now defaults to t, not nil.
 That is, Emacs by default now restores frames into the current display.
 
 +++