-

21 files changed, 87 insertions, 96 deletions

diff --git a/doc/emacs/anti.texi b/doc/emacs/anti.texi
index ae13ae09a04..ece4d9456f1 100644
--- a/doc/emacs/anti.texi
+++ b/doc/emacs/anti.texi
@@ -197,7 +197,7 @@ for removing the whole bidi support when downgrading to Emacs 23.
 @item
 Horizontal scroll bars are no longer supported.  Enlarge your windows
 and frames instead, or use @code{truncate-lines} and the automatic
-horizontal scrolling of text that Emacs had since time immemoriam.
+horizontal scrolling of text that Emacs had since time immemorial.
 
 @item
 Emacs is again counting the height of a frame's menu and its tool bar
diff --git a/doc/emacs/custom.texi b/doc/emacs/custom.texi
index 670848c65a1..7be660c85d1 100644
--- a/doc/emacs/custom.texi
+++ b/doc/emacs/custom.texi
@@ -1299,8 +1299,8 @@ named @file{.dir-locals.el}@footnote{ On MS-DOS, the name of this file
 should be @file{_dir-locals.el}, due to limitations of the DOS
 filesystems.  If the filesystem is limited to 8+3 file names, the name
 of the file will be truncated by the OS to @file{_dir-loc.el}.
-}@footnote{ You can also use files like @file{.dir-locals2.el}, which
-are loaded in addition.  This is useful when @file{.dir-locals.el} is
+}@footnote{ You can also use @file{.dir-locals-2.el}, which
+is loaded in addition.  This is useful when @file{.dir-locals.el} is
 under version control in a shared repository and can't be used for
 personal customizations.  } in a
 directory.  Whenever Emacs visits any file in that directory or any of
diff --git a/doc/emacs/mule.texi b/doc/emacs/mule.texi
index bcde81b182e..40206d902b9 100644
--- a/doc/emacs/mule.texi
+++ b/doc/emacs/mule.texi
@@ -1216,7 +1216,7 @@ using the internal Emacs representation.
   When Emacs runs on MS-Windows versions that are descendants of the
 NT family (Windows 2000, XP, Vista, Windows 7, and Windows 8), the
 value of @code{file-name-coding-system} is largely ignored, as Emacs
-by default uses APIs that allow to pass Unicode file names directly.
+by default uses APIs that allow passing Unicode file names directly.
 By contrast, on Windows 9X, file names are encoded using
 @code{file-name-coding-system}, which should be set to the codepage
 (@pxref{Coding Systems, codepage}) pertinent for the current system
diff --git a/doc/lispref/control.texi b/doc/lispref/control.texi
index df60347f839..6fa802d9fdd 100644
--- a/doc/lispref/control.texi
+++ b/doc/lispref/control.texi
@@ -302,8 +302,8 @@ predicate conditions that compare values of expressions against
 specific values known and written in advance.  However, sometimes it
 is useful to select alternatives based on more general conditions that
 distinguish between broad classes of values.  The @code{pcase} macro
-allows to choose between alternatives based on matching the value of
-an expression against a series of patterns.  A pattern can be a
+allows you to choose between alternatives based on matching the value
+of an expression against a series of patterns.  A pattern can be a
 literal value (comparison to literal values is what @code{cond} does),
 or it can be a more general description of the expected structure of
 the expression's value.
@@ -350,7 +350,7 @@ when called with the value being matched as its argument.
 @var{predfun} can be one of the possible forms described below.
 @item (guard @var{boolean-expression})
 Matches if @var{boolean-expression} evaluates to non-@code{nil}.  This
-allows to include in a UPattern boolean conditions that refer to
+allows you to include in a UPattern boolean conditions that refer to
 symbols bound to values (including the value being matched) by
 previous UPatterns.  Typically used inside an @code{and} UPattern, see
 below.  For example, @w{@code{(and x (guard (< x 10)))}} is a pattern
@@ -358,7 +358,7 @@ which matches any number smaller than 10 and let-binds the variable
 @code{x} to that number.
 @item (let @var{upattern} @var{expression})
 Matches if the specified @var{expression} matches the specified
-@var{upattern}.  This allows to match a pattern against the value of
+@var{upattern}.  This allows matching a pattern against the value of
 an @emph{arbitrary} expression, not just the expression that is the
 first argument to @code{pcase}.  (It is called @code{let} because
 @var{upattern} can bind symbols to values using the @var{symbol}
@@ -407,7 +407,7 @@ Here's an illustrative example of using UPatterns:
   (code           (message "Unknown return code %S" code)))
 @end example
 
