aboutsummaryrefslogtreecommitdiffstats
path: root/doc
diff options
context:
space:
mode:
authorAlan Mackenzie2016-01-24 20:30:39 +0000
committerAlan Mackenzie2016-01-24 20:30:39 +0000
commitfbce4757a874cc43806eb41b8637538b101c3c69 (patch)
tree029f7e1407ed659d9966a29c723197a545148795 /doc
parentfef1b3066ae02ec6dd37b0358905491fabbedfdf (diff)
downloademacs-fbce4757a874cc43806eb41b8637538b101c3c69.tar.gz
emacs-fbce4757a874cc43806eb41b8637538b101c3c69.zip
Expunge "allow" + infinitive without direct object from source and doc.
Do the same for "permit", "enable", and "prevent". * doc/emacs/mule.texi: * doc/lispref/control.texi: * doc/lispref/display.texi: * doc/lispref/frames.texi: * doc/lispref/functions.texi: * doc/lispref/nonascii.texi: * doc/lispref/streams.texi: * doc/lispref/windows.texi: * doc/misc/dbus.texi: * doc/misc/eww.texi: * doc/misc/flymake.texi: * doc/misc/octave-mode.texi: * doc/misc/org.texi: * doc/misc/reftex.texi: * doc/misc/tramp.texi: * doc/misc/wisent.texi: * etc/NEWS: * lisp/autorevert.el: * lisp/cedet/mode-local.el: * lisp/cedet/semantic/senator.el: * lisp/cedet/semantic/wisent.el: * lisp/dos-fns.el: * lisp/frameset.el: * lisp/gnus/gnus-agent.el: * lisp/gnus/mm-util.el: * lisp/international/characters.el: * lisp/ldefs-boot.el: * lisp/mail/mailclient.el: * lisp/man.el: * lisp/mh-e/mh-search.el: * lisp/net/tramp-cmds.el: * lisp/net/tramp-gvfs.el: * lisp/org/org-crypt.el: * lisp/org/org-element.el: * lisp/org/org-feed.el: * lisp/org/org.el: * lisp/org/ox-ascii.el: * lisp/org/ox-icalendar.el: * lisp/org/ox-publish.el: * lisp/org/ox.el: * lisp/play/gamegrid.el: * lisp/play/gomoku.el: * lisp/progmodes/antlr-mode.el: * lisp/progmodes/python.el: * lisp/progmodes/vhdl-mode.el: * lisp/strokes.el: * lisp/textmodes/ispell.el: * lisp/tree-widget.el: * lisp/vc/pcvs.el: * lisp/window.el: * src/lisp.h: * src/w32.c: * src/w32heap.c: * src/w32term.c: * src/window.c: * src/xfaces.c: Replace solecisms like "This allow to do something" with a correct alternative, such as "This allow you to do something", "This allows something to be done" or "This allows the doing of something".
Diffstat (limited to 'doc')
-rw-r--r--doc/emacs/mule.texi2
-rw-r--r--doc/lispref/control.texi10
-rw-r--r--doc/lispref/display.texi2
-rw-r--r--doc/lispref/frames.texi6
-rw-r--r--doc/lispref/functions.texi6
-rw-r--r--doc/lispref/nonascii.texi6
-rw-r--r--doc/lispref/streams.texi6
-rw-r--r--doc/lispref/windows.texi18
-rw-r--r--doc/misc/dbus.texi4
-rw-r--r--doc/misc/eww.texi4
-rw-r--r--doc/misc/flymake.texi2
-rw-r--r--doc/misc/octave-mode.texi2
-rw-r--r--doc/misc/org.texi6
-rw-r--r--doc/misc/reftex.texi8
-rw-r--r--doc/misc/tramp.texi7
-rw-r--r--doc/misc/wisent.texi4
16 files changed, 47 insertions, 46 deletions
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.
1216 When Emacs runs on MS-Windows versions that are descendants of the 1216 When Emacs runs on MS-Windows versions that are descendants of the
1217NT family (Windows 2000, XP, Vista, Windows 7, and Windows 8), the 1217NT family (Windows 2000, XP, Vista, Windows 7, and Windows 8), the
1218value of @code{file-name-coding-system} is largely ignored, as Emacs 1218value of @code{file-name-coding-system} is largely ignored, as Emacs
1219by default uses APIs that allow to pass Unicode file names directly. 1219by default uses APIs that allow passing Unicode file names directly.
1220By contrast, on Windows 9X, file names are encoded using 1220By contrast, on Windows 9X, file names are encoded using
1221@code{file-name-coding-system}, which should be set to the codepage 1221@code{file-name-coding-system}, which should be set to the codepage
1222(@pxref{Coding Systems, codepage}) pertinent for the current system 1222(@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
302specific values known and written in advance. However, sometimes it 302specific values known and written in advance. However, sometimes it
303is useful to select alternatives based on more general conditions that 303is useful to select alternatives based on more general conditions that
304distinguish between broad classes of values. The @code{pcase} macro 304distinguish between broad classes of values. The @code{pcase} macro
305allows to choose between alternatives based on matching the value of 305allows you to choose between alternatives based on matching the value
306an expression against a series of patterns. A pattern can be a 306of an expression against a series of patterns. A pattern can be a
307literal value (comparison to literal values is what @code{cond} does), 307literal value (comparison to literal values is what @code{cond} does),
308or it can be a more general description of the expected structure of 308or it can be a more general description of the expected structure of
309the expression's value. 309the expression's value.
@@ -350,7 +350,7 @@ when called with the value being matched as its argument.
350@var{predfun} can be one of the possible forms described below. 350@var{predfun} can be one of the possible forms described below.
351@item (guard @var{boolean-expression}) 351@item (guard @var{boolean-expression})
352Matches if @var{boolean-expression} evaluates to non-@code{nil}. This 352Matches if @var{boolean-expression} evaluates to non-@code{nil}. This
353allows to include in a UPattern boolean conditions that refer to 353allows you to include in a UPattern boolean conditions that refer to
354symbols bound to values (including the value being matched) by 354symbols bound to values (including the value being matched) by
355previous UPatterns. Typically used inside an @code{and} UPattern, see 355previous UPatterns. Typically used inside an @code{and} UPattern, see
356below. For example, @w{@code{(and x (guard (< x 10)))}} is a pattern 356below. 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
358@code{x} to that number. 358@code{x} to that number.
359@item (let @var{upattern} @var{expression}) 359@item (let @var{upattern} @var{expression})
360Matches if the specified @var{expression} matches the specified 360Matches if the specified @var{expression} matches the specified
361@var{upattern}. This allows to match a pattern against the value of 361@var{upattern}. This allows matching a pattern against the value of
362an @emph{arbitrary} expression, not just the expression that is the 362an @emph{arbitrary} expression, not just the expression that is the
363first argument to @code{pcase}. (It is called @code{let} because 363first argument to @code{pcase}. (It is called @code{let} because
364@var{upattern} can bind symbols to values using the @var{symbol} 364@var{upattern} can bind symbols to values using the @var{symbol}
@@ -407,7 +407,7 @@ Here's an illustrative example of using UPatterns:
407 (code (message "Unknown return code %S" code))) 407 (code (message "Unknown return code %S" code)))
408@end example 408@end example
409 409
410The QPatterns are more powerful. They allow to match the value of the 410The QPatterns are more powerful. They allow matching the value of the
411@var{expression} that is the first argument of @code{pcase} against 411@var{expression} that is the first argument of @code{pcase} against
412specifications of its @emph{structure}. For example, you can specify 412specifications of its @emph{structure}. For example, you can specify
413that the value must be a list of 2 elements whose first element is a 413that 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.
4303 Dividers can be dragged with the mouse and are therefore useful for 4303 Dividers can be dragged with the mouse and are therefore useful for
4304adjusting the sizes of adjacent windows with the mouse. They also serve 4304adjusting the sizes of adjacent windows with the mouse. They also serve
4305to visually set apart adjacent windows when no scroll bars or mode lines 4305to visually set apart adjacent windows when no scroll bars or mode lines
4306are present. The following three faces allow to customize the 4306are present. The following three faces allow the customization of the
4307appearance of dividers: 4307appearance of dividers:
4308 4308
4309@table @code 4309@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
2403The return value is not significant. 2403The return value is not significant.
2404@end defun 2404@end defun
2405 2405
2406On a graphical terminal the following two functions allow to retrieve 2406On a graphical terminal the following two functions allow the absolute
2407and set the absolute position of the mouse cursor. 2407position of the mouse cursor to be retrieved and set.
2408 2408
2409@defun mouse-absolute-pixel-position 2409@defun mouse-absolute-pixel-position
2410This function returns a cons cell (@var{x} . @var{y}) of the coordinates 2410This 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
2426displayed on @var{frame} is visible; otherwise it returns @code{nil}. 2426displayed on @var{frame} is visible; otherwise it returns @code{nil}.
2427@var{frame} omitted or @code{nil} means the selected frame. This is 2427@var{frame} omitted or @code{nil} means the selected frame. This is
2428useful when @code{make-pointer-invisible} is set to @code{t}: it 2428useful when @code{make-pointer-invisible} is set to @code{t}: it
2429allows to know if the pointer has been hidden. 2429allows you to know if the pointer has been hidden.
2430@xref{Mouse Avoidance,,,emacs, The Emacs Manual}. 2430@xref{Mouse Avoidance,,,emacs, The Emacs Manual}.
2431@end defun 2431@end defun
2432 2432
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}.
1248@item font-object 1248@item font-object
1249@end table 1249@end table
1250 1250
1251The optional @var{qualifier} allows to combine several applicable 1251The optional @var{qualifier} allows combining several applicable
1252methods. If it is not present, the defined method is a @dfn{primary} 1252methods. If it is not present, the defined method is a @dfn{primary}
1253method, responsible for providing the primary implementation of the 1253method, responsible for providing the primary implementation of the
1254generic function for the specialized arguments. You can also define 1254generic 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.
1270Such methods normally use @code{cl-call-next-method}, described below, 1270Such methods normally use @code{cl-call-next-method}, described below,
1271to invoke the other auxiliary or primary methods. 1271to invoke the other auxiliary or primary methods.
1272@item :extra @var{string} 1272@item :extra @var{string}
1273This allows to add more methods, distinguished by @var{string}, for 1273This allows you to add more methods, distinguished by @var{string},
1274the same specializers and qualifiers. 1274for the same specializers and qualifiers.
1275@end table 1275@end table
1276@end defmac 1276@end defmac
1277 1277
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.
1338@cindex null bytes, and decoding text 1338@cindex null bytes, and decoding text
1339@defvar inhibit-null-byte-detection 1339@defvar inhibit-null-byte-detection
1340If this variable has a non-@code{nil} value, null bytes are ignored 1340If this variable has a non-@code{nil} value, null bytes are ignored
1341when detecting the encoding of a region or a string. This allows to 1341when detecting the encoding of a region or a string. This allows the
1342correctly detect the encoding of text that contains null bytes, such 1342encoding of text that contains null bytes to be correctly detected,
1343as Info files with Index nodes. 1343such as Info files with Index nodes.
1344@end defvar 1344@end defvar
1345 1345
1346@defvar inhibit-iso-escape-detection 1346@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
343When reading or writing from the standard input/output streams of the 343When reading or writing from the standard input/output streams of the
344Emacs process in batch mode, it is sometimes required to make sure any 344Emacs process in batch mode, it is sometimes required to make sure any
345arbitrary binary data will be read/written verbatim, and/or that no 345arbitrary binary data will be read/written verbatim, and/or that no
346translation of newlines to or from CR-LF pairs are performed. This 346translation of newlines to or from CR-LF pairs is performed. This
347issue does not exist on Posix hosts, only on MS-Windows and MS-DOS@. 347issue does not exist on Posix hosts, only on MS-Windows and MS-DOS@.
348The following function allows to control the I/O mode of any standard 348The following function allows you to control the I/O mode of any
349stream of the Emacs process. 349standard stream of the Emacs process.
350 350
351@defun set-binary-mode stream mode 351@defun set-binary-mode stream mode
352Switch @var{stream} into binary or text I/O mode. If @var{mode} is 352Switch @var{stream} into binary or text I/O mode. If @var{mode} is
diff --git a/doc/lispref/windows.texi b/doc/lispref/windows.texi
index 7186791f94a..fee4b0c714f 100644
--- a/doc/lispref/windows.texi
+++ b/doc/lispref/windows.texi
@@ -383,8 +383,8 @@ as if @var{mini} were @code{nil}.
383If it doesn't find a suitable window, this function returns @code{nil}. 383If it doesn't find a suitable window, this function returns @code{nil}.
384@end defun 384@end defun
385 385
386The following function allows to retrieve the entire window tree of a 386The following function allows the entire window tree of a frame to be
387frame: 387retrieved:
388 388
389@defun window-tree &optional frame 389@defun window-tree &optional frame
390This function returns a list representing the window tree for frame 390This function returns a list representing the window tree for frame
@@ -1476,7 +1476,7 @@ displaying a buffer only temporarily (@pxref{Temporary Displays}), and
1476you want to continue working with the initial layout. 1476you want to continue working with the initial layout.
1477 1477
1478The behavior can be fixed by making a new parent window when splitting 1478The behavior can be fixed by making a new parent window when splitting
1479@var{W2}. The variable described next allows to do that. 1479@var{W2}. The variable described next allows that to be done.
1480 1480
1481@defopt window-combination-limit 1481@defopt window-combination-limit
1482This variable controls whether splitting a window shall make a new 1482This 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
1579 1579
1580Alternatively, the problems sketched above can be avoided by always 1580Alternatively, the problems sketched above can be avoided by always
1581resizing all windows in the same combination whenever one of its windows 1581resizing all windows in the same combination whenever one of its windows
1582is split or deleted. This also permits to split windows that would be 1582is split or deleted. This also permits spliting windows that would be
1583otherwise too small for such an operation. 1583otherwise too small for such an operation.
1584 1584
1585@defopt window-combination-resize 1585@defopt window-combination-resize
@@ -2522,11 +2522,11 @@ windows are dedicated to another buffer (@pxref{Dedicated Windows}).
2522 2522
2523@defun display-buffer-no-window buffer alist 2523@defun display-buffer-no-window buffer alist
2524If @var{alist} has a non-@code{nil} @code{allow-no-window} entry, then 2524If @var{alist} has a non-@code{nil} @code{allow-no-window} entry, then
2525this function does not display @code{buffer}. This allows to override 2525this function does not display @code{buffer}. This allows you to
2526the default action and avoid displaying the buffer. It is assumed that 2526override the default action and avoid displaying the buffer. It is
2527when the caller specifies a non-@code{nil} @code{allow-no-window} value 2527assumed that when the caller specifies a non-@code{nil}
2528it can handle a @code{nil} value returned from @code{display-buffer} in 2528@code{allow-no-window} value it can handle a @code{nil} value returned
2529this case. 2529from @code{display-buffer} in this case.
2530@end defun 2530@end defun
2531 2531
2532To illustrate the use of action functions, consider the following 2532To 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
138@section D-Bus version. 138@section D-Bus version.
139 139
140D-Bus has evolved over the years. New features have been added with 140D-Bus has evolved over the years. New features have been added with
141new D-Bus versions. There are two variables, which allow to determine 141new D-Bus versions. There are two variables, which allow the determination
142the used D-Bus version. 142of the D-Bus version used.
143 143
144@defvar dbus-compiled-version 144@defvar dbus-compiled-version
145This variable, a string, determines the version of D-Bus Emacs is 145This variable, a string, determines the version of D-Bus Emacs is
diff --git a/doc/misc/eww.texi b/doc/misc/eww.texi
index 16511de9573..9bc80fbd10d 100644
--- a/doc/misc/eww.texi
+++ b/doc/misc/eww.texi
@@ -162,8 +162,8 @@ You can view stored bookmarks with @kbd{B}
162@kindex S 162@kindex S
163@cindex Multiple Buffers 163@cindex Multiple Buffers
164 To get summary of currently opened EWW buffers, press @kbd{S} 164 To get summary of currently opened EWW buffers, press @kbd{S}
165(@code{eww-list-buffers}). The @file{*eww buffers*} buffer allows to 165(@code{eww-list-buffers}). The @file{*eww buffers*} buffer allows you
166quickly kill, flip through and switch to specific EWW buffer. 166to quickly kill, flip through and switch to specific EWW buffer.
167 167
168@findex eww-browse-with-external-browser 168@findex eww-browse-with-external-browser
169@vindex shr-external-browser 169@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.
717Flymake is also able to interpret error message patterns missing err-text-idx 717Flymake is also able to interpret error message patterns missing err-text-idx
718information. This is done by merely taking the rest of the matched line 718information. This is done by merely taking the rest of the matched line
719(@code{(substring line (match-end 0))}) as error text. This trick allows 719(@code{(substring line (match-end 0))}) as error text. This trick allows
720to make use of a huge collection of error message line patterns from 720making use of a huge collection of error message line patterns from
721@code{compile.el}. All these error patterns are appended to 721@code{compile.el}. All these error patterns are appended to
722the end of @code{flymake-err-line-patterns}. 722the end of @code{flymake-err-line-patterns}.
723 723
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.
436@c You can use either 'plain' Emacs Info or the function @code{octave-help} 436@c You can use either 'plain' Emacs Info or the function @code{octave-help}
437@c as your Octave info reader (for @samp{help -i}). In the former case, 437@c as your Octave info reader (for @samp{help -i}). In the former case,
438@c use @code{info_program ("info-emacs-info")}. 438@c use @code{info_program ("info-emacs-info")}.
439@c The latter is perhaps more attractive because it allows to look up keys 439@c The latter is perhaps more attractive because it allows you to look up keys
440@c in the indices of @emph{several} info files related to Octave (provided 440@c in the indices of @emph{several} info files related to Octave (provided
441@c that the Emacs variable @code{octave-help-files} is set correctly). In 441@c that the Emacs variable @code{octave-help-files} is set correctly). In
442@c this case, use @code{info_program ("info-emacs-octave-help")}. 442@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.}.
12890When processing a document, @samp{texinfo} back-end generates a minimal file 12890When processing a document, @samp{texinfo} back-end generates a minimal file
12891header along with a title page, a copyright page, and a menu. You control 12891header along with a title page, a copyright page, and a menu. You control
12892the latter through the structure of the document (@pxref{Headings and 12892the latter through the structure of the document (@pxref{Headings and
12893sectioning structure}). Various keywords allow to tweak the other parts. It 12893sectioning structure}). Various keywords allow you to tweak the other parts.
12894is also possible to give directions to install the document in the @samp{Top} 12894It is also possible to give directions to install the document in the
12895node. 12895@samp{Top} node.
12896 12896
12897@subsubheading File header 12897@subsubheading File header
12898 12898
diff --git a/doc/misc/reftex.texi b/doc/misc/reftex.texi
index 3dc3ed47b24..dccb2f2a4e0 100644
--- a/doc/misc/reftex.texi
+++ b/doc/misc/reftex.texi
@@ -5421,8 +5421,8 @@ after words. Disabled indexing in comment lines.
5421New command @code{reftex-create-bibtex-file} to create a new database 5421New command @code{reftex-create-bibtex-file} to create a new database
5422with all entries referenced in the current document. 5422with all entries referenced in the current document.
5423@item 5423@item
5424New keys @kbd{e} and @kbd{E} allow to produce a BibTeX database file 5424New keys @kbd{e} and @kbd{E} allow you to produce a BibTeX database
5425from entries marked in a citation selection buffer. 5425file from entries marked in a citation selection buffer.
5426@end itemize 5426@end itemize
5427 5427
5428@noindent @b{Version 4.21} 5428@noindent @b{Version 4.21}
@@ -5610,8 +5610,8 @@ demand.
5610@item 5610@item
5611Index support, along with many new options. 5611Index support, along with many new options.
5612@item 5612@item
5613The selection of keys for @code{\ref} and @code{\cite} now allows to 5613The selection of keys for @code{\ref} and @code{\cite} now allows you
5614select multiple items by marking entries with the @kbd{m} key. 5614to select multiple items by marking entries with the @kbd{m} key.
5615@item 5615@item
5616Fancyref support. 5616Fancyref support.
5617@end itemize 5617@end itemize
diff --git a/doc/misc/tramp.texi b/doc/misc/tramp.texi
index 1b2b89e8e4e..14cd7fc062e 100644
--- a/doc/misc/tramp.texi
+++ b/doc/misc/tramp.texi
@@ -915,8 +915,9 @@ can still access remote files using UNC file names instead of @value{tramp}:
915//melancholia/daniel$$/.emacs 915//melancholia/daniel$$/.emacs
916@end example 916@end example
917 917
918UNC file name specification does not allow to specify a different user 918UNC file name specification does not allow the specification of a
919name for authentication like the @command{smbclient} can. 919different user name for authentication like the @command{smbclient}
920can.
920 921
921 922
922@item @option{adb} 923@item @option{adb}
@@ -2990,7 +2991,7 @@ longer open. That is why @value{tramp} prompts for the password again
2990even if there is an @command{ssh} already open. 2991even if there is an @command{ssh} already open.
2991 2992
2992Some @command{ssh} versions support a @code{ControlPersist} option, 2993Some @command{ssh} versions support a @code{ControlPersist} option,
2993which allows to set the @code{ControlPath} provided the variable 2994which allows you to set the @code{ControlPath} provided the variable
2994@code{tramp-ssh-controlmaster-options} is customized as follows: 2995@code{tramp-ssh-controlmaster-options} is customized as follows:
2995 2996
2996@lisp 2997@lisp
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
1155@end table 1155@end table
1156@end defun 1156@end defun
1157 1157
1158The following two normal hooks permit to do some useful processing 1158The following two normal hooks permit doing some useful processing
1159respectively before to start parsing, and after the parser terminated. 1159respectively before starting parsing, and after the parser terminated.
1160 1160
1161@vindex wisent-pre-parse-hook 1161@vindex wisent-pre-parse-hook
1162@defvar wisent-pre-parse-hook 1162@defvar wisent-pre-parse-hook