Merge from emacs--devo--0

Patches applied:

 * emacs--devo--0  (patch 880-885)

   - Remove RCS keywords from doc/misc/cc-mode.texi
   - Update from CVS

Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-264

3 files changed, 10 insertions, 4 deletions

diff --git a/doc/misc/ChangeLog b/doc/misc/ChangeLog
index 056ad379127..364b2796ac0 100644
--- a/doc/misc/ChangeLog
+++ b/doc/misc/ChangeLog
@@ -1,3 +1,9 @@
+2007-10-10  Michael Albinus  <michael.albinus@gmx.de>
+
+        Sync with Tramp 2.1.11.
+
+        * trampver.texi: Update release number.
+
 2007-10-06  Michael Albinus  <michael.albinus@gmx.de>
 
         * tramp.texi (External packages): New section.
diff --git a/doc/misc/cc-mode.texi b/doc/misc/cc-mode.texi
index eb69733b61c..f4d65ed07aa 100644
--- a/doc/misc/cc-mode.texi
+++ b/doc/misc/cc-mode.texi
@@ -208,8 +208,8 @@ license to the document, as described in section 6 of the license.
 @vskip 0pt plus 1filll
 @insertcopying
 
-This manual was generated from $Revision: 1.2 $ of $RCSfile: cc-mode.texi,v $, which can be
-downloaded from
+This manual was generated from cc-mode.texi, which can be downloaded
+from
 @url{http://cvs.savannah.gnu.org/viewcvs/emacs/emacs/doc/misc/cc-mode.texi}.
 @end titlepage
 
diff --git a/doc/misc/trampver.texi b/doc/misc/trampver.texi
index 4ed196a80f0..179af979c06 100644
--- a/doc/misc/trampver.texi
+++ b/doc/misc/trampver.texi
@@ -4,12 +4,12 @@
 @c In the Tramp CVS, the version number is auto-frobbed from
 @c configure.ac, so you should edit that file and run
 @c "autoconf && ./configure" to change the version number.
-@set trampver 2.1.11-pre
+@set trampver 2.1.11
 
 @c Other flags from configuration
 @set instprefix /usr/local
 @set lispdir /usr/local/share/emacs/site-lisp
-@set infodir /usr/local/info
+@set infodir /usr/local/share/info
 
 @c Formatting of the tramp program name consistent.
 @set tramp @sc{tramp}