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

Update membership list

Browse source
This commit is contained in:
Scott Long 2006-06-02 20:50:17 +00:00
parent 0a48a32379
commit 1e90e00a66
Notes: svn2git 2020-12-08 03:00:23 +00:00 
svn path=/head/; revision=28002
1 changed files with 3 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

8
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.239 2006-05-19 17:29:37 bmah Exp $</literal> (or in FreeBSD's case,
of the <literal>$Id: article.sgml,v 1.240 2006-06-02 20:50:17 scottl 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.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>
(remove the marker lines and the second <literal>$Id: article.sgml,v 1.240 2006-06-02 20:50:17 scottl Exp $</literal> line,
leaving the original <literal>$Id: article.sgml,v 1.240 2006-06-02 20:50:17 scottl Exp $</literal> line intact).</para>
</listitem>
<listitem>
@ -1515,8 +1515,6 @@ docs:Documentation Bug:freebsd-doc:</programlisting>
<term>&a.murray;</term>
<term>&a.dwhite;</term>
<term>&a.rwatson;</term>
<term>&a.jhb;</term>
<term>&a.scottl;</term>
<term>&a.kensmith;</term>
<term>&a.hrs;</term>
<term>&a.mux;</term>