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

Add the FreeBSD Mall, Inc. free CD subscription to the list of Perks.

Browse source
This commit is contained in:
Murray Stokely 2002-03-27 12:40:02 +00:00
parent e00e208814
commit ba8c39298c
Notes: svn2git 2020-12-08 03:00:23 +00:00 
svn path=/head/; revision=12595
1 changed files with 17 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -585,11 +585,11 @@
</itemizedlist> </itemizedlist>
<para>You will almost certainly get a conflict because <para>You will almost certainly get a conflict because
of the <literal>$Id: article.sgml,v 1.105 2002-03-27 11:40:23 brian Exp $</literal> (or in FreeBSD's case, of the <literal>$Id: article.sgml,v 1.106 2002-03-27 12:40:02 murray Exp $</literal> (or in FreeBSD's case,
<literal>$<!-- stop expansion -->FreeBSD<!-- stop expansion -->$</literal>) lines, so you will have to edit <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 file to resolve the conflict (remove the marker lines and
the second <literal>$Id: article.sgml,v 1.105 2002-03-27 11:40:23 brian Exp $</literal> line, leaving the original the second <literal>$Id: article.sgml,v 1.106 2002-03-27 12:40:02 murray Exp $</literal> line, leaving the original
<literal>$Id: article.sgml,v 1.105 2002-03-27 11:40:23 brian Exp $</literal> line intact).</para> <literal>$Id: article.sgml,v 1.106 2002-03-27 12:40:02 murray Exp $</literal> line intact).</para>
</listitem> </listitem>
<listitem> <listitem>
@ -2293,6 +2293,20 @@ docs:Documentation Bug:nik:</programlisting>
all products on the site.</para> all products on the site.</para>
</listitem> </listitem>
</varlistentry> </varlistentry>
<varlistentry>
<term>A Free 4-CD Set Subscription</term>
<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
<email>developers@FreeBSD.org</email> following each major
release.</para>
</listitem>
</varlistentry>
</variablelist> </variablelist>
</sect1> </sect1>