-The QPatterns are more powerful.  They allow to match the value of the
+The QPatterns are more powerful.  They allow matching the value of the
 @var{expression} that is the first argument of @code{pcase} against
 specifications of its @emph{structure}.  For example, you can specify
 that the value must be a list of 2 elements whose first element is a
diff --git a/doc/lispref/display.texi b/doc/lispref/display.texi
index d77059916fc..eaba03d5739 100644
--- a/doc/lispref/display.texi
+++ b/doc/lispref/display.texi
@@ -4303,7 +4303,7 @@ divider ends above the bottom divider.
    Dividers can be dragged with the mouse and are therefore useful for
 adjusting the sizes of adjacent windows with the mouse.  They also serve
 to visually set apart adjacent windows when no scroll bars or mode lines
-are present.  The following three faces allow to customize the
+are present.  The following three faces allow the customization of the
 appearance of dividers:
 
 @table @code
diff --git a/doc/lispref/frames.texi b/doc/lispref/frames.texi
index 614b7db0cac..55d72427548 100644
--- a/doc/lispref/frames.texi
+++ b/doc/lispref/frames.texi
@@ -2403,8 +2403,8 @@ The resulting mouse position is not constrained to the native frame of
 The return value is not significant.
 @end defun
 
-On a graphical terminal the following two functions allow to retrieve
-and set the absolute position of the mouse cursor.
+On a graphical terminal the following two functions allow the absolute
+position of the mouse cursor to be retrieved and set.
 
 @defun mouse-absolute-pixel-position
 This function returns a cons cell (@var{x} . @var{y}) of the coordinates
@@ -2426,7 +2426,7 @@ This predicate function returns non-@code{nil} if the mouse pointer
 displayed on @var{frame} is visible; otherwise it returns @code{nil}.
 @var{frame} omitted or @code{nil} means the selected frame.  This is
 useful when @code{make-pointer-invisible} is set to @code{t}: it
-allows to know if the pointer has been hidden.
+allows you to know if the pointer has been hidden.
 @xref{Mouse Avoidance,,,emacs, The Emacs Manual}.
 @end defun
 
diff --git a/doc/lispref/functions.texi b/doc/lispref/functions.texi
index c5f5b4c22c4..a2e94c34b62 100644
--- a/doc/lispref/functions.texi
+++ b/doc/lispref/functions.texi
@@ -1248,7 +1248,7 @@ Parent type: @code{array}.
 @item font-object
 @end table
 
-The optional @var{qualifier} allows to combine several applicable
+The optional @var{qualifier} allows combining several applicable
 methods.  If it is not present, the defined method is a @dfn{primary}
 method, responsible for providing the primary implementation of the
 generic function for the specialized arguments.  You can also define
@@ -1270,8 +1270,8 @@ The most specific of such methods will be run before any other method.
 Such methods normally use @code{cl-call-next-method}, described below,
 to invoke the other auxiliary or primary methods.
 @item :extra @var{string}
-This allows to add more methods, distinguished by @var{string}, for
-the same specializers and qualifiers.
+This allows you to add more methods, distinguished by @var{string},
+for the same specializers and qualifiers.
 @end table
 @end defmac
 
diff --git a/doc/lispref/nonascii.texi b/doc/lispref/nonascii.texi
index fca40238805..9cf3b5750f2 100644
--- a/doc/lispref/nonascii.texi
+++ b/doc/lispref/nonascii.texi
@@ -1338,9 +1338,9 @@ operates on the contents of @var{string} instead of bytes in the buffer.
 @cindex null bytes, and decoding text
 @defvar inhibit-null-byte-detection
 If this variable has a non-@code{nil} value, null bytes are ignored
-when detecting the encoding of a region or a string.  This allows to
-correctly detect the encoding of text that contains null bytes, such
-as Info files with Index nodes.
+when detecting the encoding of a region or a string.  This allows the
+encoding of text that contains null bytes to be correctly detected,
+such as Info files with Index nodes.
 @end defvar
 
 @defvar inhibit-iso-escape-detection
diff --git a/doc/lispref/streams.texi b/doc/lispref/streams.texi
index 80c194b1bdd..41bc71e6aea 100644
--- a/doc/lispref/streams.texi
+++ b/doc/lispref/streams.texi
@@ -343,10 +343,10 @@ shared structures.  @xref{Circular Objects}.  Its default value is
 When reading or writing from the standard input/output streams of the
 Emacs process in batch mode, it is sometimes required to make sure any
 arbitrary binary data will be read/written verbatim, and/or that no
