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

We do not have a Principal Architect any longer.

Browse source
This commit is contained in:
David E. O'Brien 2000-10-09 17:08:39 +00:00
parent 68b9d2851a
commit bad7c214a0
Notes: svn2git 2020-12-08 03:00:23 +00:00 
svn path=/head/; revision=8119
2 changed files with 26 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -16,7 +16,7 @@
</author> </author>
</authorgroup> </authorgroup>
<pubdate>$FreeBSD: doc/en_US.ISO_8859-1/articles/committers-guide/article.sgml,v 1.39 2000/10/02 04:23:21 obrien Exp $</pubdate> <pubdate>$FreeBSD: doc/en_US.ISO_8859-1/articles/committers-guide/article.sgml,v 1.40 2000/10/02 08:31:25 alex Exp $</pubdate>
<copyright> <copyright>
<year>1999</year> <year>1999</year>
@ -512,11 +512,11 @@
</itemizedlist> </itemizedlist>
<para>You'll almost certainly get a conflict because <para>You'll almost certainly get a conflict because
of the <literal>$Id: article.sgml,v 1.40 2000-10-02 08:31:25 alex Exp $</literal> (or in FreeBSD's case, of the <literal>$Id: article.sgml,v 1.41 2000-10-09 17:08:39 obrien Exp $</literal> (or in FreeBSD's case,
<literal>$FreeBSD<!-- stop expansion -->$</literal>) lines, so you'll have to edit <literal>$FreeBSD<!-- stop expansion -->$</literal>) lines, so you'll have to edit
the file to resolve the conflict (remove the marker lines and the file to resolve the conflict (remove the marker lines and
the second <literal>$Id: article.sgml,v 1.40 2000-10-02 08:31:25 alex Exp $</literal> line, leaving the original the second <literal>$Id: article.sgml,v 1.41 2000-10-09 17:08:39 obrien Exp $</literal> line, leaving the original
<literal>$Id: article.sgml,v 1.40 2000-10-02 08:31:25 alex Exp $</literal> line intact).</para> <literal>$Id: article.sgml,v 1.41 2000-10-09 17:08:39 obrien Exp $</literal> line intact).</para>
</listitem> </listitem>
<listitem> <listitem>
@ -1038,13 +1038,9 @@ docs:Documentation Bug:nik:</programlisting>
<term>&a.dg;</term> <term>&a.dg;</term>
<listitem> <listitem>
<para>David is our principal architect and overseer of the <para>David is the overseer of the
VM system. If you have a VM system change in mind, VM system. If you have a VM system change in mind,
coordinate it with David. Should you become locked in a coordinate it with David.</para>
bitter, intractable dispute with some other committer over
a proposed change (which does not happen very often,
thankfully) then an appeal to David to put on his P.A. hat
and make a final decision might be necessary.</para>
</listitem> </listitem>
</varlistentry> </varlistentry>
@ -1190,8 +1186,8 @@ docs:Documentation Bug:nik:</programlisting>
<listitem> <listitem>
<para>Any disputed change must be backed out pending <para>Any disputed change must be backed out pending
resolution of the dispute if requested by a maintainer or resolution of the dispute if requested by a maintainer.
the Principal Architect. Security related changes may Security related changes may
override a maintainer's wishes at the Security Officer's override a maintainer's wishes at the Security Officer's
discretion.</para> discretion.</para>
</listitem> </listitem>
@ -1206,7 +1202,7 @@ docs:Documentation Bug:nik:</programlisting>
merging so that it can be given sufficient testing. The merging so that it can be given sufficient testing. The
release engineer has the same authority over the release engineer has the same authority over the
<literal>-STABLE</literal> branch as outlined for the <literal>-STABLE</literal> branch as outlined for the
Principal Architect in rule #5.</para> maintainer in rule #5.</para>
</listitem> </listitem>
<listitem> <listitem>
@ -1232,8 +1228,8 @@ docs:Documentation Bug:nik:</programlisting>
<para>As noted, breaking some of these rules can be grounds for <para>As noted, breaking some of these rules can be grounds for
suspension or, upon repeated offense, permanent removal of suspension or, upon repeated offense, permanent removal of
commit privileges. Three or more members of core, or the commit privileges. Three or more members of core
Principal Architect and another member of core acting in unison, acting in unison,
have the power to temporarily suspend commit privileges until have the power to temporarily suspend commit privileges until
<literal>-core</literal> as a whole has the chance to review the <literal>-core</literal> as a whole has the chance to review the
issue. In case of an <quote>emergency</quote> (a committer issue. In case of an <quote>emergency</quote> (a committer
@ -1386,8 +1382,8 @@ docs:Documentation Bug:nik:</programlisting>
<listitem> <listitem>
<para>Any disputed change must be backed out pending <para>Any disputed change must be backed out pending
resolution of the dispute if requested by a maintainer or resolution of the dispute if requested by a maintainer
the Principal Architect. Security related changes may Security related changes may
override a maintainer's wishes at the Security Officer's override a maintainer's wishes at the Security Officer's
discretion.</para> discretion.</para>

30
en_US.ISO_8859-1/articles/committers-guide/article.sgml
View file

@ -16,7 +16,7 @@
</author> </author>
</authorgroup> </authorgroup>
<pubdate>$FreeBSD: doc/en_US.ISO_8859-1/articles/committers-guide/article.sgml,v 1.39 2000/10/02 04:23:21 obrien Exp $</pubdate> <pubdate>$FreeBSD: doc/en_US.ISO_8859-1/articles/committers-guide/article.sgml,v 1.40 2000/10/02 08:31:25 alex Exp $</pubdate>
<copyright> <copyright>
<year>1999</year> <year>1999</year>
@ -512,11 +512,11 @@
</itemizedlist> </itemizedlist>
<para>You'll almost certainly get a conflict because <para>You'll almost certainly get a conflict because
of the <literal>$Id: article.sgml,v 1.40 2000-10-02 08:31:25 alex Exp $</literal> (or in FreeBSD's case, of the <literal>$Id: article.sgml,v 1.41 2000-10-09 17:08:39 obrien Exp $</literal> (or in FreeBSD's case,
<literal>$FreeBSD<!-- stop expansion -->$</literal>) lines, so you'll have to edit <literal>$FreeBSD<!-- stop expansion -->$</literal>) lines, so you'll have to edit
the file to resolve the conflict (remove the marker lines and the file to resolve the conflict (remove the marker lines and
the second <literal>$Id: article.sgml,v 1.40 2000-10-02 08:31:25 alex Exp $</literal> line, leaving the original the second <literal>$Id: article.sgml,v 1.41 2000-10-09 17:08:39 obrien Exp $</literal> line, leaving the original
<literal>$Id: article.sgml,v 1.40 2000-10-02 08:31:25 alex Exp $</literal> line intact).</para> <literal>$Id: article.sgml,v 1.41 2000-10-09 17:08:39 obrien Exp $</literal> line intact).</para>
</listitem> </listitem>
<listitem> <listitem>
@ -1038,13 +1038,9 @@ docs:Documentation Bug:nik:</programlisting>
<term>&a.dg;</term> <term>&a.dg;</term>
<listitem> <listitem>
<para>David is our principal architect and overseer of the <para>David is the overseer of the
VM system. If you have a VM system change in mind, VM system. If you have a VM system change in mind,
coordinate it with David. Should you become locked in a coordinate it with David.</para>
bitter, intractable dispute with some other committer over
a proposed change (which does not happen very often,
thankfully) then an appeal to David to put on his P.A. hat
and make a final decision might be necessary.</para>
</listitem> </listitem>
</varlistentry> </varlistentry>
@ -1190,8 +1186,8 @@ docs:Documentation Bug:nik:</programlisting>
<listitem> <listitem>
<para>Any disputed change must be backed out pending <para>Any disputed change must be backed out pending
resolution of the dispute if requested by a maintainer or resolution of the dispute if requested by a maintainer.
the Principal Architect. Security related changes may Security related changes may
override a maintainer's wishes at the Security Officer's override a maintainer's wishes at the Security Officer's
discretion.</para> discretion.</para>
</listitem> </listitem>
@ -1206,7 +1202,7 @@ docs:Documentation Bug:nik:</programlisting>
merging so that it can be given sufficient testing. The merging so that it can be given sufficient testing. The
release engineer has the same authority over the release engineer has the same authority over the
<literal>-STABLE</literal> branch as outlined for the <literal>-STABLE</literal> branch as outlined for the
Principal Architect in rule #5.</para> maintainer in rule #5.</para>
</listitem> </listitem>
<listitem> <listitem>
@ -1232,8 +1228,8 @@ docs:Documentation Bug:nik:</programlisting>
<para>As noted, breaking some of these rules can be grounds for <para>As noted, breaking some of these rules can be grounds for
suspension or, upon repeated offense, permanent removal of suspension or, upon repeated offense, permanent removal of
commit privileges. Three or more members of core, or the commit privileges. Three or more members of core
Principal Architect and another member of core acting in unison, acting in unison,
have the power to temporarily suspend commit privileges until have the power to temporarily suspend commit privileges until
<literal>-core</literal> as a whole has the chance to review the <literal>-core</literal> as a whole has the chance to review the
issue. In case of an <quote>emergency</quote> (a committer issue. In case of an <quote>emergency</quote> (a committer
@ -1386,8 +1382,8 @@ docs:Documentation Bug:nik:</programlisting>
<listitem> <listitem>
<para>Any disputed change must be backed out pending <para>Any disputed change must be backed out pending
resolution of the dispute if requested by a maintainer or resolution of the dispute if requested by a maintainer
the Principal Architect. Security related changes may Security related changes may
override a maintainer's wishes at the Security Officer's override a maintainer's wishes at the Security Officer's
discretion.</para> discretion.</para>