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

Add the developers of ia64 port.

Browse source 
PR:		docs/42782
Submitted by:	Hiten Pandya <hiten@angelica.unixdaemons.com>
This commit is contained in:
Marc Fonvieille 2002-09-14 20:57:12 +00:00
parent 2a0af11e01
commit 298083d777
Notes: svn2git 2020-12-08 03:00:23 +00:00 
svn path=/head/; revision=14283
1 changed files with 16 additions and 3 deletions

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

@ -579,11 +579,11 @@
</itemizedlist>
<para>You will almost certainly get a conflict because
of the <literal>$Id: article.sgml,v 1.132 2002-08-21 16:15:12 blackend Exp $</literal> (or in FreeBSD's case,
of the <literal>$Id: article.sgml,v 1.133 2002-09-14 20:57:12 blackend 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.132 2002-08-21 16:15:12 blackend Exp $</literal> line, leaving the original
<literal>$Id: article.sgml,v 1.132 2002-08-21 16:15:12 blackend Exp $</literal> line intact).</para>
the second <literal>$Id: article.sgml,v 1.133 2002-09-14 20:57:12 blackend Exp $</literal> line, leaving the original
<literal>$Id: article.sgml,v 1.133 2002-09-14 20:57:12 blackend Exp $</literal> line intact).</para>
</listitem>
<listitem>
@ -1239,6 +1239,19 @@ docs:Documentation Bug:nik:</programlisting>
</listitem>
</varlistentry>
<varlistentry>
<term>&a.dfr;</term>
<term>&a.marcel;</term>
<term>&a.peter;</term>
<term>&a.ps;</term>
<listitem>
<para>These are the primary developers and overseers of the
Intel IA-64 platform, officially known as the Itanium Processor
Family (IPF).</para>
</listitem>
</varlistentry>
<varlistentry>
<term>&a.murray;</term>
<term>&a.steve;</term>