Ubuntu Code of Conduct

Merge lp:~mako/ubuntu-codeofconduct/proposed-revision into lp:ubuntu-codeofconduct

  1. proposed-revision
  2. Merge into trunk
Proposed by Benjamin Mako Hill
Status: Merged
Merge reported by: Daniel Holbach
Merged at revision: not available
Proposed branch: lp:~mako/ubuntu-codeofconduct/proposed-revision
Merge into: lp:ubuntu-codeofconduct
Diff against target: 52 lines (+10/-10)
1 file modified
rationale.txt (+10/-10)
To merge this branch: bzr merge lp:~mako/ubuntu-codeofconduct/proposed-revision
Reviewer Review Type Date Requested Status
Daniel Holbach (community) Approve
Review via email: mp+14751@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Benjamin Mako Hill (mako) wrote :

Fixes a series of minor issues with the rationale document.

lp:~mako/ubuntu-codeofconduct/proposed-revision updated
12. By Benjamin Mako Hill

another typo

Revision history for this message
Daniel Holbach (dholbach) wrote :

+1, good work.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'rationale.txt'
2--- rationale.txt 2009-10-18 08:41:18 +0000
3+++ rationale.txt 2009-11-11 23:04:43 +0000
4@@ -1,14 +1,14 @@
5-The Code of Conduct was written in a day by a single person and revised
6-by only a handful of others before it was posted on the Ubuntu website.
7-At the time, there was no Ubuntu community.
8+The Code of Conduct (CoC) was written in a day by a single person and
9+revised by only a handful of others before it was posted on the Ubuntu
10+website. At the time, there was no Ubuntu community.
11
12-With time, the code has taken up a more important role than any of its
13+With time, the CoC has taken up a more important role than any of its
14 authors imagined. It is now explicitly agreed to by thousands of
15 Launchpad account holders and by hundreds of Ubuntu Members as a condition
16 of their franchise. It has become the central written pillar of the Ubuntu
17-community and has provided the basis for dozens of similar codes in other
18+community and has provided the basis for dozens of similar CoCs in other
19 communities. As a result, it is not lightly that we approach the task of
20-creating the first revision of the code since its creation.
21+creating the first revision of the CoC since its creation.
22
23 But over the last 5 years, the Ubuntu community has grown in ways and to
24 degrees that were unanticipated. The Code of conduct plays a very
25@@ -17,7 +17,7 @@
26 Code of Conduct for the Ubuntu Community of today, we offer this
27 proposed revision. We have tried to keep changes as small as possible
28 and to ensure that all proposed changes are fully in the spirit, if not
29-the language, of the original code.
30+the language, of the original CoC.
31
32 == Goals with revision 1.1 ==
33
34@@ -26,8 +26,8 @@
35 was written, Ubuntu was an entirely technical project. There were no
36 users, no support systems, and very little in the way of non-technical
37 contributions from anyone. That has changed. In fact, the vast majority
38-of the Ubuntu community contributes to the Ubuntu project is ways other
39-than through writing code and making packages. We want our code to
40+of the Ubuntu community contributes to the Ubuntu project in ways other
41+than through writing code and making packages. We want our CoC to
42 reflect this and to speak to the reality of the Ubuntu community today.
43
44 Additionally, several of our proposed changes are designed to reflect
45@@ -73,7 +73,7 @@
46 - generalised the types of work that Ubuntu community members do
47
48 - changed the reference from members to community members (membership
49- didn't exist with the CC was written)
50+ didn't exist when the CoC was written)
51
52 In the section on ''When we disagree'', we:
53

Subscribers

People subscribed via source and target branches