os/doc
3
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Back out the bento -> onigiri change, it was wrong.

Browse source 
Submitted by:	obrien
This commit is contained in:
Alexander Langer 2000-10-02 08:31:25 +00:00
parent dd7cbed941
commit 5d6b8a0d89
Notes: svn2git 2020-12-08 03:00:23 +00:00 
svn path=/head/; revision=8067
2 changed files with 10 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

10
en_US.ISO8859-1/articles/committers-guide/article.sgml
View file

@ -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>