Fix breakage in previous commit.
Usage of <term> in <varlistentry> must be <term>+ (no characters allowed between each <term>).
This commit is contained in:
parent
53c46ad0eb
commit
72d0d0a0e3
Notes:
svn2git
2020-12-08 03:00:23 +00:00
svn path=/head/; revision=9115
2 changed files with 16 additions and 12 deletions
en_US.ISO8859-1/articles/committers-guide
en_US.ISO_8859-1/articles/committers-guide
|
@ -19,7 +19,7 @@
|
|||
</author>
|
||||
</authorgroup>
|
||||
|
||||
<pubdate>$FreeBSD: doc/en_US.ISO_8859-1/articles/committers-guide/article.sgml,v 1.52 2001/04/03 16:04:54 obrien Exp $</pubdate>
|
||||
<pubdate>$FreeBSD: doc/en_US.ISO_8859-1/articles/committers-guide/article.sgml,v 1.53 2001/04/03 16:12:05 obrien 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.53 2001-04-03 16:12:05 obrien Exp $</literal> (or in FreeBSD's case,
|
||||
of the <literal>$Id: article.sgml,v 1.54 2001-04-04 00:52:50 kuriyama 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.53 2001-04-03 16:12:05 obrien Exp $</literal> line, leaving the original
|
||||
<literal>$Id: article.sgml,v 1.53 2001-04-03 16:12:05 obrien Exp $</literal> line intact).</para>
|
||||
the second <literal>$Id: article.sgml,v 1.54 2001-04-04 00:52:50 kuriyama Exp $</literal> line, leaving the original
|
||||
<literal>$Id: article.sgml,v 1.54 2001-04-04 00:52:50 kuriyama Exp $</literal> line intact).</para>
|
||||
</listitem>
|
||||
|
||||
<listitem>
|
||||
|
@ -1056,8 +1056,10 @@ docs:Documentation Bug:nik:</programlisting>
|
|||
</varlistentry>
|
||||
|
||||
<varlistentry>
|
||||
<term>&a.gallatin;</term>, <term>&a.mjacob;</term>,
|
||||
<term>&a.dfr;</term>, and <term>&a.obrien;</term>
|
||||
<term>&a.gallatin;</term>
|
||||
<term>&a.mjacob;</term>
|
||||
<term>&a.dfr;</term>
|
||||
<term>&a.obrien;</term>
|
||||
|
||||
<listitem>
|
||||
<para>These are the primary developers and overseers of the
|
||||
|
|
|
@ -19,7 +19,7 @@
|
|||
</author>
|
||||
</authorgroup>
|
||||
|
||||
<pubdate>$FreeBSD: doc/en_US.ISO_8859-1/articles/committers-guide/article.sgml,v 1.52 2001/04/03 16:04:54 obrien Exp $</pubdate>
|
||||
<pubdate>$FreeBSD: doc/en_US.ISO_8859-1/articles/committers-guide/article.sgml,v 1.53 2001/04/03 16:12:05 obrien 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.53 2001-04-03 16:12:05 obrien Exp $</literal> (or in FreeBSD's case,
|
||||
of the <literal>$Id: article.sgml,v 1.54 2001-04-04 00:52:50 kuriyama 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.53 2001-04-03 16:12:05 obrien Exp $</literal> line, leaving the original
|
||||
<literal>$Id: article.sgml,v 1.53 2001-04-03 16:12:05 obrien Exp $</literal> line intact).</para>
|
||||
the second <literal>$Id: article.sgml,v 1.54 2001-04-04 00:52:50 kuriyama Exp $</literal> line, leaving the original
|
||||
<literal>$Id: article.sgml,v 1.54 2001-04-04 00:52:50 kuriyama Exp $</literal> line intact).</para>
|
||||
</listitem>
|
||||
|
||||
<listitem>
|
||||
|
@ -1056,8 +1056,10 @@ docs:Documentation Bug:nik:</programlisting>
|
|||
</varlistentry>
|
||||
|
||||
<varlistentry>
|
||||
<term>&a.gallatin;</term>, <term>&a.mjacob;</term>,
|
||||
<term>&a.dfr;</term>, and <term>&a.obrien;</term>
|
||||
<term>&a.gallatin;</term>
|
||||
<term>&a.mjacob;</term>
|
||||
<term>&a.dfr;</term>
|
||||
<term>&a.obrien;</term>
|
||||
|
||||
<listitem>
|
||||
<para>These are the primary developers and overseers of the
|
||||
|
|
Loading…
Reference in a new issue