summaryrefslogtreecommitdiff
path: root/doc/emacs/cmdargs.texi
diff options
context:
space:
mode:
authorPaul Eggert <eggert@cs.ucla.edu>2011-01-14 10:14:17 -0800
committerPaul Eggert <eggert@cs.ucla.edu>2011-01-14 10:14:17 -0800
commit8a1f4a98c1b8e3abaf1b46394a88d09531ce4c2d (patch)
tree9aed5489fdfdcf75087bf3d8e50e4f5952c8566c /doc/emacs/cmdargs.texi
parent3720fa2b1ac94b8ac9f193264bcf36990a5f43d2 (diff)
parentf80aa5bfa90dff5cd75d1f40e4ababa3c86af7fb (diff)
downloademacs-8a1f4a98c1b8e3abaf1b46394a88d09531ce4c2d.tar.gz
Merge from mainline.
Diffstat (limited to 'doc/emacs/cmdargs.texi')
-rw-r--r--doc/emacs/cmdargs.texi2
1 files changed, 1 insertions, 1 deletions
diff --git a/doc/emacs/cmdargs.texi b/doc/emacs/cmdargs.texi
index ff8e4f84abd..dc0ff935f78 100644
--- a/doc/emacs/cmdargs.texi
+++ b/doc/emacs/cmdargs.texi
@@ -1,6 +1,6 @@
@c This is part of the Emacs manual.
@c Copyright (C) 1985, 1986, 1987, 1993, 1994, 1995, 1997, 2001, 2002,
-@c 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
+@c 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
@c See file emacs.texi for copying conditions.
@node Emacs Invocation, X Resources, GNU Free Documentation License, Top
@appendix Command Line Arguments for Emacs Invocation