This commit is contained in:
David E. O'Brien 2000-10-02 04:23:21 +00:00
parent 081ada9997
commit dd7cbed941
Notes: svn2git 2020-12-08 03:00:23 +00:00
svn path=/head/; revision=8063
2 changed files with 16 additions and 12 deletions

View file

@ -16,7 +16,7 @@
</author>
</authorgroup>
<pubdate>$FreeBSD: doc/en_US.ISO_8859-1/articles/committers-guide/article.sgml,v 1.37 2000/09/24 07:01:47 kris Exp $</pubdate>
<pubdate>$FreeBSD: doc/en_US.ISO_8859-1/articles/committers-guide/article.sgml,v 1.38 2000/09/30 14:25:53 alex Exp $</pubdate>
<copyright>
<year>1999</year>
@ -61,6 +61,7 @@
<row>
<entry><emphasis>Mailing List</emphasis></entry>
<entry><email>developers@FreeBSD.org</email></entry>
<entry><email>cvs-committers@FreeBSD.org</email></entry>
</row>
@ -511,11 +512,11 @@
</itemizedlist>
<para>You'll almost certainly get a conflict because
of the <literal>$Id: article.sgml,v 1.38 2000-09-30 14:25:53 alex Exp $</literal> (or in FreeBSD's case,
of the <literal>$Id: article.sgml,v 1.39 2000-10-02 04:23:21 obrien Exp $</literal> (or in FreeBSD's case,
<literal>$FreeBSD<!-- stop expansion -->$</literal>) lines, so you'll have to edit
the file to resolve the conflict (remove the marker lines and
the second <literal>$Id: article.sgml,v 1.38 2000-09-30 14:25:53 alex Exp $</literal> line, leaving the original
<literal>$Id: article.sgml,v 1.38 2000-09-30 14:25:53 alex Exp $</literal> line intact).</para>
the second <literal>$Id: article.sgml,v 1.39 2000-10-02 04:23:21 obrien Exp $</literal> line, leaving the original
<literal>$Id: article.sgml,v 1.39 2000-10-02 04:23:21 obrien Exp $</literal> line intact).</para>
</listitem>
<listitem>
@ -789,7 +790,7 @@ checkout -P</programlisting>
not have to write a comprehensive biography, just write a paragraph
or two about who you are and what you plan to be working on as a
committer in FreeBSD. Email this to
<email>cvs-committers@FreeBSD.org</email> and you will be on your
<email>developers@FreeBSD.org</email> and you will be on your
way!</para>
</listitem>
@ -800,7 +801,8 @@ checkout -P</programlisting>
containing the e-mail address where you want mail addressed to
<replaceable>yourusername</replaceable>@FreeBSD.org to be forwarded.
This includes all of the commit messages as well as any other mail
addressed to <email>cvs-committers@FreeBSD.org</email>. Really
addressed to <email>cvs-committers@FreeBSD.org</email> and
<email>developers@FreeBSD.org</email>. Really
large mailboxes which have taken up permanent residence on
<hostid>hub</hostid> often get <quote>accidently</quote> truncated
without warning, so forward it or read it and you will not lose

View file

@ -16,7 +16,7 @@
</author>
</authorgroup>
<pubdate>$FreeBSD: doc/en_US.ISO_8859-1/articles/committers-guide/article.sgml,v 1.37 2000/09/24 07:01:47 kris Exp $</pubdate>
<pubdate>$FreeBSD: doc/en_US.ISO_8859-1/articles/committers-guide/article.sgml,v 1.38 2000/09/30 14:25:53 alex Exp $</pubdate>
<copyright>
<year>1999</year>
@ -61,6 +61,7 @@
<row>
<entry><emphasis>Mailing List</emphasis></entry>
<entry><email>developers@FreeBSD.org</email></entry>
<entry><email>cvs-committers@FreeBSD.org</email></entry>
</row>
@ -511,11 +512,11 @@
</itemizedlist>
<para>You'll almost certainly get a conflict because
of the <literal>$Id: article.sgml,v 1.38 2000-09-30 14:25:53 alex Exp $</literal> (or in FreeBSD's case,
of the <literal>$Id: article.sgml,v 1.39 2000-10-02 04:23:21 obrien Exp $</literal> (or in FreeBSD's case,
<literal>$FreeBSD<!-- stop expansion -->$</literal>) lines, so you'll have to edit
the file to resolve the conflict (remove the marker lines and
the second <literal>$Id: article.sgml,v 1.38 2000-09-30 14:25:53 alex Exp $</literal> line, leaving the original
<literal>$Id: article.sgml,v 1.38 2000-09-30 14:25:53 alex Exp $</literal> line intact).</para>
the second <literal>$Id: article.sgml,v 1.39 2000-10-02 04:23:21 obrien Exp $</literal> line, leaving the original
<literal>$Id: article.sgml,v 1.39 2000-10-02 04:23:21 obrien Exp $</literal> line intact).</para>
</listitem>
<listitem>
@ -789,7 +790,7 @@ checkout -P</programlisting>
not have to write a comprehensive biography, just write a paragraph
or two about who you are and what you plan to be working on as a
committer in FreeBSD. Email this to
<email>cvs-committers@FreeBSD.org</email> and you will be on your
<email>developers@FreeBSD.org</email> and you will be on your
way!</para>
</listitem>
@ -800,7 +801,8 @@ checkout -P</programlisting>
containing the e-mail address where you want mail addressed to
<replaceable>yourusername</replaceable>@FreeBSD.org to be forwarded.
This includes all of the commit messages as well as any other mail
addressed to <email>cvs-committers@FreeBSD.org</email>. Really
addressed to <email>cvs-committers@FreeBSD.org</email> and
<email>developers@FreeBSD.org</email>. Really
large mailboxes which have taken up permanent residence on
<hostid>hub</hostid> often get <quote>accidently</quote> truncated
without warning, so forward it or read it and you will not lose