From 3ce68d1a39315db95c9a27b21926e241eae39c7d Mon Sep 17 00:00:00 2001 From: Josef El-Rayes Date: Wed, 8 Dec 2004 12:41:41 +0000 Subject: [PATCH] Replace cdiffs homepage with port location and s/RELENG_4/RELENG_5 Submitted by: Florent Thoumie --- en_US.ISO8859-1/articles/committers-guide/article.sgml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/en_US.ISO8859-1/articles/committers-guide/article.sgml b/en_US.ISO8859-1/articles/committers-guide/article.sgml index 15f3a873a2..67b1f2e688 100644 --- a/en_US.ISO8859-1/articles/committers-guide/article.sgml +++ b/en_US.ISO8859-1/articles/committers-guide/article.sgml @@ -716,7 +716,7 @@ alias scvs env CVS_RSH=ssh cvs -d user@ncvs.FreeBSD.o Check out the &os.stable; version of the shazam module: - &prompt.user; cvs co -rRELENG_4 shazam + &prompt.user; cvs co -rRELENG_5 shazam @@ -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.217 2004-11-29 21:43:33 ceri Exp $ (or in FreeBSD's case, + of the $Id: article.sgml,v 1.218 2004-12-08 12:41:41 josef 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.217 2004-11-29 21:43:33 ceri Exp $ line, - leaving the original $Id: article.sgml,v 1.217 2004-11-29 21:43:33 ceri Exp $ line intact). + (remove the marker lines and the second $Id: article.sgml,v 1.218 2004-12-08 12:41:41 josef Exp $ line, + leaving the original $Id: article.sgml,v 1.218 2004-12-08 12:41:41 josef Exp $ line intact). @@ -983,7 +983,7 @@ checkout -P properly (tabs often look wrong in diffs because of the extra character in front of each line). - + textproc/cdiff Simply use it instead of &man.more.1; or &man.less.1;: