Merge from origin/emacs-26

408862f02a (origin/emacs-26) ; * lisp/emacs-lisp/bytecomp.el: Tweak m...
9964db4c34 Restore obsolete method of changing byte-compile-dest-file
3dd25aeecb Some minor Tramp corrections
d670a15f25 * doc/misc/url.texi (http/https): Fix typo
99d07e8d5e Remove some bogus definition-prefixes from loaddefs
6067f0c702 Shell-quote wildcards when invoking 'vc-git-grep'
0540df10e6 Update documentation of '.dir-locals-2.el'
f2441ab320 ; Fix some tiny doc and comment typos
22ff46e6d8 ; Fix some comment typos

# Conflicts:
#	etc/NEWS

4 files changed, 6 insertions, 6 deletions

diff --git a/lisp/gnus/gnus-cus.el b/lisp/gnus/gnus-cus.el
index c22c9c1d5ac..f698d806171 100644
--- a/lisp/gnus/gnus-cus.el
+++ b/lisp/gnus/gnus-cus.el
@@ -454,7 +454,7 @@ Set variables local to the group you are entering.
 If you want to turn threading off in `news.answers', you could put
 `(gnus-show-threads nil)' in the group parameters of that group.
 `gnus-show-threads' will be made into a local variable in the summary
-buffer you enter, and the form nil will be `eval'ed there.
+buffer you enter, and the form nil will be `eval'uated there.
 
 This can also be used as a group-specific hook function, if you'd
 like.  If you want to hear a beep when you enter a group, you could
@@ -535,7 +535,7 @@ These files will not be loaded, even though they would normally be so,
 for some reason or other.")
 
     (eval (sexp :tag "Eval" :value nil) "\
-The value of this entry will be `eval'el.
+The value of this entry will be `eval'uated.
 This element will be ignored when handling global score files.")
 
     (read-only (boolean :tag "Read-only" :value t) "\
diff --git a/lisp/gnus/message.el b/lisp/gnus/message.el
index 1f1302e3fc8..8e3d299ee80 100644
--- a/lisp/gnus/message.el
+++ b/lisp/gnus/message.el
@@ -4774,7 +4774,7 @@ to find out how to use this."
 	 message-qmail-inject-program nil nil nil
 	 ;; qmail-inject's default behavior is to look for addresses on the
 	 ;; command line; if there're none, it scans the headers.
-	 ;; yes, it does The Right Thing w.r.t. Resent-To and it's kin.
+	 ;; yes, it does The Right Thing w.r.t. Resent-To and its kin.
 	 ;;
 	 ;; in general, ALL of qmail-inject's defaults are perfect for simply
 	 ;; reading a formatted (i. e., at least a To: or Resent-To header)
@@ -4792,7 +4792,7 @@ to find out how to use this."
 	 (if (functionp message-qmail-inject-args)
 	     (funcall message-qmail-inject-args)
 	   message-qmail-inject-args)))
-    ;; qmail-inject doesn't say anything on it's stdout/stderr,
+    ;; qmail-inject doesn't say anything on its stdout/stderr,
     ;; we have to look at the retval instead
     (0 nil)
     (100 (error "qmail-inject reported permanent failure"))
diff --git a/lisp/gnus/mm-decode.el b/lisp/gnus/mm-decode.el
index c6ac0567fbb..82b378e6270 100644
--- a/lisp/gnus/mm-decode.el
+++ b/lisp/gnus/mm-decode.el
@@ -676,7 +676,7 @@ MIME-Version header before proceeding."
 				  (mm-alist-to-plist (cdr ctl)) (car ctl))
 
 	     ;; what really needs to be done here is a way to link a
-	     ;; MIME handle back to it's parent MIME handle (in a multilevel
+	     ;; MIME handle back to its parent MIME handle (in a multilevel
 	     ;; MIME article).  That would probably require changing
 	     ;; the mm-handle API so we simply store the multipart buffer
 	     ;; name as a text property of the "multipart/whatever" string.
diff --git a/lisp/gnus/smime.el b/lisp/gnus/smime.el
index f62b65a0661..21f8c09e1cb 100644
--- a/lisp/gnus/smime.el
+++ b/lisp/gnus/smime.el
@@ -67,7 +67,7 @@
 ;;
 ;; To be able to verify messages you need to build up trust with
 ;; someone.  Perhaps you trust the CA that issued your certificate, at
-;; least I did, so I export it's certificates from my PKCS#12
+;; least I did, so I export its certificates from my PKCS#12
 ;; certificate with:
 ;;
 ;; $ openssl pkcs12 -in mykey.p12 -cacerts -nodes > cacert.pem