-

diff --cc configure.ac
Simple merge

diff --cc doc/misc/eww.texi
Simple merge

diff --cc doc/misc/tramp.texi
index 37bf7ea8bc48d792878284555b97404d4ef4b3e5,7bf2e532e019887940d6a2a7362eb34f4c557cf6..d01f9be9fbfc0695404d098d1e6946050b538b39
--- 1/doc/misc/tramp.texi
--- 2/doc/misc/tramp.texi
+++ b/doc/misc/tramp.texi
@@@ -871,17 -905,19 +869,18 @@@ uses the anonymous user (without prompt
  behavior is unlike other @value{tramp} methods, where local user name
  is substituted.
  
- @option{smb} method is unavailable if Emacs is run under a local user
- authentication context in MS Windows.  However such users can still
- access remote files using UNC file names instead of @value{tramp}:
 -The @option{smb} method is unavailable if @value{emacsname} is run under a
++The @option{smb} method is unavailable if Emacs is run under a
+ local user authentication context in MS Windows.  However such users
+ can still access remote files using UNC file names instead of @value{tramp}:
  
  @example
  //melancholia/daniel$$/.emacs
  @end example
  
- UNC file name specification does not allow to specify a different user
- name for authentication like the @command{smbclient} can.
+ UNC file name specification does not allow the specification of a
+ different user name for authentication like the @command{smbclient}
+ can.
  
 -
  @item @option{adb}
  @cindex method adb
  @cindex adb method
@@@ -2825,12 -2984,12 +2824,12 @@@ Host 
  
  @value{tramp} overwrites @code{ControlPath} settings when initiating
  @command{ssh} sessions.  @value{tramp} does this to fend off a stall
 -if a master session opened outside the @value{emacsname} session is no
 -longer open.  That is why @value{tramp} prompts for the password again
 -even if there is an @command{ssh} already open.
 +if a master session opened outside the Emacs session is no longer
 +open.  That is why @value{tramp} prompts for the password again even
 +if there is an @command{ssh} already open.
  
  Some @command{ssh} versions support a @code{ControlPersist} option,
- which allows to set the @code{ControlPath} provided the variable
+ which allows you to set the @code{ControlPath} provided the variable
  @code{tramp-ssh-controlmaster-options} is customized as follows:
  
  @lisp

diff --cc etc/NEWS
Simple merge

diff --cc lisp/font-lock.el
Simple merge

diff --cc lisp/ldefs-boot.el
Simple merge

diff --cc lisp/net/tramp-cmds.el
Simple merge

diff --cc lisp/net/tramp-gvfs.el
Simple merge

diff --cc lisp/org/ChangeLog.1
Simple merge

diff --cc lisp/progmodes/cc-engine.el
Simple merge

diff --cc lisp/progmodes/python.el
Simple merge

diff --cc src/emacs.c
Simple merge

diff --cc src/window.c
Simple merge

diff --cc test/manual/etags/c-src/emacs/src/lisp.h
Simple merge

diff --cc test/manual/etags/el-src/emacs/lisp/progmodes/etags.el
Simple merge