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

Update information to reflect the fact that DVD products are also

Browse source 
available for free to FreeBSD committers from FreeBSD Mall, Inc.
This commit is contained in:
Murray Stokely 2003-01-28 03:50:08 +00:00
parent 013993f13d
commit 3867b5d5b6
Notes: svn2git 2020-12-08 03:00:23 +00:00 
svn path=/head/; revision=15827
1 changed files with 6 additions and 6 deletions

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

@ -608,11 +608,11 @@
</itemizedlist>
<para>You will almost certainly get a conflict because
of the <literal>$Id: article.sgml,v 1.151 2003-01-21 23:08:04 bmah Exp $</literal> (or in FreeBSD's case,
of the <literal>$Id: article.sgml,v 1.152 2003-01-28 03:50:08 murray 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.151 2003-01-21 23:08:04 bmah Exp $</literal> line,
leaving the original <literal>$Id: article.sgml,v 1.151 2003-01-21 23:08:04 bmah Exp $</literal> line intact).</para>
(remove the marker lines and the second <literal>$Id: article.sgml,v 1.152 2003-01-28 03:50:08 murray Exp $</literal> line,
leaving the original <literal>$Id: article.sgml,v 1.152 2003-01-28 03:50:08 murray Exp $</literal> line intact).</para>
</listitem>
<listitem>
@ -2583,9 +2583,9 @@ docs:Documentation Bug:nik:</programlisting>
<listitem>
<para><ulink url="http://www.freebsdmall.com">FreeBSD Mall,
Inc.</ulink> offers a free subscription of the official
4-CD set to all FreeBSD committers. Information about how
to obtain your free CD is mailed to
Inc.</ulink> offers a free subscription of the 4-CD set or
the DVD product to all FreeBSD committers. Information about how
to obtain your free media is mailed to
<email>developers@FreeBSD.org</email> following each major
release.</para>
</listitem>