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

FreeBSD Services Limited doesn't offer a free DVD subscription to FreeBSD

Browse source 
committers any more.  FreeBSD Mall, Inc does it, so clarify the title.

Approved by:	blackend (mentor)
This commit is contained in:
Alex Dupre 2003-12-28 20:57:24 +00:00
parent e589e33ca8
commit bd05679acf
Notes: svn2git 2020-12-08 03:00:23 +00:00 
svn path=/head/; revision=19328
1 changed files with 4 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -677,11 +677,11 @@ alias scvs env CVS_RSH=ssh cvs -d <replaceable>user</replaceable>@ncvs.freebsd.o
</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.176 2003-12-24 00:26:39 simon Exp $</literal> (or in FreeBSD's case, of the <literal>$Id: article.sgml,v 1.177 2003-12-28 20:57:24 ale Exp $</literal> (or in FreeBSD's case,
<literal>$<!-- stop expansion -->FreeBSD<!-- stop expansion -->$</literal>) <literal>$<!-- stop expansion -->FreeBSD<!-- stop expansion -->$</literal>)
lines, so you will have to edit the file to resolve the conflict 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.176 2003-12-24 00:26:39 simon Exp $</literal> line, (remove the marker lines and the second <literal>$Id: article.sgml,v 1.177 2003-12-28 20:57:24 ale Exp $</literal> line,
leaving the original <literal>$Id: article.sgml,v 1.176 2003-12-24 00:26:39 simon Exp $</literal> line intact).</para> leaving the original <literal>$Id: article.sgml,v 1.177 2003-12-28 20:57:24 ale Exp $</literal> line intact).</para>
</listitem> </listitem>
<listitem> <listitem>
@ -2627,33 +2627,7 @@ docs:Documentation Bug:freebsd-doc:</programlisting>
</varlistentry> </varlistentry>
<varlistentry> <varlistentry>
<term>A Free DVD Subscription</term> <term>A Free 4-CD Set or DVD Subscription</term>
<listitem>
<para>FreeBSD Services Limited offer a free DVD subscription to
FreeBSD committers. To take advantage of this offer, go to
<ulink url="https://www.freebsd-services.com/cgi/index/sales/login"></ulink>
and fill out their customer form,
making sure that you tick the FreeBSD Committer and free
subscription check-boxes. A message will be sent to your
<emphasis role="bold">FreeBSD.org</emphasis> email address asking
for confirmation. Just reply to the mail, quoting the message
and updating the <quote>Membership Valid</quote> field with a
<literal>Y</literal>. You can confirm that the reply was sent
successfully by <ulink
url="https://www.freebsd-services.com/cgi/index/customer">logging
in </ulink>to their site and checking that your <literal>Current
Status</literal> is set to
<emphasis role="bold">Associated</emphasis>.</para>
<para>In addition to the free subscription, committers are also
entitled to a <emphasis role="bold">10% discount</emphasis> on
all products on the site.</para>
</listitem>
</varlistentry>
<varlistentry>
<term>A Free 4-CD Set Subscription</term>
<listitem> <listitem>
<para><ulink url="http://www.freebsdmall.com">FreeBSD Mall, <para><ulink url="http://www.freebsdmall.com">FreeBSD Mall,