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

Add a new rule to the committers: respect other contributors as well.

Browse source 
There has been plenty of discussion about how to actually ratify
such rules, but nobody has opposed this specific rule (which is a
good show of maturity btw).

In the end the conclusion is that this is not really any different from
the rest of the tree: If it makes sense: commit it, if it creats an
uproar, back it out and paint the bikeshed.

QED.

PR:		25783
Submitted by:	Dan Langille <dan@langille.org>
Reviewed by:	developers
This commit is contained in:
Poul-Henning Kamp 2001-03-28 10:55:43 +00:00
parent 967ab6c797
commit 86b72726db
Notes: svn2git 2020-12-08 03:00:23 +00:00 
svn path=/head/; revision=9084
2 changed files with 54 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -19,7 +19,7 @@
</author>
</authorgroup>
<pubdate>$FreeBSD: doc/en_US.ISO_8859-1/articles/committers-guide/article.sgml,v 1.48 2001/01/15 03:49:03 trevor Exp $</pubdate>
<pubdate>$FreeBSD: doc/en_US.ISO_8859-1/articles/committers-guide/article.sgml,v 1.49 2001/01/25 00:09:15 brian Exp $</pubdate>
<copyright>
<year>1999</year>
@ -516,11 +516,11 @@
</itemizedlist>
<para>You'll almost certainly get a conflict because
of the <literal>$Id: article.sgml,v 1.49 2001-01-25 00:09:15 brian Exp $</literal> (or in FreeBSD's case,
of the <literal>$Id: article.sgml,v 1.50 2001-03-28 10:55:43 phk Exp $</literal> (or in FreeBSD's case,
<literal>$FreeBSD<!-- stop expansion -->$</literal>) lines, so you'll have to edit
the file to resolve the conflict (remove the marker lines and
the second <literal>$Id: article.sgml,v 1.49 2001-01-25 00:09:15 brian Exp $</literal> line, leaving the original
<literal>$Id: article.sgml,v 1.49 2001-01-25 00:09:15 brian Exp $</literal> line intact).</para>
the second <literal>$Id: article.sgml,v 1.50 2001-03-28 10:55:43 phk Exp $</literal> line, leaving the original
<literal>$Id: article.sgml,v 1.50 2001-03-28 10:55:43 phk Exp $</literal> line intact).</para>
</listitem>
<listitem>
@ -1212,6 +1212,10 @@ docs:Documentation Bug:nik:</programlisting>
<para>Respect other committers.</para>
</listitem>
<listitem>
<para>Respect other contributors.</para>
</listitem>
<listitem>
<para>Discuss any significant change
<emphasis>before</emphasis> committing.</para>
@ -1355,6 +1359,25 @@ docs:Documentation Bug:nik:</programlisting>
trading that away.</para>
</listitem>
<listitem>
<para>Respect other contributors.</para>
<para>You weren't always a committer. At one time you were
a contributor. Remember that at all times. Remember what
it was like trying to get help and attention. Don't forget
that your work as a contributor time was very important to
you. Remember what it was like. Don't discourage, belittle,
or demean contributors. Treat them with respect. They are
our committers in waiting. They are every bit as important
to the project as committers. Their contributions are as
valid and as important as your own. After all, you made
many contributions before you became a committer. Always
remember that. </para>
<para>Consider the points raised under 'Respect other committers'
and apply them also to contributors.</para>
</listitem>
<listitem>
<para>Discuss any significant change
<emphasis>before</emphasis> committing.</para>

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

@ -19,7 +19,7 @@
</author>
</authorgroup>
<pubdate>$FreeBSD: doc/en_US.ISO_8859-1/articles/committers-guide/article.sgml,v 1.48 2001/01/15 03:49:03 trevor Exp $</pubdate>
<pubdate>$FreeBSD: doc/en_US.ISO_8859-1/articles/committers-guide/article.sgml,v 1.49 2001/01/25 00:09:15 brian Exp $</pubdate>
<copyright>
<year>1999</year>
@ -516,11 +516,11 @@
</itemizedlist>
<para>You'll almost certainly get a conflict because
of the <literal>$Id: article.sgml,v 1.49 2001-01-25 00:09:15 brian Exp $</literal> (or in FreeBSD's case,
of the <literal>$Id: article.sgml,v 1.50 2001-03-28 10:55:43 phk Exp $</literal> (or in FreeBSD's case,
<literal>$FreeBSD<!-- stop expansion -->$</literal>) lines, so you'll have to edit
the file to resolve the conflict (remove the marker lines and
the second <literal>$Id: article.sgml,v 1.49 2001-01-25 00:09:15 brian Exp $</literal> line, leaving the original
<literal>$Id: article.sgml,v 1.49 2001-01-25 00:09:15 brian Exp $</literal> line intact).</para>
the second <literal>$Id: article.sgml,v 1.50 2001-03-28 10:55:43 phk Exp $</literal> line, leaving the original
<literal>$Id: article.sgml,v 1.50 2001-03-28 10:55:43 phk Exp $</literal> line intact).</para>
</listitem>
<listitem>
@ -1212,6 +1212,10 @@ docs:Documentation Bug:nik:</programlisting>
<para>Respect other committers.</para>
</listitem>
<listitem>
<para>Respect other contributors.</para>
</listitem>
<listitem>
<para>Discuss any significant change
<emphasis>before</emphasis> committing.</para>
@ -1355,6 +1359,25 @@ docs:Documentation Bug:nik:</programlisting>
trading that away.</para>
</listitem>
<listitem>
<para>Respect other contributors.</para>
<para>You weren't always a committer. At one time you were
a contributor. Remember that at all times. Remember what
it was like trying to get help and attention. Don't forget
that your work as a contributor time was very important to
you. Remember what it was like. Don't discourage, belittle,
or demean contributors. Treat them with respect. They are
our committers in waiting. They are every bit as important
to the project as committers. Their contributions are as
valid and as important as your own. After all, you made
many contributions before you became a committer. Always
remember that. </para>
<para>Consider the points raised under 'Respect other committers'
and apply them also to contributors.</para>
</listitem>
<listitem>
<para>Discuss any significant change
<emphasis>before</emphasis> committing.</para>