Merge lp:~akgraner/ubuntu-codeofconduct/proposedv2coc into lp:ubuntu-codeofconduct

[Amber Graner]

Combined the CoC and LCoC into one document for version control, editing and final approval.

[Daniel Holbach (dholbach)]

I just pushed lp:~dholbach/ubuntu-codeofconduct/proposedv2coc which adds a missing revision to MergedCodeOfConduct.txt

For (maybe) better readability:
 - wdiff between CodeOfConduct.txt and MergedCodeOfConduct.txt: http://paste.ubuntu.com/881697
 - wdiff between LeadershipCodeOfConduct.txt and MergedCodeOfConduct.txt: http://paste.ubuntu.com/881698/

[Amber Graner (akgraner)]

So you need the

On Tue, Mar 13, 2012 at 7:22 AM, Daniel Holbach
<email address hidden> wrote:
> I just pushed lp:~dholbach/ubuntu-codeofconduct/proposedv2coc which adds a missing revision to MergedCodeOfConduct.txt
>
> For (maybe) better readability:
>  - wdiff between CodeOfConduct.txt and MergedCodeOfConduct.txt: http://paste.ubuntu.com/881697
>  - wdiff between LeadershipCodeOfConduct.txt and MergedCodeOfConduct.txt: http://paste.ubuntu.com/881698/
> --
> https://code.launchpad.net/~akgraner/ubuntu-codeofconduct/proposedv2coc/+merge/97139
> You are the owner of lp:~akgraner/ubuntu-codeofconduct/proposedv2coc.

So you need the
[-v1.1-] {+v2.0+} =

