Remove references to the TRB as it is being dissolved due to lack of

activity.

Approved by:	core
This commit is contained in:
John Baldwin 2005-08-16 18:53:16 +00:00
parent 2c6ccf8511
commit bb1c86620d
Notes: svn2git 2020-12-08 03:00:23 +00:00
svn path=/head/; revision=25385
2 changed files with 3 additions and 55 deletions

View file

@ -728,11 +728,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.225 2005-08-02 18:57:32 erwin Exp $</literal> (or in FreeBSD's case, of the <literal>$Id: article.sgml,v 1.226 2005-08-16 18:51:44 jhb 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.225 2005-08-02 18:57:32 erwin Exp $</literal> line, (remove the marker lines and the second <literal>$Id: article.sgml,v 1.226 2005-08-16 18:51:44 jhb Exp $</literal> line,
leaving the original <literal>$Id: article.sgml,v 1.225 2005-08-02 18:57:32 erwin Exp $</literal> line intact).</para> leaving the original <literal>$Id: article.sgml,v 1.226 2005-08-16 18:51:44 jhb Exp $</literal> line intact).</para>
</listitem> </listitem>
<listitem> <listitem>
@ -1410,8 +1410,6 @@ docs:Documentation Bug:freebsd-doc:</programlisting>
probably get to know in your role as a committer. Briefly, probably get to know in your role as a committer. Briefly,
and by no means all-inclusively, these are:</para> and by no means all-inclusively, these are:</para>
<!-- XXX The TRB are missing -->
<variablelist> <variablelist>
<varlistentry> <varlistentry>
@ -2027,7 +2025,6 @@ docs:Documentation Bug:freebsd-doc:</programlisting>
to resolve the dispute. All parties involved must then to resolve the dispute. All parties involved must then
agree to be bound by the decision reached by this 3rd agree to be bound by the decision reached by this 3rd
party.</para> party.</para>
<!-- XXX Mention TRB here too -->
</listitem> </listitem>
<listitem> <listitem>

View file

@ -93,55 +93,6 @@
</itemizedlist> </itemizedlist>
</sect2> </sect2>
<sect2>
<title>The &os; Technical Review Board</title>
<para>The &os; Technical Review Board consists of the following
appointed individuals:</para>
<itemizedlist>
<listitem>
<para>&a.dfr;</para>
</listitem>
<listitem>
<para>&a.jake;</para>
</listitem>
<listitem>
<para>&a.jeff;</para>
</listitem>
<listitem>
<para>&a.iedowse;</para>
</listitem>
<listitem>
<para>&a.alc;</para>
</listitem>
<listitem>
<para>&a.gallatin;</para>
</listitem>
<listitem>
<para>&a.jhb;</para>
</listitem>
<listitem>
<para>&a.peter;</para>
</listitem>
<listitem>
<para>&a.imp;</para>
</listitem>
<listitem>
<para>&a.sam;</para>
</listitem>
</itemizedlist>
</sect2>
<sect2 id="staff-secteam"> <sect2 id="staff-secteam">
<title>The &os; Security Team:</title> <title>The &os; Security Team:</title>