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

Add myself back to the RE list.

Browse source
This commit is contained in:
Bruce A. Mah 2006-05-19 17:29:37 +00:00
parent 479cecc7f5
commit 201b467f44
Notes: svn2git 2020-12-08 03:00:23 +00:00 
svn path=/head/; revision=27880
1 changed files with 4 additions and 3 deletions

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

@ -729,11 +729,11 @@ alias scvs env CVS_RSH=ssh cvs -d <replaceable>user</replaceable>@ncvs.FreeBSD.o
</itemizedlist>
<para>You will almost certainly get a conflict because
of the <literal>$Id: article.sgml,v 1.238 2006-05-08 14:34:46 keramida Exp $</literal> (or in FreeBSD's case,
of the <literal>$Id: article.sgml,v 1.239 2006-05-19 17:29:37 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.238 2006-05-08 14:34:46 keramida Exp $</literal> line,
leaving the original <literal>$Id: article.sgml,v 1.238 2006-05-08 14:34:46 keramida Exp $</literal> line intact).</para>
(remove the marker lines and the second <literal>$Id: article.sgml,v 1.239 2006-05-19 17:29:37 bmah Exp $</literal> line,
leaving the original <literal>$Id: article.sgml,v 1.239 2006-05-19 17:29:37 bmah Exp $</literal> line intact).</para>
</listitem>
<listitem>
@ -1520,6 +1520,7 @@ docs:Documentation Bug:freebsd-doc:</programlisting>
<term>&a.kensmith;</term>
<term>&a.hrs;</term>
<term>&a.mux;</term>
<term>&a.bmah;</term>
<listitem>
<para>These are the members of the &a.re;. This team is