-translation of newlines to or from CR-LF pairs are performed.  This
+translation of newlines to or from CR-LF pairs is performed.  This
 issue does not exist on Posix hosts, only on MS-Windows and MS-DOS@.
-The following function allows to control the I/O mode of any standard
-stream of the Emacs process.
+The following function allows you to control the I/O mode of any
+standard stream of the Emacs process.
 
 @defun set-binary-mode stream mode
 Switch @var{stream} into binary or text I/O mode.  If @var{mode} is
diff --git a/doc/lispref/variables.texi b/doc/lispref/variables.texi
index 42701614365..6c53e9b6cca 100644
--- a/doc/lispref/variables.texi
+++ b/doc/lispref/variables.texi
@@ -1765,33 +1765,20 @@ variables: by putting them in a special file, or by defining a
 @dfn{project class} for that directory.
 
 @defvr Constant dir-locals-file
-This constant is a wildcard pattern matching the name of files where
-Emacs expects to find directory-local variables.  Its value is
-@file{.dir-locals*.el}@footnote{
-The MS-DOS version of Emacs uses @file{_dir-locals*.el} instead, due to
+This constant is the name of the file where Emacs expects to find the
+directory-local variables.  The name of the file is
+@file{.dir-locals.el}@footnote{
+The MS-DOS version of Emacs uses @file{_dir-locals.el} instead, due to
 limitations of the DOS filesystems.
-}, and the most common file name to use is @file{.dir-locals.el}.
-
-Any file matching this name pattern in a directory causes Emacs to
-apply its settings when visiting files in that directory or any of its
-subdirectories (optionally, you can exclude subdirectories; see
-below).
-If some of the subdirectories have their own file matching
-@file{.dir-locals*.el}, Emacs uses the settings from the deepest file
-it finds starting from the file's directory and moving up the
-directory tree.  The file specifies local variables as a specially
-formatted list; see @ref{Directory Variables, , Per-directory Local
-Variables, emacs, The GNU Emacs Manual}, for more details.
-
-If the same directory contains multiple such files (for instance,
-@file{.dir-locals.el} and @file{.dir-locals2.el}), then all of them
-are used in @code{string<} order.  This means that, if two files
-specify different values for the same variable, the file sorted after
-will override the value of the previous file (for instance, values in
-@file{.dir-locals2.el} override those in @file{.dir-locals.el}).  Note
-that, because of how lexicographic order works, values in
-@file{.dir-locals10.el} are overridden by values in @file{.dir-locals2.el}.
-This can be avoided by using @file{.dir-locals02.el} instead.
+}.  A file by that name in a directory causes Emacs to apply its
+settings to any file in that directory or any of its subdirectories
+(optionally, you can exclude subdirectories; see below).
+If some of the subdirectories have their own @file{.dir-locals.el}
+files, Emacs uses the settings from the deepest file it finds starting
+from the file's directory and moving up the directory tree.  The file
+specifies local variables as a specially formatted list; see
+@ref{Directory Variables, , Per-directory Local Variables, emacs, The
+GNU Emacs Manual}, for more details.
 @end defvr
 
 @defun hack-dir-local-variables
diff --git a/doc/lispref/windows.texi b/doc/lispref/windows.texi
index 7186791f94a..ca756e3ff7f 100644
--- a/doc/lispref/windows.texi
+++ b/doc/lispref/windows.texi
@@ -383,8 +383,8 @@ as if @var{mini} were @code{nil}.
 If it doesn't find a suitable window, this function returns @code{nil}.
 @end defun
 
-The following function allows to retrieve the entire window tree of a
-frame:
+The following function allows the entire window tree of a frame to be
+retrieved:
 
 @defun window-tree &optional frame
 This function returns a list representing the window tree for frame
@@ -1476,7 +1476,7 @@ displaying a buffer only temporarily (@pxref{Temporary Displays}), and
 you want to continue working with the initial layout.
 
 The behavior can be fixed by making a new parent window when splitting
-@var{W2}.  The variable described next allows to do that.
+@var{W2}.  The variable described next allows that to be done.
 
 @defopt window-combination-limit
 This variable controls whether splitting a window shall make a new
