Backport commit d309994af from Emacs

* doc/org.texi (Cooperation, Conflicts): Fix typos.  Reported by Mak
Kolybabi <mak@kolybabi.com> (Bug#32853)

Fix typos in documentation
d309994aff03200ed8ef9fadd98f69d6d3166701
Eli Zaretskii
Thu Sep 27 18:48:06 2018 +0300
This commit is contained in:
Eli Zaretskii 2018-09-27 18:48:06 +03:00 committed by Kyle Meyer
parent eb9955a28f
commit 85e215b6de

View file

@ -17996,7 +17996,7 @@ supports Imenu menus. Enable it with a mode hook as follows:
@end lisp
@vindex org-imenu-depth
By default the Imenu index is two levels deep. Change the index depth using
thes variable, @code{org-imenu-depth}.
the variable @code{org-imenu-depth}.
@item @file{speedbar.el} by Eric M. Ludlam
@cindex @file{speedbar.el}
@cindex Ludlam, Eric M.
@ -18070,7 +18070,7 @@ different replacement keys, look at the variable @code{org-disputed-keys}.
@cindex @file{ecomplete.el}
Ecomplete provides ``electric'' address completion in address header
lines in message buffers. Sadly Orgtbl mode cuts ecompletes power
lines in message buffers. Sadly Orgtbl mode cuts ecomplete's power
supply: No completion happens when Orgtbl mode is enabled in message
buffers while entering text in address header lines. If one wants to
use ecomplete one should @emph{not} follow the advice to automagically