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

Update the rules on commit bit suspention to reflect the current

Browse source 
policy of core.

Reviewed by: wilko
This commit is contained in:
Warner Losh 2002-05-13 22:00:39 +00:00
parent fbeedae47a
commit ffeefaae81
Notes: svn2git 2020-12-08 03:00:23 +00:00 
svn path=/head/; revision=13072
1 changed files with 11 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -583,11 +583,11 @@
</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.120 2002-05-12 23:18:17 keramida Exp $</literal> (or in FreeBSD's case, of the <literal>$Id: article.sgml,v 1.121 2002-05-13 22:00:39 imp Exp $</literal> (or in FreeBSD's case,
<literal>$<!-- stop expansion -->FreeBSD<!-- stop expansion -->$</literal>) lines, so you will have to edit <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 file to resolve the conflict (remove the marker lines and
the second <literal>$Id: article.sgml,v 1.120 2002-05-12 23:18:17 keramida Exp $</literal> line, leaving the original the second <literal>$Id: article.sgml,v 1.121 2002-05-13 22:00:39 imp Exp $</literal> line, leaving the original
<literal>$Id: article.sgml,v 1.120 2002-05-12 23:18:17 keramida Exp $</literal> line intact).</para> <literal>$Id: article.sgml,v 1.121 2002-05-13 22:00:39 imp Exp $</literal> line intact).</para>
</listitem> </listitem>
<listitem> <listitem>
@ -1488,24 +1488,22 @@ 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 commit privileges. Individual members of core
acting in unison,
have the power to temporarily suspend commit privileges until have the power to temporarily suspend commit privileges until
core as a whole has the chance to review the core 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
doing damage to the repository), a temporary suspension may also doing damage to the repository), a temporary suspension may also
be done by the repository meisters or any other member of core be done by the repository meisters.
who may happen to be awake at the time. Only core as a whole Only a 2/3 majority of core
has the authority to suspend commit privileges for any has the authority to suspend commit privileges for longer
significant length of time or to remove them permanently, the than a week or to remove them permanently.
latter generally only being done after consultation with This rule does not exist to set core up as a bunch
committers. This rule does not exist to set core up as a bunch
of cruel dictators who can dispose of committers as casually as of cruel dictators who can dispose of committers as casually as
empty soda cans, but to give the project a kind of safety fuse. empty soda cans, but to give the project a kind of safety fuse.
If someone is seriously out of control, it is important to be If someone is out of control, it is important to be
able to deal with this immediately rather than be paralyzed by able to deal with this immediately rather than be paralyzed by
debate. In all cases, a committer whose privileges are debate. In all cases, a committer whose privileges are
suspended or revoked is entitled to a <quote>hearing</quote>, suspended or revoked is entitled to a <quote>hearing</quote> by core,
the total duration of the suspension being determined at that the total duration of the suspension being determined at that
time. A committer whose privileges are suspended may also time. A committer whose privileges are suspended may also
request a review of the decision after 30 days and every 30 days request a review of the decision after 30 days and every 30 days