{+

in the one I did and so the diff will show up?

and the other one in the LCoC has the suggestions for defining various
phrasing. That's pretty cool!

Thanks Daniel!
~Amber
--
Amber Graner//akgraner//
http://akgraner.com/
http://www.ubuntu-user.com/Online/Blogs/Amber-Graner-You-in-Ubuntu

Just me Amber.

There are lots of Linux users who don't care how the kernel works, but
only want to use it. That is a tribute to how good Linux is.
Linus Torvalds

[Charles Profitt (cprofitt)]

Read Daniel's version. It looks good to me on quick review. Nice work Amber and Daniel.

[Daniel Holbach (dholbach)]

Amber: you just need to run (in your local branch):

bzr pull lp:~dholbach/ubuntu-codeofconduct/proposedv2coc
bzr push
bzr lp-open

and click on the "(+) Propose for merging" or "Resubmit" link to get the updated version with the bits which Matt added in an older revision of the CoC. The pastebin links are basically just a different representation of the proposed changes.

[Daniel Holbach (dholbach)]

A few small, but not too important, things I found:

 - "Ubuntu is an African concept of 'humanity towards others'." could probably be paraphrased to
   "Ubuntu is an ancient African word meaning 'humanity to others'."
 - in the suggested changes to the LCoC bits we talk about "community members" again, can we call
   them participants like in the new CoC version?
 - I'm not quite sure what "work within the Ubuntu system to effect change" means.
 - I'm not a huge fan of "their team" as opposed to "the team".

[Charles Profitt (cprofitt)]

I like the suggestions put forth by Daniel.

=== added file 'MergedCodeOfConduct.txt'
--- MergedCodeOfConduct.txt	1970-01-01 00:00:00 +0000
+++ MergedCodeOfConduct.txt	2012-03-13 04:22:17 +0000
@@ -0,0 +1,202 @@
+= Ubuntu Code of Conduct v2.0 =
+
+== Community ==
+
+Ubuntu is an African concept of 'humanity towards others'.
+
+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 as
+such the Ubuntu Community Council will arbitrate in any dispute over the
+conduct of a member of 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 will affect users and colleagues, and we
+	   should take those consequences into account when making
+	   decisions. Ubuntu has millions of users and thousands of
+	   contributors. Even if it's not obvious at the time, our
+	   contributions to Ubuntu will impact the work of others. For
+	   example, changes to code, infrastructure, policy,
+	   documentation, and translations during a release may
+	   negatively impact others' work.  
+
+	   '''Be respectful.''' The Ubuntu community and its members
+	   treat one another with respect. Everyone can make a
+	   valuable contribution to Ubuntu.  We may not always agree,
+	   but disagreement is no excuse for poor behaviour and poor
+	   manners. We might all experience some frustration now and
+	   then, but we cannot allow that frustration to turn into a
+	   personal attack. It's important to remember that a
+	   community where people feel uncomfortable or 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.  '''Be collaborative.
+
+	   ''' Collaboration is central to Ubuntu and to the larger
+	   free software community. This collaboration involves
+	   individuals working with others in teams within Ubuntu,
+	   teams working with each other within Ubuntu, and
+	   individuals and teams within Ubuntu working with other
+	   projects outside. This collaboration reduces redundancy,
+	   and improves the quality of our work. Internally and
+	   externally, we should always be open to
+	   collaboration. Wherever possible, we should work closely
+	   with upstream projects and others in the free software
+	   community to coordinate our technical, advocacy,
+	   documentation, and other work. Our work should be done
+	   transparently and we should involve as many interested
+	   parties as early as possible. If we decide to take a
+	   different approach than others, we will let them know
+	   early, document our work and inform others regularly of our
+	   progress.
+
+	   '''When we disagree, we consult others.'''  Disagreements,
+	   both social and technical, happen all the time and the
+	   Ubuntu community is no exception. It is important that we
+	   resolve disagreements and differing views constructively
+	   and with the help of the community and community processes.
+	   We have the Technical Board, the Community Council, and a
+	   series of other governance bodies which help to decide the
+	   right course for Ubuntu. There are also several Project
+	   Teams and Team Leaders, who may be able to help us figure
+	   out the best direction for Ubuntu. When our goals differ
+	   dramatically, we encourage the creation of alternative sets
+	   of packages, or derivative distributions, using the Ubuntu
+	   Package Management framework, so that the community can
+	   test new ideas and contribute to the discussion.
+
+	   '''When we are unsure, we ask for help.''' Nobody knows
+	   everything, and nobody is expected to be perfect in the
+	   Ubuntu community.  Asking questions avoids many problems
+	   down the road, and so questions are encouraged. Those who
+	   are asked questions should be responsive and helpful.
+	   However, when asking a question, care must be taken to do
+	   so in an appropriate forum.
+
+	   '''Step down considerately.''' Members of every project
+	   come and go and Ubuntu is no different. When somebody
+	   leaves or disengages from the project, in whole or in part,
+	   we ask that they do so in a way that minimises disruption
+	   to the project. This means they should tell people they are
+	   leaving and take the proper steps to ensure that others can
+	   pick up where they left off.
+
+== Community Leadership ==
+
+We pride ourselves on building a productive, happy and agile community that
+can welcome new ideas in a complex field, and foster collaboration between
+groups with very different needs, interests and goals. We also recognize
+the vast experience and expertise each member of our community brings to
+the teams they choose to participate and collaborate with and as such each
+member of our community has the potential to stand in a leadership
+position.  Whether the leadership is one that is of appointment, election,
+or example we hold our leaders to an even higher standard, and as such each
+person signing the Code of Conduct needs to be familiar with those
+standards so that when in position of leadership can arrange the governance
+of the community to ensure that issues can be raised with leaders who are
+engaged, interested and competent to help resolve them.
+	
+
+Ubuntu Leadership The Ubuntu Code of Conduct describes the standard for all
+conduct in the Ubuntu community. Leaders however, are held to a higher
+standard. This addition to the Code of Conduct provides a set of guidelines
+which explains to all members the high standards of conduct that leaders in
+the Ubuntu community are expected to uphold.
+
+
+There are many, many people who hold leadership positions in Ubuntu - from
+the leaders of translation teams for specific languages, to those who hold
+positions on our Technical Board and Community Council. Our community
+depends on the drive and inspiration of many people who start LoCo teams or
+project teams focused on a particular end goal. We expect everyone who
+takes on a leadership role to meet this higher standard of conduct.
+
+	   '''Leadership By Example''' We expect leadership by
+	   example. In Ubuntu, leadership is not an award, right, or
+	   title; it is a privilege. A leader will only retain his or
+	   her position as long as he or she acts as a leader.  This
+	   means that they act with civility, respect, and trust in
+	   the ways described in the Code of Conduct. It also means
+	   that their contributions are sustained, significant, and
+	   reliable for the period that they lead.  Leaders in Ubuntu
+	   are not autocrats. Leaders in Ubuntu can not and will not
+	   stay leaders only because they got there first. Their role
+	   stems from shared recognition and respect from their team.
+
+	   '''Respecting Ubuntu Processes and Principles''' The Code
+	   of Conduct not only applies to community members, it
+	   applies to our leadership even more.  Leaders are expected
+	   to show more patience, respect, and civility than other
+	   members of the Ubuntu community. As leaders, they represent
+	   their team and, ultimately, the whole Ubuntu
+	   project. Leaders are expected to reflect the values that
+	   Ubuntu stands for and the behaviors that Ubuntu holds as
+	   paramount.  Additionally, they are to act in accordance
+	   with Ubuntu governance principles and structures and work
+	   within the Ubuntu system to effect change.
+
+	   '''Delegation''' A virtuoso is judged by their actions; a
+	   leader is judged by the actions of their team. A leader in
+	   Ubuntu knows when to ask for help and when to step
+	   back. Good leaders know when not to make a decision but to
+	   delegate it to their team. Of course, leadership does not
+	   mean that leaders delegate unpleasant work to others;
+	   instead, leaders strike a balance between their own hard
+	   work -- as they lead by example -- with that of delegation
+	   to others. A leader's foremost goal is ensuring that their
+	   team and its members succeed.
+
+	   '''Credit''' A good leader does not seek the limelight, but
+	   instead aims to congratulate their team for the work they
+	   do. While leaders are frequently more visible than their
+	   team, leaders in Ubuntu should use that visibility to
+	   highlight the great work of their team members and others.
+
+	   '''Conflicts of Interest''' A leader notices when they are
+	   conflicted and delegates decisions to others on their team
+	   or to other teams or governing councils. When in doubt,
+	   leaders publicly ask for a second opinion. Leaders also
+	   realize that perceived conflicts of interest are as
+	   important as real conflicts of interest and are cognizant
+	   of perceptions; they understand that their actions are as
+	   tainted by perceived conflicts as by real ones.  '''Keeping
+	   the Personal Personal''' No team should be an extension of
+	   its leader's personality.  A leader’s personal feelings and
+	   desires will diverge from the interest of their teams. When
+	   acting in their capacity as leaders, leaders should not
+	   ignore their own beliefs, feelings, and principles but must
+	   hold the interests of their team and the Ubuntu community
+	   above their own convictions. Leaders make difficult choices
+	   but are careful to act in the best interests of their
+	   communities. They work with established processes in the
+	   community and delegate decisions to others who can.
+
+	   '''Stepping Down''' The Ubuntu Code of Conduct discusses
+	   the importance of gracefully stepping down from a
+	   position. This is particularly important for leaders who
+	   are responsible for decisions or specific processes - for
+	   example, if your participation is needed to reach quorum in
+	   a team council.  If someone in a leadership role does not
+	   have time to fulfill their role temporarily, they should
+	   warn their team in advance. If an absence becomes extended,
+	   they should step down from their leadership position until
+	   they have more time to follow through. Similarly, leaders
+	   should step down gracefully -- as described in the Code of
+	   Conduct. When someone takes on a leadership position in
+	   Ubuntu, they are making a commitment to step down
+	   gracefully and to ensure that others on the team can easily
+	   continue.  
+
+	   Note that this is less important in cases where the
+	   leadership role does not "block" decisions while the person
+	   is absent. For example, if you are one of a team of 50 list
+	   moderators, then an extended absence does not mean you
+	   should necessarily step down, because decisions will not be
+	   blocked by you not being there. Conversely, if your
+	   leadership seat is essential for decisions, then extended
+	   absences should be very carefully managed, and you should
+	   consider stepping down or at least nominating a stand-in
+	   while you will be away.