Merge from emacs-23

3 files changed, 7 insertions, 2 deletions

diff --git a/doc/misc/ChangeLog b/doc/misc/ChangeLog
index 2ab078d5473..a159715a69d 100644
--- a/doc/misc/ChangeLog
+++ b/doc/misc/ChangeLog
@@ -1,3 +1,8 @@
+2010-06-10  Glenn Morris  <rgm@gnu.org>
+
+        * idlwave.texi (Load-Path Shadows):
+        * org.texi (Handling links): Fix typos.
+
 2010-06-07  Teodor Zlatanov  <tzz@lifelogs.com>
 
         * gnus.texi (Interactive): Explain effect of gnus-expert-user better.
diff --git a/doc/misc/idlwave.texi b/doc/misc/idlwave.texi
index 6292902aa99..94a2c2c6db7 100644
--- a/doc/misc/idlwave.texi
+++ b/doc/misc/idlwave.texi
@@ -3717,7 +3717,7 @@ C-i}.  Here are the different routines (also available in the Menu
 
 @table @asis
 @item @kbd{M-x idlwave-list-buffer-load-path-shadows}
-This commands checks the names of all routines defined in the current
+This command checks the names of all routines defined in the current
 buffer for shadowing conflicts with other routines accessible to
 IDLWAVE.  The command also has a key binding: @kbd{C-c C-b}
 @item @kbd{M-x idlwave-list-shell-load-path-shadows}.
diff --git a/doc/misc/org.texi b/doc/misc/org.texi
index 00474f6d708..c4285d59f27 100644
--- a/doc/misc/org.texi
+++ b/doc/misc/org.texi
@@ -2978,7 +2978,7 @@ link and description parts of the link.
 Open link at point.  This will launch a web browser for URLs (using
 @command{browse-url-at-point}), run VM/MH-E/Wanderlust/Rmail/Gnus/BBDB for
 the corresponding links, and execute the command in a shell link.  When the
-cursor is on an internal link, this commands runs the corresponding search.
+cursor is on an internal link, this command runs the corresponding search.
 When the cursor is on a TAG list in a headline, it creates the corresponding
 TAGS view.  If the cursor is on a timestamp, it compiles the agenda for that
 date.  Furthermore, it will visit text and remote files in @samp{file:} links