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

For some reason, brian wasn't listed as a member of the RE team in the

Browse source 
committers-guide.  Fix this.
This commit is contained in:
Bruce A. Mah 2002-10-10 17:44:48 +00:00
parent 2bfcee3890
commit 0e7089dc83
Notes: svn2git 2020-12-08 03:00:23 +00:00 
svn path=/head/; revision=14588
1 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -579,11 +579,11 @@
</itemizedlist>
<para>You will almost certainly get a conflict because
of the <literal>$Id: article.sgml,v 1.137 2002-10-04 16:13:48 rwatson Exp $</literal> (or in FreeBSD's case,
of the <literal>$Id: article.sgml,v 1.138 2002-10-10 17:44:48 bmah Exp $</literal> (or in FreeBSD's case,
<literal>$<!-- stop expansion -->FreeBSD<!-- stop expansion -->$</literal>) lines, so you will have to edit
the file to resolve the conflict (remove the marker lines and
the second <literal>$Id: article.sgml,v 1.137 2002-10-04 16:13:48 rwatson Exp $</literal> line, leaving the original
<literal>$Id: article.sgml,v 1.137 2002-10-04 16:13:48 rwatson Exp $</literal> line intact).</para>
the second <literal>$Id: article.sgml,v 1.138 2002-10-10 17:44:48 bmah Exp $</literal> line, leaving the original
<literal>$Id: article.sgml,v 1.138 2002-10-10 17:44:48 bmah Exp $</literal> line intact).</para>
</listitem>
<listitem>
@ -1257,6 +1257,7 @@ docs:Documentation Bug:nik:</programlisting>
<term>&a.steve;</term>
<term>&a.rwatson;</term>
<term>&a.jhb;</term>
<term>&a.brian</term>
<term>&a.bmah;</term>
<listitem>