Merge from origin/emacs-27

f31c6792ab Fix support for Zip64 zip files
ba635a19fb * lisp/hi-lock.el (hi-lock-auto-select-face): Doc fix.  (B...
cc8fef2bdd Avoid infinite recursion with 'relative' line numbers display
395f10cb98 ; Fix more trivial typos
bf4accb65e ; Fix some trivial typos

# Conflicts:
#	etc/NEWS
#	lisp/arc-mode.el

4 files changed, 8 insertions, 8 deletions

diff --git a/doc/misc/ChangeLog.1 b/doc/misc/ChangeLog.1
index a85971bdaf6..f74e51f400e 100644
--- a/doc/misc/ChangeLog.1
+++ b/doc/misc/ChangeLog.1
@@ -502,7 +502,7 @@
 	* org.texi (@LaTeX{} specific attributes): Update manual.
 
 	* org.texi (Top, Exporting): Org has its own documentation and
-	should therefore be removed from "Other build-in back-ends".
+	should therefore be removed from "Other built-in back-ends".
 
 2014-04-22  Stefan Monnier  <monnier@iro.umontreal.ca>
 
@@ -1161,7 +1161,7 @@
 	(Special agenda views): Mention the "agenda*" agenda view.
 
 	* org.texi (Repeated tasks): Document how to ignore a repeater
-	when using both a scheduled and a deadline timetamp.
+	when using both a scheduled and a deadline timestamp.
 
 	* org.texi (Global and local cycling): Wrap in a new subsection.
 	(Initial visibility, Catching invisible edits): New subsections.
@@ -3515,7 +3515,7 @@
 2012-01-03  Rafael Laboissiere  <rafael@laboissiere.net>  (tiny change)
 
 	* org.texi (External links): Add footnote on how the behavior
-	of the text search in Org files are controled by the variable
+	of the text search in Org files are controlled by the variable
 	`org-link-search-must-match-exact-headline'.
 
 2012-01-03  Eric Schulte  <schulte.eric@gmail.com>
@@ -6262,7 +6262,7 @@
 	information - it's hard to keep up-to-date, and adds nothing.
 	Similarly with direct links to mailing lists.
 	(Spell-checkers): Rename node from Ispell.  Mention Aspell and Hunspell.
-	(Mailcrypt): Remove section - mailcrypt has not been updated in mnay
+	(Mailcrypt): Remove section - mailcrypt has not been updated in many
 	years, and Emacs comes with tools for this now.
 	(Patch): Remove section - this is a standard tool.
 	(Using function keys under X): Remove section.
@@ -6493,7 +6493,7 @@
 	specified in a property.
 	(Text areas in HTML export): New section.
 	(External links): Add examples for text search and ID links.
-	(Built-in table editor): Remove the descriptio of `C-c
+	(Built-in table editor): Remove the description of `C-c
 	C-q', it not longer works.
 	(Literal examples): Document that a space must follow
 	the colon in short examples.
diff --git a/doc/misc/ede.texi b/doc/misc/ede.texi
index 412176986cc..63e3595a509 100644
--- a/doc/misc/ede.texi
+++ b/doc/misc/ede.texi
@@ -2436,7 +2436,7 @@ Argument @var{THIS} is the project to convert @var{PATH} to.
 @end deffn
 
 @deffn Method ede-name :AFTER this
-Return the name of @var{THIS} targt.
+Return the name of @var{THIS} target.
 @end deffn
 
 @deffn Method ede-target-buffer-in-sourcelist :AFTER this buffer source
diff --git a/doc/misc/flymake.texi b/doc/misc/flymake.texi
index 19dcb19de74..c7bf99c6413 100644
--- a/doc/misc/flymake.texi
+++ b/doc/misc/flymake.texi
@@ -465,7 +465,7 @@ string containing the text contained between those positions (if any),
 after the change was performed.
 
 @item @code{:changes-start} and @code{:changes-end}
-The value is, repectively, the minimum and maximum buffer positions
+The value is, respectively, the minimum and maximum buffer positions
 touched by the recent changes.  These are provided for convenience and
 only if @code{:recent-changes} is also provided.
 
diff --git a/doc/misc/tramp.texi b/doc/misc/tramp.texi
index 806a1ddf684..5e84a36d515 100644
--- a/doc/misc/tramp.texi
+++ b/doc/misc/tramp.texi
@@ -3150,7 +3150,7 @@ to user @code{root} on host @code{remotehost}, starting with an
 @option{ssh} session on host @code{remotehost}:
 @samp{@value{prefix}ssh@value{postfixhop}%h|su@value{postfixhop}remotehost@value{postfix}}.
 
-On the other hand, if a trailing hop does not specifiy a host name,
+On the other hand, if a trailing hop does not specify a host name,
 the host name of the previous hop is reused. Therefore, the following
 file name is equivalent to the previous example:
 @samp{@value{prefix}ssh@value{postfixhop}remotehost|su@value{postfixhop}@value{postfix}}.