From 3960e8c10a0b8fb3c5f9e9a653482067b6fd2f8e Mon Sep 17 00:00:00 2001 From: Giorgos Keramidas Date: Mon, 11 Oct 2004 17:06:14 +0000 Subject: [PATCH] Expand a contraction that I bogusly included in my last commit here and claim my share of the pointy hat pool. Spotted by: simon --- en_US.ISO8859-1/articles/committers-guide/article.sgml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/en_US.ISO8859-1/articles/committers-guide/article.sgml b/en_US.ISO8859-1/articles/committers-guide/article.sgml index 58f3a1652e..c69370c5f7 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.214 2004-10-11 16:48:38 keramida Exp $ (or in FreeBSD's case, + of the $Id: article.sgml,v 1.215 2004-10-11 17:06:14 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.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). + (remove the marker lines and the second $Id: article.sgml,v 1.215 2004-10-11 17:06:14 keramida Exp $ line, + leaving the original $Id: article.sgml,v 1.215 2004-10-11 17:06:14 keramida Exp $ line intact). @@ -1025,7 +1025,7 @@ checkout -P 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 + file before the commit, because CVS will not give you a chance to edit the message when you do the actual commit.