Mention PCL-CVS.

diff --git a/etc/NEWS b/etc/NEWS
index 8cbe1c09f4268b86a3520f3f1f42b4e688101cd4..e8d77daf4650b1e485ffd9b2627761da47207070 100644 (file)
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -953,6 +953,12 @@ expression from that list, are not checked.
 
 ** New modes and packages
 
+*** The PCL-CVS package available by either running M-x cvs-examine
+or by visiting a CVS administrative directory (with a prefix argument)
+provides an alternative interface to VC-dired for CVS.
+It comes with log-view-mode to view RCS and SCCS logs and log-edit-mode
+used to enter checkin log messages.
+
 *** The new package called `woman' allows to browse Unix man pages
 without invoking external programs.
 
@@ -1149,12 +1155,20 @@ protocols.  It has a separate manual.
 
 *** autoconf.el provides a major mode for editing configure.in files
 for Autoconf, selected automatically.
+<<<<<<< NEWS
+
+*** windmove.el
+=======
 
 *** windmove.el provides moving between windows.
+>>>>>>> 1.127
 
+<<<<<<< NEWS
+=======
 *** crm.el provides a facility to read multiple strings from the 
 minibuffer with completion.
 
+>>>>>>> 1.127
 ** Withdrawn packages
 
 *** mldrag.el has been removed.  mouse.el provides the same
@@ -1262,7 +1276,7 @@ defun.  If set, the default, it is considered a defun start.  If not
 set, an open parenthesis in column 0 has no special meaning.
 
 ** The new function `string-to-syntax' can be used to translate syntax
-specificationa in string form as accepted my `modify-syntax-entry' to
+specifications in string form as accepted by `modify-syntax-entry' to
 the cons-cell form that is used for the values of the `syntax-table'
 text property, and in `font-lock-syntactic-keywords'.