Merge from origin/emacs-27

2f5f30671a (origin/emacs-27) Fix broken links in autorevert.el
673c02f6d0 * lisp/international/ja-dic-cnv.el (skkdic-convert): Doc fix.

diff --cc lisp/autorevert.el
Simple merge

diff --cc lisp/international/ja-dic-cnv.el
index 3be7849df197a536c020b8c0a01423837cae44fa,a5082f630c76f08229b5ed8d68895568547121c6..793508cae4a8437a3eba6e9ebb3b079c29cc301c
--- 1/lisp/international/ja-dic-cnv.el
--- 2/lisp/international/ja-dic-cnv.el
+++ b/lisp/international/ja-dic-cnv.el
@@@ -323,13 -323,12 +323,11 @@@
      (insert ")\n\n")))
  
  (defun skkdic-convert (filename &optional dirname)
-   "Generate Emacs Lisp file form Japanese dictionary file FILENAME.
+   "Generate Emacs Lisp file from Japanese dictionary file FILENAME.
  The format of the dictionary file should be the same as SKK dictionaries.
- Optional argument DIRNAME if specified is the directory name under which
- the generated Emacs Lisp is saved.
- The name of generated file is specified by the variable `ja-dic-filename'."
+ Saves the output as `ja-dic-filename', in directory DIRNAME (if specified)."
    (interactive "FSKK dictionary file: ")
 -  (let* ((coding-system-for-read 'euc-japan)
 -       (skkbuf (get-buffer-create " *skkdic-unannotated*"))
 +  (let* ((skkbuf (get-buffer-create " *skkdic-unannotated*"))
         (buf (get-buffer-create "*skkdic-work*")))
      ;; Set skkbuf to an unannotated copy of the dictionary.
      (with-current-buffer skkbuf