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

Correct the last commit by adding articles before &a.developers;

Browse source 
where required.
This commit is contained in:
Giorgos Keramidas 2002-05-26 23:35:19 +00:00
parent a1972b87b3
commit 6d59b6922e
Notes: svn2git 2020-12-08 03:00:23 +00:00 
svn path=/head/; revision=13255
1 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -583,11 +583,11 @@
</itemizedlist>
<para>You will almost certainly get a conflict because
of the <literal>$Id: article.sgml,v 1.124 2002-05-26 23:24:38 keramida Exp $</literal> (or in FreeBSD's case,
of the <literal>$Id: article.sgml,v 1.125 2002-05-26 23:35:19 keramida 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.124 2002-05-26 23:24:38 keramida Exp $</literal> line, leaving the original
<literal>$Id: article.sgml,v 1.124 2002-05-26 23:24:38 keramida Exp $</literal> line intact).</para>
the second <literal>$Id: article.sgml,v 1.125 2002-05-26 23:35:19 keramida Exp $</literal> line, leaving the original
<literal>$Id: article.sgml,v 1.125 2002-05-26 23:35:19 keramida Exp $</literal> line intact).</para>
</listitem>
<listitem>
@ -938,7 +938,7 @@ 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 the &a.committers; and &a.developers;. Really
addressed to the &a.committers; and the &a.developers;. Really
large mailboxes which have taken up permanent residence on
<hostid>hub</hostid> often get <quote>accidentally</quote> truncated
without warning, so forward it or read it and you will not lose
@ -1331,12 +1331,12 @@ docs:Documentation Bug:nik:</programlisting>
closed list where general decisions affecting all of the FreeBSD
using community are made without being <quote>open</quote>.
Last, but not least <emphasis>never, never ever, email
&a.developers; and CC:/BCC: another FreeBSD list</emphasis>.
the &a.developers; and CC:/BCC: another FreeBSD list</emphasis>.
Never, ever email another FreeBSD email list and CC:/BCC:
&a.developers;. Doing so can greatly diminish the benefits
the &a.developers;. Doing so can greatly diminish the benefits
of this list. Also, never publically post or forward emails sent
to &a.developers;. The act of sending to
&a.developers; vs. a public list means the information in
to the &a.developers;. The act of sending to
the &a.developers; vs. a public list means the information in
the email is not for public consumption.
</para>
</listitem>