@@ -1579,7 +1579,7 @@ combination limit of @var{W4} (the parent window of @var{W6} and
 
 Alternatively, the problems sketched above can be avoided by always
 resizing all windows in the same combination whenever one of its windows
-is split or deleted.  This also permits to split windows that would be
+is split or deleted.  This also permits splitting windows that would be
 otherwise too small for such an operation.
 
 @defopt window-combination-resize
@@ -2522,11 +2522,11 @@ windows are dedicated to another buffer (@pxref{Dedicated Windows}).
 
 @defun display-buffer-no-window buffer alist
 If @var{alist} has a non-@code{nil} @code{allow-no-window} entry, then
-this function does not display @code{buffer}.  This allows to override
-the default action and avoid displaying the buffer.  It is assumed that
-when the caller specifies a non-@code{nil} @code{allow-no-window} value
-it can handle a @code{nil} value returned from @code{display-buffer} in
-this case.
+this function does not display @code{buffer}.  This allows you to
+override the default action and avoid displaying the buffer.  It is
+assumed that when the caller specifies a non-@code{nil}
+@code{allow-no-window} value it can handle a @code{nil} value returned
+from @code{display-buffer} in this case.
 @end defun
 
 To illustrate the use of action functions, consider the following
diff --git a/doc/misc/dbus.texi b/doc/misc/dbus.texi
index c5901aff104..f4ebfebcbe3 100644
--- a/doc/misc/dbus.texi
+++ b/doc/misc/dbus.texi
@@ -138,8 +138,8 @@ name could be @samp{org.gnu.Emacs.TextEditor} or
 @section D-Bus version.
 
 D-Bus has evolved over the years.  New features have been added with
-new D-Bus versions.  There are two variables, which allow to determine
-the used D-Bus version.
+new D-Bus versions.  There are two variables, which allow the determination
+of the D-Bus version used.
 
 @defvar dbus-compiled-version
 This variable, a string, determines the version of D-Bus Emacs is
diff --git a/doc/misc/eww.texi b/doc/misc/eww.texi
index 14f0a8d0ea2..0e9bedbe1d0 100644
--- a/doc/misc/eww.texi
+++ b/doc/misc/eww.texi
@@ -168,8 +168,8 @@ You can view stored bookmarks with @kbd{B}
 @kindex S
 @cindex Multiple Buffers
   To get summary of currently opened EWW buffers, press @kbd{S}
-(@code{eww-list-buffers}).  The @file{*eww buffers*} buffer allows to
-quickly kill, flip through and switch to specific EWW buffer.
+(@code{eww-list-buffers}).  The @file{*eww buffers*} buffer allows you
+to quickly kill, flip through and switch to specific EWW buffer.
 
 @findex eww-browse-with-external-browser
 @vindex shr-external-browser
diff --git a/doc/misc/flymake.texi b/doc/misc/flymake.texi
index 99633b60c70..1c4644bba14 100644
--- a/doc/misc/flymake.texi
+++ b/doc/misc/flymake.texi
@@ -717,7 +717,7 @@ sort error menu items, which shows error messages first.
 Flymake is also able to interpret error message patterns missing err-text-idx
 information.  This is done by merely taking the rest of the matched line
 (@code{(substring line (match-end 0))}) as error text.  This trick allows
-to make use of a huge collection of error message line patterns from
+making use of a huge collection of error message line patterns from
 @code{compile.el}.  All these error patterns are appended to
 the end of @code{flymake-err-line-patterns}.
 
diff --git a/doc/misc/octave-mode.texi b/doc/misc/octave-mode.texi
index 65cc6a431eb..0307873df03 100644
--- a/doc/misc/octave-mode.texi
+++ b/doc/misc/octave-mode.texi
@@ -436,7 +436,7 @@ when Octave is waiting for input, or done sending output.
 @c You can use either 'plain' Emacs Info or the function @code{octave-help}
 @c as your Octave info reader (for @samp{help -i}).  In the former case,
 @c use @code{info_program ("info-emacs-info")}.
-@c The latter is perhaps more attractive because it allows to look up keys
+@c The latter is perhaps more attractive because it allows you to look up keys
 @c in the indices of @emph{several} info files related to Octave (provided
 @c that the Emacs variable @code{octave-help-files} is set correctly).  In
 @c this case, use @code{info_program ("info-emacs-octave-help")}.
diff --git a/doc/misc/org.texi b/doc/misc/org.texi
index ec676fca1d4..a5239acb59f 100644
--- a/doc/misc/org.texi
+++ b/doc/misc/org.texi
@@ -12890,9 +12890,9 @@ including DocBook.}.
 When processing a document, @samp{texinfo} back-end generates a minimal file
 header along with a title page, a copyright page, and a menu.  You control
 the latter through the structure of the document (@pxref{Headings and
-sectioning structure}).  Various keywords allow to tweak the other parts.  It
-is also possible to give directions to install the document in the @samp{Top}
-node.
+sectioning structure}).  Various keywords allow you to tweak the other parts.
+It is also possible to give directions to install the document in the
+@samp{Top} node.
 
 @subsubheading File header
 
