diff --git a/en_US.ISO8859-1/articles/committers-guide/article.sgml b/en_US.ISO8859-1/articles/committers-guide/article.sgml index 1334fe1777..602e35c8c0 100644 --- a/en_US.ISO8859-1/articles/committers-guide/article.sgml +++ b/en_US.ISO8859-1/articles/committers-guide/article.sgml @@ -16,7 +16,7 @@ - $FreeBSD: doc/en_US.ISO_8859-1/articles/committers-guide/article.sgml,v 1.38 2000/09/30 14:25:53 alex Exp $ + $FreeBSD: doc/en_US.ISO_8859-1/articles/committers-guide/article.sgml,v 1.39 2000/10/02 04:23:21 obrien Exp $ 1999 @@ -512,11 +512,11 @@ You'll almost certainly get a conflict because - of the $Id: article.sgml,v 1.39 2000-10-02 04:23:21 obrien Exp $ (or in FreeBSD's case, + of the $Id: article.sgml,v 1.40 2000-10-02 08:31:25 alex 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.39 2000-10-02 04:23:21 obrien Exp $ line, leaving the original - $Id: article.sgml,v 1.39 2000-10-02 04:23:21 obrien Exp $ line intact). + the second $Id: article.sgml,v 1.40 2000-10-02 08:31:25 alex Exp $ line, leaving the original + $Id: article.sgml,v 1.40 2000-10-02 08:31:25 alex Exp $ line intact). @@ -1829,7 +1829,7 @@ docs:Documentation Bug:nik: First, go check - http://onigiri.FreeBSD.org/errorlogs/. + http://bento.FreeBSD.org/~asami/errorlogs/. There you will find error logs from the latest package building runs on 3-stable, 4-stable and 5-current. 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 1334fe1777..602e35c8c0 100644 --- a/en_US.ISO_8859-1/articles/committers-guide/article.sgml +++ b/en_US.ISO_8859-1/articles/committers-guide/article.sgml @@ -16,7 +16,7 @@ - $FreeBSD: doc/en_US.ISO_8859-1/articles/committers-guide/article.sgml,v 1.38 2000/09/30 14:25:53 alex Exp $ + $FreeBSD: doc/en_US.ISO_8859-1/articles/committers-guide/article.sgml,v 1.39 2000/10/02 04:23:21 obrien Exp $ 1999 @@ -512,11 +512,11 @@ You'll almost certainly get a conflict because - of the $Id: article.sgml,v 1.39 2000-10-02 04:23:21 obrien Exp $ (or in FreeBSD's case, + of the $Id: article.sgml,v 1.40 2000-10-02 08:31:25 alex 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.39 2000-10-02 04:23:21 obrien Exp $ line, leaving the original - $Id: article.sgml,v 1.39 2000-10-02 04:23:21 obrien Exp $ line intact). + the second $Id: article.sgml,v 1.40 2000-10-02 08:31:25 alex Exp $ line, leaving the original + $Id: article.sgml,v 1.40 2000-10-02 08:31:25 alex Exp $ line intact). @@ -1829,7 +1829,7 @@ docs:Documentation Bug:nik: First, go check - http://onigiri.FreeBSD.org/errorlogs/. + http://bento.FreeBSD.org/~asami/errorlogs/. There you will find error logs from the latest package building runs on 3-stable, 4-stable and 5-current.