Merge from trunk.

[gnu-emacs] / doc / misc / widget.texi

diff --git a/doc/misc/widget.texi b/doc/misc/widget.texi
index 275da073a9f28e16b81759384783973708a4d4a3..a778f491e76668847a273c91944b090e3b183da1 100644 (file)
--- a/doc/misc/widget.texi
+++ b/doc/misc/widget.texi
@@ -8,8 +8,7 @@
 @c %**end of header
 
 @copying
-Copyright @copyright{} 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007,
-2008, 2009, 2010, 2011  Free Software Foundation, Inc.
+Copyright @copyright{} 2000-2011  Free Software Foundation, Inc.
 
 @quotation
 Permission is granted to copy, distribute and/or modify this document
@@ -25,7 +24,7 @@ developing GNU and promoting software freedom.''
 @end quotation
 @end copying
 
-@dircategory Emacs
+@dircategory Emacs lisp libraries
 @direntry
 * Widget: (widget).             The "widget" package used by the Emacs
                                   Customization facility.
@@ -451,7 +450,6 @@ There is a standard widget keymap which you might find useful.
 @findex widget-button-press
 @findex widget-button-click
 @defvr Const widget-keymap
-A keymap with the global keymap as its parent.@*
 @key{TAB} and @kbd{C-@key{TAB}} are bound to @code{widget-forward} and
 @code{widget-backward}, respectively.  @key{RET} and @kbd{Mouse-2}
 are bound to @code{widget-button-press} and
@@ -1829,7 +1827,3 @@ variables, and widgets described in this manual.
 @printindex cp
 
 @bye
-
-@ignore
-   arch-tag: 2b427731-4c61-4e72-85de-5ccec9c623f0
-@end ignore