diff --git a/doc/misc/reftex.texi b/doc/misc/reftex.texi
index 3dc3ed47b24..ff7011c5a76 100644
--- a/doc/misc/reftex.texi
+++ b/doc/misc/reftex.texi
@@ -5213,7 +5213,7 @@ mouse    @r{Highlighting is mouse driven.}
 both     @r{Both cursor and mouse trigger highlighting.}
 @end example
 
-Changing this variable requires to rebuild the selection and *toc*
+Changing this variable requires rebuilding the selection and *toc*
 buffers to become effective (keys @kbd{g} or @kbd{r}).
 @end defopt
 
@@ -5421,8 +5421,8 @@ after words.  Disabled indexing in comment lines.
 New command @code{reftex-create-bibtex-file} to create a new database
 with all entries referenced in the current document.
 @item
-New keys @kbd{e} and @kbd{E} allow to produce a BibTeX database file
-from entries marked in a citation selection buffer.
+New keys @kbd{e} and @kbd{E} allow you to produce a BibTeX database
+file from entries marked in a citation selection buffer.
 @end itemize
 
 @noindent @b{Version 4.21}
@@ -5610,8 +5610,8 @@ demand.
 @item
 Index support, along with many new options.
 @item
-The selection of keys for @code{\ref} and @code{\cite} now allows to
-select multiple items by marking entries with the @kbd{m} key.
+The selection of keys for @code{\ref} and @code{\cite} now allows you
+to select multiple items by marking entries with the @kbd{m} key.
 @item
 Fancyref support.
 @end itemize
diff --git a/doc/misc/texinfo.tex b/doc/misc/texinfo.tex
index 936c32dc5f4..8b3c9490f09 100644
--- a/doc/misc/texinfo.tex
+++ b/doc/misc/texinfo.tex
@@ -3,7 +3,7 @@
 % Load plain if necessary, i.e., if running under initex.
 \expandafter\ifx\csname fmtname\endcsname\relax\input plain\fi
 %
-\def\texinfoversion{2016-01-11.19}
+\def\texinfoversion{2016-01-20.20}
 %
 % Copyright 1985, 1986, 1988, 1990, 1991, 1992, 1993, 1994, 1995,
 % 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
@@ -4737,11 +4737,10 @@ end
   \def\_{\normalunderscore}%
   \def\-{}% @- shouldn't affect sorting
   %
-  \def\lbracechar{{\indexlbrace}}%
-  \def\rbracechar{{\indexrbrace}}%
-  \let\{=\lbracechar
-  \let\}=\rbracechar
-  %
+  \uccode`\1=`\{ \uppercase{\def\{{1}}%
+  \uccode`\1=`\} \uppercase{\def\}{1}}%
+  \let\lbracechar\{
+  \let\rbracechar\}
   %
   % Non-English letters.
   \def\AA{AA}%
@@ -4901,9 +4900,15 @@ end
   \indexdummies % Must do this here, since \bf, etc expand at this stage
   \useindexbackslash % \indexbackslash isn't defined now so it will be output 
                      % as is; and it will print as backslash.
+  % The braces around \indexbrace are recognized by texindex.
+  %
   % Get the string to sort by, by processing the index entry with all
   % font commands turned off.
   {\indexnofonts
+   \def\lbracechar{{\indexlbrace}}%
+   \def\rbracechar{{\indexrbrace}}%
+   \let\{=\lbracechar
+   \let\}=\rbracechar
    \indexnonalnumdisappear
    \xdef\indexsortkey{}%
    \let\sortas=\indexwritesortas
@@ -8526,10 +8531,6 @@ end
     }%
     \setcolor{\linkcolor}%
   \fi
