From d644e2cb4fb1f07b01c8bd4e96f2c5837a3aaf94 Mon Sep 17 00:00:00 2001 From: Joel Dahl Date: Thu, 20 Jul 2006 15:34:20 +0000 Subject: [PATCH] Be a bit more verbose about adding new module entries. PR: docs/100323 Submitted by: clsung --- en_US.ISO8859-1/articles/committers-guide/article.sgml | 9 +++++---- 1 file changed, 5 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 045f1d3d7f..a76dfceeb3 100644 --- a/en_US.ISO8859-1/articles/committers-guide/article.sgml +++ b/en_US.ISO8859-1/articles/committers-guide/article.sgml @@ -729,11 +729,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.242 2006-06-09 20:44:21 pav Exp $ (or in FreeBSD's case, + of the $Id: article.sgml,v 1.243 2006-07-20 15:34:20 joel 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.242 2006-06-09 20:44:21 pav Exp $ line, - leaving the original $Id: article.sgml,v 1.242 2006-06-09 20:44:21 pav Exp $ line intact). + (remove the marker lines and the second $Id: article.sgml,v 1.243 2006-07-20 15:34:20 joel Exp $ line, + leaving the original $Id: article.sgml,v 1.243 2006-07-20 15:34:20 joel Exp $ line intact). @@ -2599,7 +2599,8 @@ docs:Documentation Bug:freebsd-doc: - Add the new module entry. + Add the new module entry to + CVSROOT/modules.