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

src/contrib has grown up

Browse source
This commit is contained in:
David E. O'Brien 2002-05-09 00:24:17 +00:00
parent 64b72dc1f7
commit 1b3932fb95
Notes: svn2git 2020-12-08 03:00:23 +00:00 
svn path=/head/; revision=13009
1 changed files with 3 additions and 22 deletions

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

@ -583,11 +583,11 @@
</itemizedlist>
<para>You will almost certainly get a conflict because
of the <literal>$Id: article.sgml,v 1.113 2002-05-06 19:13:38 jmallett Exp $</literal> (or in FreeBSD's case,
of the <literal>$Id: article.sgml,v 1.114 2002-05-09 00:24:17 obrien 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.113 2002-05-06 19:13:38 jmallett Exp $</literal> line, leaving the original
<literal>$Id: article.sgml,v 1.113 2002-05-06 19:13:38 jmallett Exp $</literal> line intact).</para>
the second <literal>$Id: article.sgml,v 1.114 2002-05-09 00:24:17 obrien Exp $</literal> line, leaving the original
<literal>$Id: article.sgml,v 1.114 2002-05-09 00:24:17 obrien Exp $</literal> line intact).</para>
</listitem>
<listitem>
@ -1260,25 +1260,6 @@ docs:Documentation Bug:nik:</programlisting>
</listitem>
</varlistentry>
<varlistentry>
<term>&a.obrien;</term>
<listitem>
<para>David is the unofficial <filename>src/contrib</filename>-Meister.
If you have something
significant you would like to do there, you should probably
coordinate it with David first. Please consult him before
importing into <filename>src/contrib</filename> if you have
never done this before in the FreeBSD CVS repository. Also
if you need to commit to something you do not maintain in
<filename>src/contrib</filename> and it is unclear who the
maintainer / point of contact is. (It is also not a bad idea
to consult David if you need to make a non-import commit to
something you maintain in <filename>src/contrib</filename> and
you are new to how FreeBSD does things.)</para>
</listitem>
</varlistentry>
<varlistentry>
<term>&a.benno;</term>