Merge from origin/emacs-25

0ffc9ce Update admin/authors.el
0ad7410 Update Antinews in ELisp manual
ea0f750 Fix comments on window height macros
0bbdeed Fix 'url-http-create-request' when cookies are used
0045998 Fix cross reference in frames.texi
1392894 ; * etc/DEBUG: Minor copyedits.
304a5c8 ; * etc/DEBUG: Improve documentation of getting control to GDB.
56bf7d7 Fix regexp-opt documentation (bug #17862)
803ad6f ; Fix documentation of seq-subseq
ed4530d * lisp/emacs-lisp/gv.el (gv-ref): Fix example of PLACE in doc...
88ea396 ; Spelling fixes
17197d0 Fix tags-query-replace docstring
80a7f8b Clarify documentation of precision in format specs
88a5052 Improve and clarify documentation of subprocesses
89eb09f * etc/PROBLEMS: Mention gnutls-cli 3.5.3 (Bug#24247).

# Conflicts:
#	etc/PROBLEMS
#	src/process.c

diff --cc doc/lispref/frames.texi
Simple merge

diff --cc doc/lispref/processes.texi
Simple merge

diff --cc doc/lispref/searching.texi
Simple merge

diff --cc doc/lispref/strings.texi
Simple merge

diff --cc etc/DEBUG
Simple merge

diff --cc etc/PROBLEMS
Simple merge

diff --cc lisp/emacs-lisp/regexp-opt.el
Simple merge

diff --cc lisp/emacs-lisp/seq.el
Simple merge

diff --cc lisp/url/url-http.el
Simple merge

diff --cc src/process.c
index 29bf43e0f29cd7196ff7145747e65d2bee5f3441,7ab92b0102cd1be2ee88bc79e50847d160defd24..9a0ab00c505c93f1368a2df6bc81fe5e75cba9f2
--- 1/src/process.c
--- 2/src/process.c
+++ b/src/process.c
@@@ -1237,16 -1181,14 +1237,16 @@@ DEFUN ("process-query-on-exit-flag"
  DEFUN ("process-contact", Fprocess_contact, Sprocess_contact,
         1, 2, 0,
         doc: /* Return the contact info of PROCESS; t for a real child.
- For a network or serial connection, the value depends on the optional
- KEY arg.  If KEY is nil, value is a cons cell of the form (HOST
- SERVICE) for a network connection or (PORT SPEED) for a serial
- connection.  If KEY is t, the complete contact information for the
- connection is returned, else the specific value for the keyword KEY is
- returned.  See `make-network-process' or `make-serial-process' for a
- list of keywords.
+ For a network or serial or pipe connection, the value depends on the
+ optional KEY arg.  If KEY is nil, value is a cons cell of the form
+ \(HOST SERVICE) for a network connection or (PORT SPEED) for a serial
+ connection; it is t for a pipe connection.  If KEY is t, the complete
+ contact information for the connection is returned, else the specific
+ value for the keyword KEY is returned.  See `make-network-process',
 -\`make-serial-process', or `make-pipe-process' for the list of keywords.  */)
 -  (register Lisp_Object process, Lisp_Object key)
++`make-serial-process', or `make pipe-process' for the list of keywords.
 +If PROCESS is a non-blocking network process that hasn't been fully
 +set up yet, this function will block until socket setup has completed.  */)
 +  (Lisp_Object process, Lisp_Object key)
  {
    Lisp_Object contact;
  

diff --cc src/window.h
Simple merge