summaryrefslogtreecommitdiff
path: root/doc/man/emacs.1
diff options
context:
space:
mode:
authorStefan Monnier <monnier@iro.umontreal.ca>2011-01-14 12:18:41 -0500
committerStefan Monnier <monnier@iro.umontreal.ca>2011-01-14 12:18:41 -0500
commit77ab81d0545e980c57c0a35510ade29a9e43b4cd (patch)
tree258514dac7faab41642d8f319eb113c8a5f09690 /doc/man/emacs.1
parent8faba62c38f67693535c3471d867e66757b3b04e (diff)
parentfb724e553757e9d3344be443ab5f329afc9bf91c (diff)
downloademacs-77ab81d0545e980c57c0a35510ade29a9e43b4cd.tar.gz
Merge from emacs-23
Diffstat (limited to 'doc/man/emacs.1')
-rw-r--r--doc/man/emacs.12
1 files changed, 1 insertions, 1 deletions
diff --git a/doc/man/emacs.1 b/doc/man/emacs.1
index ae2bc82c920..89eafc9ba51 100644
--- a/doc/man/emacs.1
+++ b/doc/man/emacs.1
@@ -643,7 +643,7 @@ Copyright
.if t \(co
.if n (C)
1995, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008,
-2009, 2010
+2009, 2010, 2011
Free Software Foundation, Inc.
.PP
Permission is granted to make and distribute verbatim copies of this