Merge from origin/emacs-26

6af509e Replace the obsolete process-kill-without-query in documentation
4df0d15 ; Tiny fix for recent doc change

diff --cc lisp/comint.el
Simple merge

diff --cc lisp/eshell/esh-proc.el
Simple merge

diff --cc lisp/net/ange-ftp.el
Simple merge

diff --cc lisp/term.el
Simple merge