diff --git a/en_US.ISO8859-1/articles/committers-guide/article.sgml b/en_US.ISO8859-1/articles/committers-guide/article.sgml index e76e01a96b..014f8029ed 100644 --- a/en_US.ISO8859-1/articles/committers-guide/article.sgml +++ b/en_US.ISO8859-1/articles/committers-guide/article.sgml @@ -19,7 +19,7 @@ - $FreeBSD: doc/en_US.ISO_8859-1/articles/committers-guide/article.sgml,v 1.44 2000/11/14 11:11:56 demon Exp $ + $FreeBSD: doc/en_US.ISO_8859-1/articles/committers-guide/article.sgml,v 1.45 2000/12/05 21:38:53 jim Exp $ 1999 @@ -154,7 +154,7 @@ CVS reference information, tutorials, and FAQs can also be found at: http://www.cyclic.com/CVS/support + url="http://www.cvshome.org/docs/index.html">http://www.cvshome.org/docs/index.html &a.des; also supplied the following mini primer for CVS. @@ -515,11 +515,11 @@ You'll almost certainly get a conflict because - of the $Id: article.sgml,v 1.45 2000-12-05 21:38:53 jim Exp $ (or in FreeBSD's case, + of the $Id: article.sgml,v 1.46 2000-12-28 13:40:03 jedgar Exp $ (or in FreeBSD's case, $FreeBSD$) lines, so you'll have to edit the file to resolve the conflict (remove the marker lines and - the second $Id: article.sgml,v 1.45 2000-12-05 21:38:53 jim Exp $ line, leaving the original - $Id: article.sgml,v 1.45 2000-12-05 21:38:53 jim Exp $ line intact). + the second $Id: article.sgml,v 1.46 2000-12-28 13:40:03 jedgar Exp $ line, leaving the original + $Id: article.sgml,v 1.46 2000-12-28 13:40:03 jedgar Exp $ line intact). diff --git a/en_US.ISO_8859-1/articles/committers-guide/article.sgml b/en_US.ISO_8859-1/articles/committers-guide/article.sgml index e76e01a96b..014f8029ed 100644 --- a/en_US.ISO_8859-1/articles/committers-guide/article.sgml +++ b/en_US.ISO_8859-1/articles/committers-guide/article.sgml @@ -19,7 +19,7 @@ - $FreeBSD: doc/en_US.ISO_8859-1/articles/committers-guide/article.sgml,v 1.44 2000/11/14 11:11:56 demon Exp $ + $FreeBSD: doc/en_US.ISO_8859-1/articles/committers-guide/article.sgml,v 1.45 2000/12/05 21:38:53 jim Exp $ 1999 @@ -154,7 +154,7 @@ CVS reference information, tutorials, and FAQs can also be found at: http://www.cyclic.com/CVS/support + url="http://www.cvshome.org/docs/index.html">http://www.cvshome.org/docs/index.html &a.des; also supplied the following mini primer for CVS. @@ -515,11 +515,11 @@ You'll almost certainly get a conflict because - of the $Id: article.sgml,v 1.45 2000-12-05 21:38:53 jim Exp $ (or in FreeBSD's case, + of the $Id: article.sgml,v 1.46 2000-12-28 13:40:03 jedgar Exp $ (or in FreeBSD's case, $FreeBSD$) lines, so you'll have to edit the file to resolve the conflict (remove the marker lines and - the second $Id: article.sgml,v 1.45 2000-12-05 21:38:53 jim Exp $ line, leaving the original - $Id: article.sgml,v 1.45 2000-12-05 21:38:53 jim Exp $ line intact). + the second $Id: article.sgml,v 1.46 2000-12-28 13:40:03 jedgar Exp $ line, leaving the original + $Id: article.sgml,v 1.46 2000-12-28 13:40:03 jedgar Exp $ line intact).