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

More clarifications and imrovements to wording

Browse source 
With hat:	core-secretary
Submitted by:	phk
Approved by:	core
This commit is contained in:
Matthew Seaman 2015-07-14 21:24:42 +00:00
parent 4b12def6db
commit 658ca94c5b
Notes: svn2git 2020-12-08 03:00:23 +00:00 
svn path=/head/; revision=46980
1 changed files with 6 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
en_US.ISO8859-1/htdocs/internal/code-of-conduct.xml
View file

@ -23,8 +23,7 @@
this Code of Conduct. This not only includes developers and this Code of Conduct. This not only includes developers and
contributors to &os; but also anyone posting to &os; mailing contributors to &os; but also anyone posting to &os; mailing
lists or using the &os; Forums or chatting on &os; specific IRC lists or using the &os; Forums or chatting on &os; specific IRC
channels, or otherwise interacting with members of the &os; channels, or otherwise interacting with the &os; community.</p>
community.</p>
<p>Each individual's behaviour is primarily a matter for their <p>Each individual's behaviour is primarily a matter for their
personal conscience. Even so, there are limits whose breach personal conscience. Even so, there are limits whose breach
@ -102,16 +101,16 @@
third party to behave in such a way towards any members of third party to behave in such a way towards any members of
the &os; community.</p> the &os; community.</p>
<p>Core may remove any and all access to &os; resources or <p>Core will remove any and all access to &os; resources or
privileges for whatever period it deems fit, up to and including privileges for whatever period it deems fit, up to and including
a permanent ban where such transgression has been a permanent ban where it rules that a transgression has
demonstrated.</p> happened.</p>
<h2>In Case of Conflict</h2> <h2>In Case of Conflict</h2>
<ul> <ul>
<li>Back out contentious changes first, then argue your <li>If contested, back out your changes first, then argue your
case.</li> case.</li>
<li>Ask for review.</li> <li>Ask for review.</li>
<li>Seek approval from maintainers.</li> <li>Seek approval from maintainers.</li>
<li>When no mutually satisfactory resolution can be achieved, <li>When no mutually satisfactory resolution can be achieved,