Merge from origin/emacs-26

22922c7 (origin/emacs-26) * doc/emacs/entering.texi (Entering Emacs):...
59657c4 Document 'window-at-side-p' in the Elisp manual
2b35ed0 Document external-debugging-output in the Elisp Manual (Bug#2...
db6564c Fix scroll-margin docstring (Bug#13791)
732d1b9 Clarify that `ansi-term' is almost the same as `term' (Bug#18...
f706c59 Update manual description of locate-file (Bug#23650)
1602262 Clarify effect of print-gensym (Bug#27776)
53e9fa2 * lisp/custom.el (defcustom): Fix docstring (Bug#27891).
607cc4e Define cl-type-definition button type as needed (Bug#28899)
9e6889c Emphasize that GPG passphrase caching is temporary (Bug#29907)
4b5711b Fix @examples in cc-mode.info, where lines were getting glued...
71961f1 Minor change in "Mode Line" section of Emacs manual
55a2b76 More fixes in the Emacs manual

2 files changed, 7 insertions, 5 deletions

diff --git a/doc/misc/cc-mode.texi b/doc/misc/cc-mode.texi
index 292342cb4a3..0132ab1775c 100644
--- a/doc/misc/cc-mode.texi
+++ b/doc/misc/cc-mode.texi
@@ -5634,15 +5634,15 @@ Works with:
 @end ifinfo
 
 @macro sssTBasicOffset
-<--> @i{c-basic-offset}@c
+<--> @i{c-basic-offset}
 @end macro
 
 @macro sssTsssTBasicOffset
-<--><--> @i{c-basic-offset}@c
+<--><--> @i{c-basic-offset}
 @end macro
 
 @macro hereFn{func}
-<- @i{\func\}@c
+<- @i{\func\}
 @end macro
 
 @c The TeX backend seems to insert extra spaces around the argument. :P
diff --git a/doc/misc/epa.texi b/doc/misc/epa.texi
index 80ea43e8032..8c21a262a1e 100644
--- a/doc/misc/epa.texi
+++ b/doc/misc/epa.texi
@@ -455,7 +455,7 @@ GnuPG 2.1 uses a fixed address for the Unix domain socket used to
 communicate with gpg-agent.  The @code{GPG_AGENT_INFO} environment
 variable, which is used by GnuPG 2.0 and 1.4, is ignored.  That means,
 if your system has both GnuPG 2.1 and 1.4, the gpg command from GnuPG
-1.4 is not able to use gpg-agent provided by 2.1 (at least out of box).q
+1.4 is not able to use gpg-agent provided by 2.1 (at least out of box).
 
 @item
 GnuPG 2.1 (2.1.5 or later) has a mechanism to direct the Pinentry
@@ -474,7 +474,9 @@ graphical prompt.
 
 Typing passphrases is a troublesome task if you frequently open and
 close the same file.  GnuPG and EasyPG Assistant provide mechanisms to
-remember your passphrases.  However, the configuration is a bit
+remember your passphrases for a limited time.  Using these, you only
+need to re-enter the passphrase occasionally.
+However, the configuration is a bit
 confusing since it depends on your GnuPG installation@xref{GnuPG
 version compatibility}, encryption method (symmetric or public key),
 and whether or not you want to use gpg-agent.  Here are some