Merge from origin/emacs-26

90bea37 ; * etc/PROBLEMS: Fix fvwm version number in last commit
af82d1f * etc/PROBLEMS: Document stickyness problem with FVWM (Bug#31...
4a3aed2 Update Emacs Lisp Intro to match current behavior
21f2247 Merge branch 'emacs-26' of git.savannah.gnu.org:/srv/git/emac...
3257085 Fix previous commit
6d23525 Fix typos in several manuals (Bug#31610)
9188291 Add detailed documentation about lock files
e5471b2 Add commentary for subtle aspect of frame.el

Conflicts:
	doc/lispintro/emacs-lisp-intro.texi

4 files changed, 5 insertions, 5 deletions

diff --git a/doc/misc/autotype.texi b/doc/misc/autotype.texi
index 3d61d24fa9d..7e2476c225d 100644
--- a/doc/misc/autotype.texi
+++ b/doc/misc/autotype.texi
@@ -214,7 +214,7 @@ have been omitted.)
 @cindex skeleton language
 
 @findex skeleton-insert
-  Skeletons are an shorthand extension to the Lisp language, where various
+  Skeletons are a shorthand extension to the Lisp language, where various
 atoms directly perform either actions on the current buffer or rudimentary
 flow control mechanisms.  Skeletons are interpreted by the function
 @code{skeleton-insert}.
diff --git a/doc/misc/org.texi b/doc/misc/org.texi
index 807b80dbdb5..3bce0dd7369 100644
--- a/doc/misc/org.texi
+++ b/doc/misc/org.texi
@@ -5134,7 +5134,7 @@ that Org can parse this line correctly:
 
 In this example, @samp{GTD} is the @emph{group tag} and it is related to two
 other tags: @samp{Control}, @samp{Persp}.  Defining @samp{Control} and
-@samp{Persp} as group tags creates an hierarchy of tags:
+@samp{Persp} as group tags creates a hierarchy of tags:
 
 @example
 #+TAGS: [ Control : Context Task ]
@@ -11178,7 +11178,7 @@ Org exports text in this block only when using ASCII back-end.
 @cindex horizontal rules, in ASCII export
 
 ASCII back-end recognizes only one attribute, @code{:width}, which specifies
-the width of an horizontal rule in number of characters.  The keyword and
+the width of a horizontal rule in number of characters.  The keyword and
 syntax for specifying widths is:
 
 @example
diff --git a/doc/misc/viper.texi b/doc/misc/viper.texi
index 19d592f3e87..e67734bc01c 100644
--- a/doc/misc/viper.texi
+++ b/doc/misc/viper.texi
@@ -4330,7 +4330,7 @@ Same as @code{tabstop}, but affects all buffers.
 @cindex auto fill
 @cindex word wrap
 wrapmargin: In append mode Vi automatically
-puts a <lf> whenever there is a <sp> or <ht>
+puts an <lf> whenever there is an <sp> or <ht>
 within <wm> columns from the right margin.
 @item wrapscan
 @itemx ws
diff --git a/doc/misc/wisent.texi b/doc/misc/wisent.texi
index 2dffa089da5..12bb09c7b25 100644
--- a/doc/misc/wisent.texi
+++ b/doc/misc/wisent.texi
@@ -1937,7 +1937,7 @@ rule:
 @end example
 
 Set the @code{reparse-symbol} property of the expanded tag to
-@samp{rule}.  A important consequence is that:
+@samp{rule}.  An important consequence is that:
 
 @strong{Every nonterminal having any rule that calls @code{EXPANDTAG}
 in a semantic action, should be declared as a start symbol!}