Merge from emacs-23; up to 2010-06-01T01:49:15Z!monnier@iro.umontreal.ca

[bpt/emacs.git] / doc / misc / eieio.texi

diff --git a/doc/misc/eieio.texi b/doc/misc/eieio.texi
old mode 100755 (executable)
new mode 100644 (file)
index 8b70d16..8ee4028
--- a/doc/misc/eieio.texi
+++ b/doc/misc/eieio.texi
@@ -11,7 +11,7 @@
 @copying
 This manual documents EIEIO, an object framework for Emacs Lisp.
 
-Copyright @copyright{} 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
+Copyright @copyright{} 2007-2011 Free Software Foundation, Inc.
 
 @quotation
 Permission is granted to copy, distribute and/or modify this document
@@ -27,13 +27,10 @@ developing GNU and promoting software freedom.''
 @end quotation
 @end copying
 
-@ifinfo
-@format
-START-INFO-DIR-ENTRY
-* eieio: (eieio).       Objects for Emacs
-END-INFO-DIR-ENTRY
-@end format
-@end ifinfo
+@dircategory Emacs misc features
+@direntry
+* EIEIO: (eieio).               An objects system for Emacs Lisp.
+@end direntry
 
 @titlepage
 @center @titlefont{@value{TITLE}}
@@ -298,8 +295,8 @@ This option is here to support programs written with older versions of
 
 @menu
 * Inheritance::         How to specify parents classes
-* Slot Options::       How to specify features of a slot.
-* Class Options::      How to specify features for this class.
+* Slot Options::        How to specify features of a slot.
+* Class Options::       How to specify features for this class.
 @end menu
 
 @node Inheritance
@@ -1909,7 +1906,3 @@ Allow method overloading of method-like functions in Emacs.
 
 @contents
 @bye
-
-@ignore
-   arch-tag: 7225b7c7-2462-4563-99e7-836a20172178
-@end ignore