; Merge from origin/emacs-25

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

diff --git a/doc/misc/eieio.texi b/doc/misc/eieio.texi
index 7cee5c30a1b45c260ad5c61422ed8c981614ff07..31930020e3865fa24fe4973eafabaf5f33309bd1 100644 (file)
--- a/doc/misc/eieio.texi
+++ b/doc/misc/eieio.texi
@@ -12,7 +12,7 @@
 @copying
 This manual documents EIEIO, an object framework for Emacs Lisp.
 
-Copyright @copyright{} 2007--2015 Free Software Foundation, Inc.
+Copyright @copyright{} 2007--2016 Free Software Foundation, Inc.
 
 @quotation
 Permission is granted to copy, distribute and/or modify this document
@@ -1529,7 +1529,7 @@ Currently, the default superclass is defined as follows:
   nil
   "Default parent class for classes with no specified parent class.
 Its slots are automatically adopted by classes with no specified
-parents.  This class is not stored in the ‘parent’ slot of a class vector."
+parents.  This class is not stored in the `parent' slot of a class vector."
   :abstract t)
 @end example