diff --git a/en_US.ISO8859-1/articles/committers-guide/article.sgml b/en_US.ISO8859-1/articles/committers-guide/article.sgml
index e5a4baca1c..58f3a1652e 100644
--- a/en_US.ISO8859-1/articles/committers-guide/article.sgml
+++ b/en_US.ISO8859-1/articles/committers-guide/article.sgml
@@ -727,11 +727,11 @@ alias scvs env CVS_RSH=ssh cvs -d user@ncvs.FreeBSD.o
You will almost certainly get a conflict because
- of the $Id: article.sgml,v 1.213 2004-09-20 11:04:00 marck Exp $ (or in FreeBSD's case,
+ of the $Id: article.sgml,v 1.214 2004-10-11 16:48:38 keramida Exp $ (or in FreeBSD's case,
$FreeBSD$)
lines, so you will have to edit the file to resolve the conflict
- (remove the marker lines and the second $Id: article.sgml,v 1.213 2004-09-20 11:04:00 marck Exp $ line,
- leaving the original $Id: article.sgml,v 1.213 2004-09-20 11:04:00 marck Exp $ line intact).
+ (remove the marker lines and the second $Id: article.sgml,v 1.214 2004-10-11 16:48:38 keramida Exp $ line,
+ leaving the original $Id: article.sgml,v 1.214 2004-10-11 16:48:38 keramida Exp $ line intact).
@@ -1015,8 +1015,18 @@ checkout -P
locks the directory you are working with and will prevent other
developers from committing into the same directory. If you have
to type a long commit message, type it before executing
- cvs commit, and insert it into the commit
- message.
+ cvs commit and insert it into the commit
+ message or save it in a file before committing and use the
+ option of CVS to read the commit message from
+ that file, i.e.
+
+ &prompt.user; vi logmsg
+&prompt.user; cvs ci -F logmsg shazam
+
+ This is the fastest way of passing a commit message to CVS but
+ you should be careful when editing the logmsg
+ file before the commit, because CVS won't give you a chance to edit
+ the message when you do the actual commit.