@@ -13,51 +13,31 @@ If you're interested in contributing, but don't know where to start, feel free t
14## Code guidelines
14## Code guidelines
16−Our official guide to contributing can be found
17−[here](https://github.com/urbit/urbit/blob/master/CONTRIBUTING.md),
16+Our official guide to contributing can be found [here](https://github.com/urbit/urbit/blob/master/CONTRIBUTING.md), which is most useful for large and low-level changes.
18−which is most useful for large and low-level changes.
20−Before contributing code, you should familiarize yourself with the
21−[Hoon style guide](/docs/learn/arvo/style). For a good example of preferred Hoon
22−coding style, see [ford.hoon](https://github.com/urbit/arvo/blob/master/sys/vane/ford.hoon).
18+Before contributing code, you should familiarize yourself with the [Hoon style guide](/docs/learn/arvo/style). For a good example of preferred Hoon coding style, see [ford.hoon](https://github.com/urbit/arvo/blob/master/sys/vane/ford.hoon).
24## Community Guidelines
20## Community Guidelines
26−Urbit is both code and community. We have guidelines for the former, and we also
22+Urbit is both code and community. We have guidelines for the former, and we also have guidelines for the latter.
27−have guidelines for the latter.
29### Jurisdiction
24### Jurisdiction
31−Urbit is a decentralized system, both technically and in spirit. This means that
32−no one, Tlon Corp. or otherwise, has the technical ability to police the entire
33−network. But we do admit that moderation is necessary; we just think that it’s not strictly a technical problem.
26+Urbit is a decentralized system, both technically and in spirit. This means that no one, Tlon Corp. or otherwise, has the technical ability to police the entire network. But we do admit that moderation is necessary; we just think that it’s not strictly a technical problem.
35−What we can do, and what we propose to do in this document, is define how we
28+What we can do, and what we propose to do in this document, is define how we plan on moderating our little, but important, corner of Urbit. We define the limits of our jurisdiction as the general-purpose discussion channel `/urbit-meta`, our forum, `fora` and, adjacently, the GitHub issues on any of the [official urbit repos](https://github.com/urbit).
36−plan on moderating our little, but important, corner of Urbit. We define the
37−limits of our jurisdiction as the general-purpose discussion channel `/urbit-meta`,
38−our forum, `fora` and, adjacently, the GitHub issues on any of the [official urbit
39−repos](https://github.com/urbit).
41−Our hope is that the system established here can serve as a model for other corners
30+Our hope is that the system established here can serve as a model for other corners of Urbit.
44### Use of these guidelines
32### Use of these guidelines
46−The goal of these guidelines is to provide clear principles which can be used by
34+The goal of these guidelines is to provide clear principles which can be used by moderators for the resolution of disputes in this jurisdiction. The hope is that, by knowing the guidelines that will be cited in case of a dispute, users can have clear expectations of how to comport themselves and how a judgement will be made. The ideal is that, right before pressing "Submit" on an inflammatory Fora post, the errant Urbiter will pause and remember the following mandates.
47−moderators for the resolution of disputes in this jurisdiction. The hope is that,
48−by knowing the guidelines that will be cited in case of a dispute, users can have
49−clear expectations of how to comport themselves and how
50−a judgement will be made. The ideal is that, right before pressing "Submit" on an
51−inflammatory Fora post, the errant Urbiter will pause and remember the following
54### The Pentalogue
36### The Pentalogue
56#### 1. Stay on topic
38#### 1. Stay on topic
58−Conflicts about the work, about building Urbit, are good conflicts. Conflicts about
40+Conflicts about the work, about building Urbit, are good conflicts. Conflicts about haircuts, politics or sports are not productive and are best conducted in a DM or a private circle.
59−haircuts, politics or sports are not productive and are best conducted in a DM or
62#### 2. Treat everyone like a person
42#### 2. Treat everyone like a person
@@ -71,14 +51,11 @@ Before responding to something that seems objectionable, make sure that the othe
72No one likes comments like "this sux" in a thread of otherwise serious commentary. If other people have something to lose (even if it’s just face), be respectful. And, ideally, put some skin in the game yourself.
52No one likes comments like "this sux" in a thread of otherwise serious commentary. If other people have something to lose (even if it’s just face), be respectful. And, ideally, put some skin in the game yourself.
74−In general, establish yourself in a conversation or a subject area before you
54+In general, establish yourself in a conversation or a subject area before you start attacking anyone. Better yet: don't attack anyone.
75−start attacking anyone. Better yet: don't attack anyone.
77#### 4. Assume good faith
56#### 4. Assume good faith
79−If anyone has gone through the trouble of booting a ship, submitting an issue,
80−learning Hoon, reading through our docs or otherwise shown themselves committed
58+If anyone has gone through the trouble of booting a ship, submitting an issue, learning Hoon, reading through our docs or otherwise shown themselves committed to our wild-eyed vision, they are to be assumed to be a friend.
81−to our wild-eyed vision, they are to be assumed to be a friend.
83If you can choose to interpret a statement as a sneaky slight or a clumsy compliment, choose the latter.
60If you can choose to interpret a statement as a sneaky slight or a clumsy compliment, choose the latter.
@@ -86,22 +63,14 @@ If you can choose to interpret a statement as a sneaky slight or a clumsy compli
87We believe that all good governance terminates in a human relationship, and that moderators fulfill that role. All moderators will be forced to make judgments not covered by this document, and that will doubtless make some unhappy; maybe even you. Please respect the fact that someone took this responsibility on for the greater good.
64We believe that all good governance terminates in a human relationship, and that moderators fulfill that role. All moderators will be forced to make judgments not covered by this document, and that will doubtless make some unhappy; maybe even you. Please respect the fact that someone took this responsibility on for the greater good.
89−The flipside of this is that moderators are expected to act in accordance with the
66+The flipside of this is that moderators are expected to act in accordance with the dignity of that office. Abuse of power will not be tolerated.
90−dignity of that office. Abuse of power will not be tolerated.
92### Adjudication
68### Adjudication
94−The body responsible for the hearing of and ruling on claims is the Council,
70+The body responsible for the hearing of and ruling on claims is the Council, composed of moderators. Moderators are to serve for a term of one year.
95−composed of moderators. Moderators are to serve for a term of one year.
97−Any planet-holder on the network dissatisfied with the behavior of another
72+Any planet-holder on the network dissatisfied with the behavior of another planet-holder must first send a complaint to the Council with a link to the offending message or document.
98−planet-holder must first send a complaint to the Council with a link to the
99−offending message or document.
101−The case will be assigned a moderator at random, who will decide the
102−matter. The finding will include a punishment which can range from censure to
74+The case will be assigned a moderator at random, who will decide the matter. The finding will include a punishment which can range from censure to temporary or permanent blacklisting.
103−temporary or permanent blacklisting.
105−If one of the parties in the case would like to file an appeal, the case can be
106−heard and ruled on by the entire Council. All proceedings of the Council are public and
76+If one of the parties in the case would like to file an appeal, the case can be heard and ruled on by the entire Council. All proceedings of the Council are public and all past behavior in the jurisdiction can be considered in the Councils’ decision.
107−all past behavior in the jurisdiction can be considered in the Councils’ decision.