diff options
| -rw-r--r-- | en_US.ISO8859-1/articles/committers-guide/article.sgml | 34 |
1 files changed, 4 insertions, 30 deletions
diff --git a/en_US.ISO8859-1/articles/committers-guide/article.sgml b/en_US.ISO8859-1/articles/committers-guide/article.sgml index 9914a4d2c9..d6e0231e0a 100644 --- a/en_US.ISO8859-1/articles/committers-guide/article.sgml +++ b/en_US.ISO8859-1/articles/committers-guide/article.sgml @@ -677,11 +677,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.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>) 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, - leaving the original <literal>$Id: article.sgml,v 1.176 2003-12-24 00:26:39 simon Exp $</literal> line intact).</para> + (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.177 2003-12-28 20:57:24 ale Exp $</literal> line intact).</para> </listitem> <listitem> @@ -2627,33 +2627,7 @@ docs:Documentation Bug:freebsd-doc:</programlisting> </varlistentry> <varlistentry> - <term>A Free 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> + <term>A Free 4-CD Set or DVD Subscription</term> <listitem> <para><ulink url="http://www.freebsdmall.com">FreeBSD Mall, |