Merge from emacs-23

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

diff --git a/doc/misc/tramp.texi b/doc/misc/tramp.texi
index dd9fd32cb445ba49233ea058d527df2b38c6e103..350466da0d789cb408dc240c505c69c8132fc2be 100644 (file)
--- a/doc/misc/tramp.texi
+++ b/doc/misc/tramp.texi
@@ -38,7 +38,7 @@
 
 @copying
 Copyright @copyright{} 1999, 2000, 2001, 2002, 2003, 2004, 2005,
-2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
+2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
 
 @quotation
 Permission is granted to copy, distribute and/or modify this document