2 files changed, 79 insertions, 7 deletions

diff --git a/ChangeLog.2 b/ChangeLog.2
index e6774826a35..a9e1dd2a117 100644
--- a/ChangeLog.2
+++ b/ChangeLog.2
@@ -1,3 +1,75 @@
+2017-02-18  Noam Postavsky  <npostavs@gmail.com>
+
+        * lisp/woman.el (woman): Fix docstring prefix arg description.
+
+2017-02-18  Eli Zaretskii  <eliz@gnu.org>
+
+        Mention "editor" in Emacs man page header
+
+        * doc/man/emacs.1.in: Mention "editor" in the header line.
+        (Bug#25771, Bug#25779)
+
+2017-02-18  Eli Zaretskii  <eliz@gnu.org>
+
+        Document problems with nerd-fonts
+
+        * etc/PROBLEMS (fonts): Describe the potential problems with
+        nerd-fonts that cause slow display.  (Bug#25697)
+
+2017-02-13  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * doc/lispref/modes.texi (Derived Modes): Make example more idiomatic
+
+2017-02-12  Eli Zaretskii  <eliz@gnu.org>
+
+        Clarify what is the "cursor"
+
+        * doc/lispref/windows.texi (Window Point): Clarify the notion of
+        "cursor".
+
+2017-02-10  Eli Zaretskii  <eliz@gnu.org>
+
+        Improve commentary in lisp.h
+
+        * src/lisp.h: Explain in the comment why enlarging a Lisp_Misc
+        object is discouraged.
+
+2017-02-08  Noam Postavsky  <npostavs@gmail.com>
+
+        Disable native completion for ipython (Bug#25067)
+
+        * lisp/progmodes/python.el:
+        (python-shell-completion-native-disabled-interpreters): Add "ipython".
+
+2017-02-07  Eli Zaretskii  <eliz@gnu.org>
+
+        Fix a typo in ada-mode manual
+
+        * doc/misc/ada-mode.texi (Project file variables): Add a missing
+        right bracket.  Reported by Jean-Christophe Helary
+        <jean.christophe.helary@gmail.com>.
+
+2017-02-05  Eli Zaretskii  <eliz@gnu.org>
+
+        Clarify documentation of 'bufferpos-to-filepos' and 'filepos-to-bufferpos'
+
+        * doc/lispref/nonascii.texi (Text Representations): Clarify that
+        'exact' value of QUALITY argument to 'bufferpos-to-filepos' and
+        'filepos-to-bufferpos' can lead to expensive and slow processing.
+
+        * lisp/international/mule-util.el (filepos-to-bufferpos)
+        (bufferpos-to-filepos): Doc fix.  (Bug#25626)
+
+2017-02-03  Nicolas Petton  <nicolas@petton.fr>
+
+        Bump Emacs version to 25.2 RC1
+
+        * README:
+        * configure.ac:
+        * msdos/sed2v2.inp:
+        * nt/README.W32: Bump Emacs version.
+        * lisp/ldefs-boot.el: Update.
+
 2017-02-03  Nicolas Petton  <nicolas@petton.fr>
 
         * admin/make-tarball.txt: Add documentation regarding the release banner.
@@ -35569,7 +35641,7 @@
 
 This file records repository revisions from
 commit 9d56a21e6a696ad19ac65c4b405aeca44785884a (exclusive) to
-commit 02d9ad8440508b64233a4a38dae67c523139f7df (inclusive).
+commit ec4226d81074751c105264a3a3383c48d0a05e41 (inclusive).
 See ChangeLog.1 for earlier changes.
 
 ;; Local Variables:
diff --git a/etc/AUTHORS b/etc/AUTHORS
index f993fde5dc7..85439ac8615 100644
--- a/etc/AUTHORS
+++ b/etc/AUTHORS
@@ -1252,7 +1252,7 @@ Eli Zaretskii: wrote [bidirectional display in xdisp.c]
 and changed xdisp.c msdos.c w32.c w32fns.c display.texi files.el
   simple.el fileio.c w32proc.c w32term.c keyboard.c emacs.c dispnew.c
   dispextern.h INSTALL config.bat sed1v2.inp src/Makefile.in term.c
-  frames.texi window.c and 1020 other files
+  frames.texi window.c and 1021 other files
 
 Emanuele Giaquinta: changed configure.ac rxvt.el charset.c etags.c
   fontset.c frame.el gnus-faq.texi loadup.el lread.c sh-script.el
@@ -3356,7 +3356,7 @@ Nicolas Petton: wrote map-tests.el map.el seq-tests.el seq.el
   thunk-tests.el thunk.el
 and co-wrote auth-source-tests.el subr-tests.el
 and changed sequences.texi README configure.ac sed2v2.inp emacs.png
-  authors.el emacs23.png arc-mode.el cl-extra.el emacs.svg README.W32
+  authors.el emacs23.png README.W32 arc-mode.el cl-extra.el emacs.svg
   Emacs.icns Makefile.in auth-source.el emacs.ico obarray.el data.c
   emacs-document.svg emacs-document23.svg emacs.texi emacs23.svg
   and 9 other files
@@ -3395,10 +3395,10 @@ and changed rsz-mini.el emacs-buffer.gdb comint.el files.el Makefile
 Noah Lavine: changed tramp.el
 
 Noam Postavsky: changed search.c cl-preloaded.el debugging.texi
-  modes.texi simple.el w32.c cl-macs.el buffer.c buffers.texi category.c
-  cmdproxy.c cus-edit.el dired.c elisp-mode.el em-term.el
-  emacs-lisp-intro.texi etags.el eval.c files.el find-func.el help-fns.el
-  and 30 other files
+  modes.texi simple.el w32.c cl-macs.el progmodes/python.el buffer.c
+  buffers.texi category.c cmdproxy.c cus-edit.el dired.c elisp-mode.el
+  em-term.el emacs-lisp-intro.texi etags.el eval.c files.el find-func.el
+  and 31 other files
 
 Nobuyoshi Nakada: co-wrote ruby-mode.el