* [gentoo-commits] gentoo commit in xml/htdocs/proj/en/council: coc.xml
@ 2008-11-20 17:04 Donnie Berkholz (dberkholz)
0 siblings, 0 replies; 3+ messages in thread
From: Donnie Berkholz (dberkholz) @ 2008-11-20 17:04 UTC (permalink / raw
To: gentoo-commits
dberkholz 08/11/20 17:04:19
Modified: coc.xml
Log:
(#185572) Update to reflect that devrel/userrel currently act as proctors.
Revision Changes Path
1.3 xml/htdocs/proj/en/council/coc.xml
file : http://sources.gentoo.org/viewcvs.py/gentoo/xml/htdocs/proj/en/council/coc.xml?rev=1.3&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo/xml/htdocs/proj/en/council/coc.xml?rev=1.3&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo/xml/htdocs/proj/en/council/coc.xml?r1=1.2&r2=1.3
Index: coc.xml
===================================================================
RCS file: /var/cvsroot/gentoo/xml/htdocs/proj/en/council/coc.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- coc.xml 15 Mar 2007 22:22:48 -0000 1.2
+++ coc.xml 20 Nov 2008 17:04:19 -0000 1.3
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!-- $Header: /var/cvsroot/gentoo/xml/htdocs/proj/en/council/coc.xml,v 1.2 2007/03/15 22:22:48 robbat2 Exp $ -->
+<!-- $Header: /var/cvsroot/gentoo/xml/htdocs/proj/en/council/coc.xml,v 1.3 2008/11/20 17:04:19 dberkholz Exp $ -->
<!DOCTYPE guide SYSTEM "/dtd/guide.dtd">
<guide link="/proj/en/council/coc.xml">
@@ -41,6 +41,9 @@
<author title="Contributor">
<mail link="kugelfang@gentoo.org">Danny van Dyk</mail>
</author>
+<author title="Contributor">
+ <mail link="lack@gentoo.org">Jim Ramsay</mail>
+</author>
<author title="Editor">
<mail link="musikc@charter.net">Christina Fullam</mail>
</author>
@@ -75,11 +78,11 @@
<body>
<p>
-Gentoo prides itself on being a community driven distribution that acts with the best interest of the community at heart. Rules and regulations that keep us all moving in a forward direction are a reality for a community of this size.
+Gentoo prides itself on being a community driven distribution that acts with the best interest of the community at heart. Rules and regulations that keep us all moving in a forward direction are a reality for a community of this size.
</p>
<p>
-This document describes Gentoo's Code of Conduct for public communication mediums, who shall enforce said Code of Conduct, the action taken should the Code of Conduct be broken, as well as the method for appeals. Questions about this document and its contents can be directed to the council at council@gentoo.org.
+This document describes Gentoo's Code of Conduct for public communication mediums, who shall enforce said Code of Conduct, the action taken should the Code of Conduct be broken, as well as the method for appeals. Questions about this document and its contents can be directed to the council at council@gentoo.org.
</p>
<impo>
@@ -105,7 +108,7 @@
<ul>
<li>
- <b>Be courteous.</b> Though respect is earned, it must start somewhere. Respect someones right for their own opinion and acknowledge that they do deserve a measure of politeness in your response.
+ <b>Be courteous.</b> Though respect is earned, it must start somewhere. Respect someones right for their own opinion and acknowledge that they do deserve a measure of politeness in your response.
</li>
<li>
<b>Give accurate information in the spirit of being helpful.</b>
@@ -141,16 +144,16 @@
<body>
<p>
-Gentoo developers have come together with a common purpose, to further the project. Conflicts will undoubtedly arise, and though you are encouraged to work through issues on your own, assistance is available as requested and as needed.
+Gentoo developers have come together with a common purpose, to further the project. Conflicts will undoubtedly arise, and though you are encouraged to work through issues on your own, assistance is available as requested and as needed.
</p>
<p>
Deciding to suspend or ban someone isn't a decision to be taken lightly, but
-sometimes it has to happen. Below is a list of things that could result in disciplinary action.
+sometimes it has to happen. Below is a list of things that could result in disciplinary action.
</p>
<ul>
<li>
- <b>Flaming and trolling.</b> What is trolling? You are deemed to be trolling if you make comments intended to provoke an angry response from others. What is flaming? Flaming is the act of sending or posting messages that are deliberately hostile and insulting.
+ <b>Flaming and trolling.</b> What is trolling? You are deemed to be trolling if you make comments intended to provoke an angry response from others. What is flaming? Flaming is the act of sending or posting messages that are deliberately hostile and insulting.
</li>
<li>
<b>Posting/participating only to incite drama or negativity</b> rather than
@@ -158,7 +161,7 @@
</li>
<li>
<b>Being judgmental, mean-spirited or insulting.</b> It is possible to
- respectfully challenge someone in a way that empowers without being judgemental.
+ respectfully challenge someone in a way that empowers without being judgemental.
</li>
<li>
<b>Constantly purveying misinformation</b> despite repeated warnings.
@@ -173,15 +176,19 @@
<body>
<p>
-Disciplinary action will be up to the descretion of the proctors. What is a proctor? A proctor is an official charged with the duty of maintaining good order. If discplinary measures are taken and the affected person wishes to appeal, appeals should be addressed to the Gentoo Council via email at council@gentoo.org. To prevent conflicts of interest, Council members may not perform the duties of a proctor.
+Disciplinary action will be up to the descretion of the proctors. What is a proctor? A proctor is an official charged with the duty of maintaining good order. Currently this responsibility falls to two existing Gentoo projects: <uri link="proj/en/devrel">DevRel</uri> and <uri link="/proj/en/userrel">UserRel</uri>.
+</p>
+
+<p>
+If you perceive a breach of the Code of Conduct guidelines, let the appropriate proctors know. Though they will also be watching many of the public mediums for any problems, they can not be expected to catch everything. If the offender is a Gentoo developer, contact <mail link="devrel@g.o">devrel@g.o</mail>, otherwise contact <mail link="userrel@g.o">userrel@g.o</mail>.
</p>
<p>
-If you perceive a breach of the Code of Conduct guidelines, let the proctors know. Though they will also be watching many of the public mediums for any problems, they can not be expected to catch everything.
+The proctors will attempt to resolve the problem by talking to involved parties, potentially issuing warnings if appropriate. If the problem repeats itself, there are various options open to the proctors, including temporary or permanent suspension of a person's ability to post to mailing lists, removal of Bugzilla access, or in more severe cases suspension of developer privileges.
</p>
<p>
-The proctors will attempt to resolve the problem by talking to involved parties, potentially issuing warnings if appropriate. If the problem repeats itself, there are various options open to the proctors, including temporary or permanent suspension of a person's ability to post to mailing lists, removal of Bugzilla access, or in more severe cases suspension of developer privileges. Any action of this sort will require consensus from at least three proctors.
+If discplinary measures are taken and the affected person wishes to appeal, appeals should be addressed to the Gentoo Council via email at <mail link="council@g.o">council@g.o</mail>. To prevent conflicts of interest, Council members may not perform the duties of a proctor.
</p>
</body>
^ permalink raw reply [flat|nested] 3+ messages in thread
* [gentoo-commits] gentoo commit in xml/htdocs/proj/en/council: coc.xml
@ 2009-10-22 12:20 Victor Ostorga (vostorga)
0 siblings, 0 replies; 3+ messages in thread
From: Victor Ostorga (vostorga) @ 2009-10-22 12:20 UTC (permalink / raw
To: gentoo-commits
vostorga 09/10/22 12:20:02
Modified: coc.xml
Log:
Fixing Devrel link in section Consequences, because it was broken
Revision Changes Path
1.4 xml/htdocs/proj/en/council/coc.xml
file : http://sources.gentoo.org/viewcvs.py/gentoo/xml/htdocs/proj/en/council/coc.xml?rev=1.4&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo/xml/htdocs/proj/en/council/coc.xml?rev=1.4&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo/xml/htdocs/proj/en/council/coc.xml?r1=1.3&r2=1.4
Index: coc.xml
===================================================================
RCS file: /var/cvsroot/gentoo/xml/htdocs/proj/en/council/coc.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- coc.xml 20 Nov 2008 17:04:19 -0000 1.3
+++ coc.xml 22 Oct 2009 12:20:02 -0000 1.4
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!-- $Header: /var/cvsroot/gentoo/xml/htdocs/proj/en/council/coc.xml,v 1.3 2008/11/20 17:04:19 dberkholz Exp $ -->
+<!-- $Header: /var/cvsroot/gentoo/xml/htdocs/proj/en/council/coc.xml,v 1.4 2009/10/22 12:20:02 vostorga Exp $ -->
<!DOCTYPE guide SYSTEM "/dtd/guide.dtd">
<guide link="/proj/en/council/coc.xml">
@@ -176,7 +176,7 @@
<body>
<p>
-Disciplinary action will be up to the descretion of the proctors. What is a proctor? A proctor is an official charged with the duty of maintaining good order. Currently this responsibility falls to two existing Gentoo projects: <uri link="proj/en/devrel">DevRel</uri> and <uri link="/proj/en/userrel">UserRel</uri>.
+Disciplinary action will be up to the descretion of the proctors. What is a proctor? A proctor is an official charged with the duty of maintaining good order. Currently this responsibility falls to two existing Gentoo projects: <uri link="/proj/en/devrel">DevRel</uri> and <uri link="/proj/en/userrel">UserRel</uri>.
</p>
<p>
^ permalink raw reply [flat|nested] 3+ messages in thread
* [gentoo-commits] gentoo commit in xml/htdocs/proj/en/council: coc.xml
@ 2012-10-28 15:21 Sven Vermeulen (swift)
0 siblings, 0 replies; 3+ messages in thread
From: Sven Vermeulen (swift) @ 2012-10-28 15:21 UTC (permalink / raw
To: gentoo-commits
swift 12/10/28 15:21:00
Modified: coc.xml
Log:
Removing link attribute from guides
Revision Changes Path
1.5 xml/htdocs/proj/en/council/coc.xml
file : http://sources.gentoo.org/viewvc.cgi/gentoo/xml/htdocs/proj/en/council/coc.xml?rev=1.5&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo/xml/htdocs/proj/en/council/coc.xml?rev=1.5&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo/xml/htdocs/proj/en/council/coc.xml?r1=1.4&r2=1.5
Index: coc.xml
===================================================================
RCS file: /var/cvsroot/gentoo/xml/htdocs/proj/en/council/coc.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- coc.xml 22 Oct 2009 12:20:02 -0000 1.4
+++ coc.xml 28 Oct 2012 15:21:00 -0000 1.5
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!-- $Header: /var/cvsroot/gentoo/xml/htdocs/proj/en/council/coc.xml,v 1.4 2009/10/22 12:20:02 vostorga Exp $ -->
+<!-- $Header: /var/cvsroot/gentoo/xml/htdocs/proj/en/council/coc.xml,v 1.5 2012/10/28 15:21:00 swift Exp $ -->
<!DOCTYPE guide SYSTEM "/dtd/guide.dtd">
-<guide link="/proj/en/council/coc.xml">
+<guide>
<title>Code of Conduct</title>
<author title="Author">
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2012-10-28 15:25 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2009-10-22 12:20 [gentoo-commits] gentoo commit in xml/htdocs/proj/en/council: coc.xml Victor Ostorga (vostorga)
-- strict thread matches above, loose matches on Subject: below --
2012-10-28 15:21 Sven Vermeulen (swift)
2008-11-20 17:04 Donnie Berkholz (dberkholz)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox