From 3a4a425a60f8d4a8e61fb5de16ab3fd962db8609 Mon Sep 17 00:00:00 2001 From: Joel Dahl Date: Sun, 20 Aug 2006 11:45:55 +0000 Subject: [PATCH] www/en/news/news.xml -> www/share/sgml/news.xml --- 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 3b3f0ff82b..03de8bf63a 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 cvs -d user@ncvs.FreeBSD.org:/home/ncvs

You will almost certainly get a conflict because - of the $Id: article.sgml,v 1.245 2006-08-19 17:26:24 remko Exp $ (or in FreeBSD's case, + of the $Id: article.sgml,v 1.246 2006-08-20 11:45:55 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.245 2006-08-19 17:26:24 remko Exp $ line, - leaving the original $Id: article.sgml,v 1.245 2006-08-19 17:26:24 remko Exp $ line intact). + (remove the marker lines and the second $Id: article.sgml,v 1.246 2006-08-20 11:45:55 joel Exp $ line, + leaving the original $Id: article.sgml,v 1.246 2006-08-20 11:45:55 joel Exp $ line intact). @@ -1085,7 +1085,7 @@ Host pcvs.FreeBSD.org Add an entry for yourself to - www/en/news/news.xml. Look for the other + www/share/sgml/news.xml. Look for the other entries that look like A new committer and follow the format.