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

"Bruce" in the previous commit is Bruce Evans, bde, and not any of the other

Browse source 
Bruces we have floating around the project.

G'day Bruce.
This commit is contained in:
Nik Clayton 2001-04-27 10:08:44 +00:00
parent bb50fb63d7
commit f384f4e578
Notes: svn2git 2020-12-08 03:00:23 +00:00 
svn path=/head/; revision=9323
2 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -19,7 +19,7 @@
</author>
</authorgroup>
<pubdate>$FreeBSD: doc/en_US.ISO_8859-1/articles/committers-guide/article.sgml,v 1.60 2001/04/08 17:26:41 nik Exp $</pubdate>
<pubdate>$FreeBSD: doc/en_US.ISO_8859-1/articles/committers-guide/article.sgml,v 1.61 2001/04/27 10:07:52 nik Exp $</pubdate>
<copyright>
<year>1999</year>
@ -516,11 +516,11 @@
</itemizedlist>
<para>You'll almost certainly get a conflict because
of the <literal>$Id: article.sgml,v 1.61 2001-04-27 10:07:52 nik Exp $</literal> (or in FreeBSD's case,
of the <literal>$Id: article.sgml,v 1.62 2001-04-27 10:08:44 nik 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.61 2001-04-27 10:07:52 nik Exp $</literal> line, leaving the original
<literal>$Id: article.sgml,v 1.61 2001-04-27 10:07:52 nik Exp $</literal> line intact).</para>
the second <literal>$Id: article.sgml,v 1.62 2001-04-27 10:08:44 nik Exp $</literal> line, leaving the original
<literal>$Id: article.sgml,v 1.62 2001-04-27 10:08:44 nik Exp $</literal> line intact).</para>
</listitem>
<listitem>

8
en_US.ISO_8859-1/articles/committers-guide/article.sgml
View file

@ -19,7 +19,7 @@
</author>
</authorgroup>
<pubdate>$FreeBSD: doc/en_US.ISO_8859-1/articles/committers-guide/article.sgml,v 1.60 2001/04/08 17:26:41 nik Exp $</pubdate>
<pubdate>$FreeBSD: doc/en_US.ISO_8859-1/articles/committers-guide/article.sgml,v 1.61 2001/04/27 10:07:52 nik Exp $</pubdate>
<copyright>
<year>1999</year>
@ -516,11 +516,11 @@
</itemizedlist>
<para>You'll almost certainly get a conflict because
of the <literal>$Id: article.sgml,v 1.61 2001-04-27 10:07:52 nik Exp $</literal> (or in FreeBSD's case,
of the <literal>$Id: article.sgml,v 1.62 2001-04-27 10:08:44 nik 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.61 2001-04-27 10:07:52 nik Exp $</literal> line, leaving the original
<literal>$Id: article.sgml,v 1.61 2001-04-27 10:07:52 nik Exp $</literal> line intact).</para>
the second <literal>$Id: article.sgml,v 1.62 2001-04-27 10:08:44 nik Exp $</literal> line, leaving the original
<literal>$Id: article.sgml,v 1.62 2001-04-27 10:08:44 nik Exp $</literal> line intact).</para>
</listitem>
<listitem>