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

Proposed by Benjamin Mako Hill
Status: Merged
Merge reported by: Daniel Holbach
Merged at revision: not available
Proposed branch: lp://staging/~mako/ubuntu-codeofconduct/proposed-revision
Merge into: lp://staging/ubuntu-codeofconduct
Diff against target: 52 lines (+10/-10)
1 file modified
rationale.txt (+10/-10)
To merge this branch: bzr merge lp://staging/~mako/ubuntu-codeofconduct/proposed-revision
Reviewer Review Type Date Requested Status
Daniel Holbach (community) Approve
Review via email: mp+14751@code.staging.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.

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
=== modified file 'rationale.txt'
--- rationale.txt 2009-10-18 08:41:18 +0000
+++ rationale.txt 2009-11-11 23:04:43 +0000
@@ -1,14 +1,14 @@
1The Code of Conduct was written in a day by a single person and revised1The Code of Conduct (CoC) was written in a day by a single person and
2by only a handful of others before it was posted on the Ubuntu website.2revised by only a handful of others before it was posted on the Ubuntu
3At the time, there was no Ubuntu community.3website. At the time, there was no Ubuntu community.
44
5With time, the code has taken up a more important role than any of its5With time, the CoC has taken up a more important role than any of its
6authors imagined. It is now explicitly agreed to by thousands of6authors imagined. It is now explicitly agreed to by thousands of
7Launchpad account holders and by hundreds of Ubuntu Members as a condition7Launchpad account holders and by hundreds of Ubuntu Members as a condition
8of their franchise. It has become the central written pillar of the Ubuntu8of their franchise. It has become the central written pillar of the Ubuntu
9community and has provided the basis for dozens of similar codes in other9community and has provided the basis for dozens of similar CoCs in other
10communities. As a result, it is not lightly that we approach the task of10communities. As a result, it is not lightly that we approach the task of
11creating the first revision of the code since its creation.11creating the first revision of the CoC since its creation.
1212
13But over the last 5 years, the Ubuntu community has grown in ways and to13But over the last 5 years, the Ubuntu community has grown in ways and to
14degrees that were unanticipated. The Code of conduct plays a very14degrees that were unanticipated. The Code of conduct plays a very
@@ -17,7 +17,7 @@
17Code of Conduct for the Ubuntu Community of today, we offer this17Code of Conduct for the Ubuntu Community of today, we offer this
18proposed revision. We have tried to keep changes as small as possible18proposed revision. We have tried to keep changes as small as possible
19and to ensure that all proposed changes are fully in the spirit, if not19and to ensure that all proposed changes are fully in the spirit, if not
20the language, of the original code.20the language, of the original CoC.
2121
22== Goals with revision 1.1 ==22== Goals with revision 1.1 ==
2323
@@ -26,8 +26,8 @@
26was written, Ubuntu was an entirely technical project. There were no26was written, Ubuntu was an entirely technical project. There were no
27users, no support systems, and very little in the way of non-technical27users, no support systems, and very little in the way of non-technical
28contributions from anyone. That has changed. In fact, the vast majority28contributions from anyone. That has changed. In fact, the vast majority
29of the Ubuntu community contributes to the Ubuntu project is ways other29of the Ubuntu community contributes to the Ubuntu project in ways other
30than through writing code and making packages. We want our code to30than through writing code and making packages. We want our CoC to
31reflect this and to speak to the reality of the Ubuntu community today.31reflect this and to speak to the reality of the Ubuntu community today.
3232
33Additionally, several of our proposed changes are designed to reflect33Additionally, several of our proposed changes are designed to reflect
@@ -73,7 +73,7 @@
73 - generalised the types of work that Ubuntu community members do73 - generalised the types of work that Ubuntu community members do
7474
75 - changed the reference from members to community members (membership75 - changed the reference from members to community members (membership
76 didn't exist with the CC was written)76 didn't exist when the CoC was written)
7777
78In the section on ''When we disagree'', we:78In the section on ''When we disagree'', we:
7979

Subscribers

People subscribed via source and target branches