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

Alpha is now Tier 2.

Browse source 
Approved by:	re (hrs, scottl)
This commit is contained in:
Simon L. B. Nielsen 2004-06-14 20:42:06 +00:00
parent 7f51d0f7cc
commit d6cd97e8ae
Notes: svn2git 2020-12-08 03:00:23 +00:00 
svn path=/head/; revision=21165
1 changed files with 5 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -685,11 +685,11 @@ alias scvs env CVS_RSH=ssh cvs -d <replaceable>user</replaceable>@ncvs.FreeBSD.o
</itemizedlist> </itemizedlist>
<para>You will almost certainly get a conflict because <para>You will almost certainly get a conflict because
of the <literal>$Id: article.sgml,v 1.194 2004-06-02 04:53:29 bmah Exp $</literal> (or in FreeBSD's case, of the <literal>$Id: article.sgml,v 1.195 2004-06-14 20:42:06 simon Exp $</literal> (or in FreeBSD's case,
<literal>$<!-- stop expansion -->FreeBSD<!-- stop expansion -->$</literal>) <literal>$<!-- stop expansion -->FreeBSD<!-- stop expansion -->$</literal>)
lines, so you will have to edit the file to resolve the conflict 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.194 2004-06-02 04:53:29 bmah Exp $</literal> line, (remove the marker lines and the second <literal>$Id: article.sgml,v 1.195 2004-06-14 20:42:06 simon Exp $</literal> line,
leaving the original <literal>$Id: article.sgml,v 1.194 2004-06-02 04:53:29 bmah Exp $</literal> line intact).</para> leaving the original <literal>$Id: article.sgml,v 1.195 2004-06-14 20:42:06 simon Exp $</literal> line intact).</para>
</listitem> </listitem>
<listitem> <listitem>
@ -2206,8 +2206,7 @@ docs:Documentation Bug:freebsd-doc:</programlisting>
with respects to all aspects of the FreeBSD operating system, with respects to all aspects of the FreeBSD operating system,
including installation and development environments.</para> including installation and development environments.</para>
<para>Current Tier 1 platforms are i386, Sparc64, AMD64, PC98, <para>Current Tier 1 platforms are i386, Sparc64, AMD64, and PC98.</para>
and Alpha.</para>
</sect2> </sect2>
<sect2> <sect2>
@ -2235,7 +2234,7 @@ docs:Documentation Bug:freebsd-doc:</programlisting>
2 status as the availability of resources to continue to maintain 2 status as the availability of resources to continue to maintain
the system in a Production Quality state diminishes.</para> the system in a Production Quality state diminishes.</para>
<para>Current Tier 2 platforms are PowerPC and ia64.</para> <para>Current Tier 2 platforms are Alpha, PowerPC and ia64.</para>
</sect2> </sect2>
<sect2> <sect2>