diff options
| -rw-r--r-- | en_US.ISO8859-1/articles/committers-guide/article.sgml | 10 | ||||
| -rw-r--r-- | en_US.ISO_8859-1/articles/committers-guide/article.sgml | 10 |
2 files changed, 10 insertions, 10 deletions
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 @@ </author> </authorgroup> - <pubdate>$FreeBSD: doc/en_US.ISO_8859-1/articles/committers-guide/article.sgml,v 1.38 2000/09/30 14:25:53 alex Exp $</pubdate> + <pubdate>$FreeBSD: doc/en_US.ISO_8859-1/articles/committers-guide/article.sgml,v 1.39 2000/10/02 04:23:21 obrien Exp $</pubdate> <copyright> <year>1999</year> @@ -512,11 +512,11 @@ </itemizedlist> <para>You'll almost certainly get a conflict because - of the <literal>$Id: article.sgml,v 1.39 2000-10-02 04:23:21 obrien Exp $</literal> (or in FreeBSD's case, + of the <literal>$Id: article.sgml,v 1.40 2000-10-02 08:31:25 alex Exp $</literal> (or in FreeBSD's case, <literal>$FreeBSD<!-- stop expansion -->$</literal>) lines, so you'll have to edit the file to resolve the conflict (remove the marker lines and - the second <literal>$Id: article.sgml,v 1.39 2000-10-02 04:23:21 obrien Exp $</literal> line, leaving the original - <literal>$Id: article.sgml,v 1.39 2000-10-02 04:23:21 obrien Exp $</literal> line intact).</para> + the second <literal>$Id: article.sgml,v 1.40 2000-10-02 08:31:25 alex Exp $</literal> line, leaving the original + <literal>$Id: article.sgml,v 1.40 2000-10-02 08:31:25 alex Exp $</literal> line intact).</para> </listitem> <listitem> @@ -1829,7 +1829,7 @@ docs:Documentation Bug:nik:</programlisting> <answer> <para>First, go check - <ulink url="http://onigiri.FreeBSD.org/errorlogs/">http://onigiri.FreeBSD.org/errorlogs/</ulink>. + <ulink url="http://bento.FreeBSD.org/~asami/errorlogs/">http://bento.FreeBSD.org/~asami/errorlogs/</ulink>. There you will find error logs from the latest package building runs on 3-stable, 4-stable and 5-current.</para> 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 @@ </author> </authorgroup> - <pubdate>$FreeBSD: doc/en_US.ISO_8859-1/articles/committers-guide/article.sgml,v 1.38 2000/09/30 14:25:53 alex Exp $</pubdate> + <pubdate>$FreeBSD: doc/en_US.ISO_8859-1/articles/committers-guide/article.sgml,v 1.39 2000/10/02 04:23:21 obrien Exp $</pubdate> <copyright> <year>1999</year> @@ -512,11 +512,11 @@ </itemizedlist> <para>You'll almost certainly get a conflict because - of the <literal>$Id: article.sgml,v 1.39 2000-10-02 04:23:21 obrien Exp $</literal> (or in FreeBSD's case, + of the <literal>$Id: article.sgml,v 1.40 2000-10-02 08:31:25 alex Exp $</literal> (or in FreeBSD's case, <literal>$FreeBSD<!-- stop expansion -->$</literal>) lines, so you'll have to edit the file to resolve the conflict (remove the marker lines and - the second <literal>$Id: article.sgml,v 1.39 2000-10-02 04:23:21 obrien Exp $</literal> line, leaving the original - <literal>$Id: article.sgml,v 1.39 2000-10-02 04:23:21 obrien Exp $</literal> line intact).</para> + the second <literal>$Id: article.sgml,v 1.40 2000-10-02 08:31:25 alex Exp $</literal> line, leaving the original + <literal>$Id: article.sgml,v 1.40 2000-10-02 08:31:25 alex Exp $</literal> line intact).</para> </listitem> <listitem> @@ -1829,7 +1829,7 @@ docs:Documentation Bug:nik:</programlisting> <answer> <para>First, go check - <ulink url="http://onigiri.FreeBSD.org/errorlogs/">http://onigiri.FreeBSD.org/errorlogs/</ulink>. + <ulink url="http://bento.FreeBSD.org/~asami/errorlogs/">http://bento.FreeBSD.org/~asami/errorlogs/</ulink>. There you will find error logs from the latest package building runs on 3-stable, 4-stable and 5-current.</para> |