Merge lp:~mdz/ubuntu-codeofconduct/equal-applicability into lp:ubuntu-codeofconduct

[Matt Zimmerman]

Per discussion on community-council@ in March/April 2011

[Daniel Holbach (dholbach)]

Good work. Thanks for your work on this.

review: Approve

=== modified file 'CodeOfConduct.txt'
--- CodeOfConduct.txt	2009-10-18 08:41:18 +0000
+++ CodeOfConduct.txt	2011-04-18 10:29:52 +0000
@@ -2,10 +2,15 @@
 
 This Code of Conduct covers our behaviour as members of the Ubuntu
 Community, in any forum, mailing list, wiki, web site, IRC channel,
-install-fest, public meeting or private correspondence.  Ubuntu
-governance bodies are ultimately accountable to the Ubuntu Community
-Council and will arbitrate in any dispute over the conduct of a member
-of the community.
+install-fest, public meeting or private correspondence.  It applies equally
+to everyone who participates in Ubuntu, whether they are a member of the
+project, representing the project in some way, or simply passing by.  It
+applies in all of our interactions with other people, including those who
+are not themselves participants in Ubuntu.
+
+Ubuntu governance bodies are ultimately accountable to the Ubuntu
+Community Council and will arbitrate in any dispute over the conduct
+of a participant in the community.
 
       '''Be considerate.''' Our work will be used by other people, and
       we in turn will depend on the work of others. Any decision we take
@@ -27,7 +32,9 @@
       threatened is not a productive one. We expect members of the
       Ubuntu community to be respectful when dealing with other
       contributors as well as with people outside the Ubuntu project and
-      with users of Ubuntu.
+      with users of Ubuntu.  If we offend someone through our actions,
+      we will listen earnestly, take responsibility, and work to make
+      things right.
 
       '''Be collaborative.''' Collaboration is central to Ubuntu and to
       the larger free software community.  This collaboration involves