Merge from emacs-24; up to 2012-12-06T01:39:03Z!monnier@iro.umontreal.ca

[bpt/emacs.git] / doc / lispref / maps.texi

diff --git a/doc/lispref/maps.texi b/doc/lispref/maps.texi
index 9426dfd..d92f6a8 100644 (file)
--- a/doc/lispref/maps.texi
+++ b/doc/lispref/maps.texi
@@ -1,6 +1,7 @@
 @c -*-texinfo-*-
 @c This is part of the GNU Emacs Lisp Reference Manual.
-@c Copyright (C) 1990-1993, 1999, 2001-2012 Free Software Foundation, Inc.
+@c Copyright (C) 1990-1993, 1999, 2001-2013 Free Software Foundation,
+@c Inc.
 @c See the file elisp.texi for copying conditions.
 @node Standard Keymaps
 @appendix Standard Keymaps
@@ -56,7 +57,7 @@ A full keymap for @kbd{ESC} (or @kbd{Meta}) commands.
 A sparse keymap used for the @kbd{M-o} prefix key.
 
 @item function-key-map
-The parent keymap of all @code{local-function-key-map} (q.v.) instances.
+The parent keymap of all @code{local-function-key-map} (q.v.@:) instances.
 
 @ignore
 @c Doesn't exist.
@@ -118,12 +119,12 @@ Some of them contain sub-menus.  For example, the Edit menu contains
 @code{menu-bar-search-menu}, etc.  @xref{Menu Bar}.
 @ignore
 TODO list all submenus?
-There are probably too many, and it would not be useful to do so, eg:
+There are probably too many, and it would not be useful to do so, e.g.:
 The Edit menu includes @code{yank-menu}, @code{menu-bar-search-menu},
 @code{menu-bar-replace-menu}, @code{menu-bar-goto-menu},
 @code{menu-bar-bookmark-map}, and @code{facemenu-menu}.
 There is also mule-menu-keymap, set-coding-system-map,
-setup-language-environment-map, describe-language-environment-map, 
+setup-language-environment-map, describe-language-environment-map,
 menu-bar-epatch-menu, menu-bar-ediff-merge-menu, menu-bar-ediff-menu, etc.
 @end ignore