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

Some 'cvs rm -f alpha' catch ups.

Browse source
This commit is contained in:
David E. O'Brien 2006-07-22 00:31:01 +00:00
parent 5af502261f
commit bd4de74ef8
Notes: svn2git 2020-12-08 03:00:23 +00:00 
svn path=/head/; revision=28357
1 changed files with 4 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -729,11 +729,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.243 2006-07-20 15:34:20 joel Exp $</literal> (or in FreeBSD's case,
of the <literal>$Id: article.sgml,v 1.244 2006-07-22 00:31:01 obrien 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.243 2006-07-20 15:34:20 joel Exp $</literal> line,
leaving the original <literal>$Id: article.sgml,v 1.243 2006-07-20 15:34:20 joel Exp $</literal> line intact).</para>
(remove the marker lines and the second <literal>$Id: article.sgml,v 1.244 2006-07-22 00:31:01 obrien Exp $</literal> line,
leaving the original <literal>$Id: article.sgml,v 1.244 2006-07-22 00:31:01 obrien Exp $</literal> line intact).</para>
</listitem>
<listitem>
@ -1501,18 +1501,6 @@ docs:Documentation Bug:freebsd-doc:</programlisting>
</listitem>
</varlistentry>
<varlistentry>
<term>&a.gallatin;</term>
<term>&a.mjacob;</term>
<term>&a.dfr;</term>
<term>&a.obrien;</term>
<listitem>
<para>These are the primary developers and overseers of the
DEC Alpha AXP platform.</para>
</listitem>
</varlistentry>
<varlistentry>
<term>&a.dg;</term>
@ -2326,7 +2314,7 @@ docs:Documentation Bug:freebsd-doc:</programlisting>
2 status as the availability of resources to continue to maintain
the system in a Production Quality state diminishes.</para>
<para>Current Tier 2 platforms are Alpha, PowerPC and ia64.</para>
<para>Current Tier 2 platforms are PowerPC and ia64.</para>
</sect2>
<sect2>