-  %
-  % Float references are printed completely differently: "Figure 1.2"
-  % instead of "[somenode], p.3".  We distinguish them by the
-  % LABEL-title being set to a magic string.
   {%
     % Have to otherify everything special to allow the \csname to
     % include an _ in the xref name, etc.
@@ -8538,6 +8539,10 @@ end
     \expandafter\global\expandafter\let\expandafter\Xthisreftitle
       \csname XR#1-title\endcsname
   }%
+  %
+  % Float references are printed completely differently: "Figure 1.2"
+  % instead of "[somenode], p.3".  \iffloat distinguishes them by
+  % \Xthisreftitle being set to a magic string.
   \iffloat\Xthisreftitle
     % If the user specified the print name (third arg) to the ref,
     % print it instead of our usual "Figure 1.2".
diff --git a/doc/misc/tramp.texi b/doc/misc/tramp.texi
index 37bf7ea8bc4..d01f9be9fbf 100644
--- a/doc/misc/tramp.texi
+++ b/doc/misc/tramp.texi
@@ -815,11 +815,9 @@ capable of servicing requests from @value{tramp}.
 @cindex method smb
 @cindex smb method
 
-This is another non-native @value{tramp} method.  @command{smbclient}
-connects to any host with SMB/CIFS protocol, such as MS Windows and
-Samba Servers running on Unixes.  Tests show this @value{tramp} method
-works with MS Windows NT, MS Windows 2000, MS Windows XP, MS Windows
-Vista, and MS Windows 7.
+This non-native @value{tramp} method connects via the Server Message
+Block (SMB) networking protocol to hosts running file servers that are
+typically based on @url{https://www.samba.org/,,Samba} or MS Windows.
 
 Using @command{smbclient} requires a few tweaks when working with
 @value{tramp}:
@@ -827,7 +825,7 @@ Using @command{smbclient} requires a few tweaks when working with
 The first directory in the localname must be a share name on the
 remote host.
 
-Since smb shares end in the @code{$} character, @value{tramp} must use
+Since SMB shares end in the @code{$} character, @value{tramp} must use
 @code{$$} when specifying those shares to avoid environment variable
 substitutions.
 
@@ -871,16 +869,17 @@ uses the anonymous user (without prompting for password).  This
 behavior is unlike other @value{tramp} methods, where local user name
 is substituted.
 
-@option{smb} method is unavailable if Emacs is run under a local user
-authentication context in MS Windows.  However such users can still
-access remote files using UNC file names instead of @value{tramp}:
+The @option{smb} method is unavailable if Emacs is run under a
+local user authentication context in MS Windows.  However such users
+can still access remote files using UNC file names instead of @value{tramp}:
 
 @example
 //melancholia/daniel$$/.emacs
 @end example
 
-UNC file name specification does not allow to specify a different user
-name for authentication like the @command{smbclient} can.
+UNC file name specification does not allow the specification of a
+different user name for authentication like the @command{smbclient}
+can.
 
 @item @option{adb}
 @cindex method adb
@@ -2830,7 +2829,7 @@ open.  That is why @value{tramp} prompts for the password again even
 if there is an @command{ssh} already open.
 
 Some @command{ssh} versions support a @code{ControlPersist} option,
-which allows to set the @code{ControlPath} provided the variable
+which allows you to set the @code{ControlPath} provided the variable
 @code{tramp-ssh-controlmaster-options} is customized as follows:
 
 @lisp
diff --git a/doc/misc/url.texi b/doc/misc/url.texi
index acdad6b0d10..c46859968a2 100644
--- a/doc/misc/url.texi
+++ b/doc/misc/url.texi
@@ -423,7 +423,7 @@ the directory specified by @code{url-configuration-directory}.
 @end defopt
 
 @defopt url-cookie-confirmation
-Specifies whether confirmation is require to accept cookies.
+Specifies whether confirmation is required to accept cookies.
 @end defopt
 
 @defopt url-cookie-multiple-line
diff --git a/doc/misc/wisent.texi b/doc/misc/wisent.texi
index a4462937f1c..b4efbdad1b8 100644
--- a/doc/misc/wisent.texi
+++ b/doc/misc/wisent.texi
@@ -1155,8 +1155,8 @@ It defaults to the start symbol defined in the grammar
 @end table
 @end defun
 
-The following two normal hooks permit to do some useful processing
-respectively before to start parsing, and after the parser terminated.
+The following two normal hooks permit doing some useful processing
+respectively before starting parsing, and after the parser terminated.
 
 @vindex wisent-pre-parse-hook
 @defvar wisent-pre-parse-hook