X-Git-Url: http://git.hcoop.net/bpt/emacs.git/blobdiff_plain/b03f96dc5a6651d1dc84b81b2a15cad6908b9809..c6046b94e58b33ddcfca8f6361ddaf780ba5cb18:/doc/misc/pcl-cvs.texi

diff --git a/doc/misc/pcl-cvs.texi b/doc/misc/pcl-cvs.texi
index 4a365bce66..92c309f5e9 100644
--- a/doc/misc/pcl-cvs.texi
+++ b/doc/misc/pcl-cvs.texi
@@ -6,34 +6,25 @@
 @c %**end of header
 
 @copying
-Copyright @copyright{} 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998,
-1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
-Free Software Foundation, Inc.
+Copyright @copyright{} 1991-2012 Free Software Foundation, Inc.
 
 @quotation
 Permission is granted to copy, distribute and/or modify this document
-under the terms of the GNU Free Documentation License, Version 1.2 or
-any later version published by the Free Software Foundation; with the
-Invariant Sections being ``The GNU Manifesto'', ``Distribution'' and
-``GNU GENERAL PUBLIC LICENSE'', with the Front-Cover texts being ``A GNU
-Manual'', and with the Back-Cover Texts as in (a) below.  A copy of the
-license is included in the section entitled ``GNU Free Documentation
-License'' in the Emacs manual.
-
-This document is part of a collection distributed under the GNU Free
-Documentation License.  If you want to distribute this document
-separately from the collection, you can do so by adding a copy of the
-license to the document, as described in section 6 of the license.
-
-(a) The FSF's Back-Cover Text is: ``You have freedom to copy and modify
-this GNU Manual, like GNU software.  Copies published by the Free
-Software Foundation raise funds for GNU development.''
+under the terms of the GNU Free Documentation License, Version 1.3 or
+any later version published by the Free Software Foundation; with no
+Invariant Sections, with the Front-Cover texts being ``A GNU Manual'',
+and with the Back-Cover Texts as in (a) below.  A copy of the license
+is included in the section entitled ``GNU Free Documentation License''.
+
+(a) The FSF's Back-Cover Text is: ``You have the freedom to copy and
+modify this GNU manual.  Buying copies from the FSF supports it in
+developing GNU and promoting software freedom.''
 @end quotation
 @end copying
 
-@dircategory Emacs
+@dircategory Emacs misc features
 @direntry
-* PCL-CVS: (pcl-cvs).	Emacs front-end to CVS.
+* PCL-CVS: (pcl-cvs).           Emacs front-end to CVS.
 @end direntry
 
 @c The titlepage section does not appear in the Info file.
@@ -62,6 +53,8 @@ Software Foundation raise funds for GNU development.''
 @insertcopying
 @end titlepage
 
+@contents
+
 @c ================================================================
 @c                   The real text starts here
 @c ================================================================
@@ -75,6 +68,9 @@ is nowhere near complete, so you are advised to use @kbd{M-x
 customize-group RET pcl-cvs @key{RET}} and to look at the documentation strings
 of the various commands and major modes for further information.
 @c This manual is updated to release 2.5 of PCL-CVS.
+
+@insertcopying
+
 @end ifnottex
 
 @menu
@@ -139,10 +135,9 @@ Customization
 PCL-CVS is a front-end to CVS versions 1.9 and later.
 It concisely shows the present status of a checked out module in an
 Emacs buffer and provides single-key access to the most frequently used CVS
-commands.
-For Emacs users accustomed to VC, PCL-CVS can be thought of as a replacement
-for VC-dired (@pxref{VC Dired Mode, , Dired under VC, emacs, The GNU
-Emacs Manual}) specifically designed for CVS.
+commands.  Note that the @code{vc-dir} command (@pxref{VC Directory
+Mode, , , emacs, The GNU Emacs Manual}) provides similar
+functionality, but for several version control systems, including CVS.
 
 PCL-CVS was originally written many years ago by Per Cederqvist who
 proudly maintained it until January 1996, at which point he released the
@@ -218,7 +213,7 @@ arguments, updated the XEmacs support, updated the manual, and fixed
 numerous bugs.
 
 @item
-@email{monnier@@cs.yale.edu, Stefan Monnier} added a slew of other
+@email{monnier@@gnu.org, Stefan Monnier} added a slew of other
 features and introduced even more new bugs.  If there's any bug left,
 you can be sure it's his.
 
@@ -1278,7 +1273,7 @@ will be called as @samp{cvs -d @var{cvs-cvsroot}@dots{}}.  This can be
 useful if your site has several repositories.
 
 @item log-edit-require-final-newline
-@c wordy to avoid unhderfull hbox
+@c wordy to avoid underfull hbox
 When you enter a log message by typing into the
 @samp{*cvs-commit-message*} buffer, PCL-CVS normally automatically
 inserts a trailing newline, unless there already is one.  This behavior
@@ -1433,11 +1428,4 @@ this manual.
 
 @printindex ky
 
-@setchapternewpage odd
-@summarycontents
-@contents
 @bye
-
-@ignore
-   arch-tag: 5c7178ce-56fa-40b0-abd7-f4a09758b235
-@end ignore