Merge lp:~mako/ubuntu-codeofconduct/license into lp:ubuntu-codeofconduct

[Benjamin Mako Hill]

Adds a mention to the bottom of both codes about the license status of the files.

There may be better places to note this (e.g., in a separate COPYING file) but we also want to make sure that the changes is reflected on the website?

I don't have a strong feeling. Previous version of the page on the Ubuntu website made the license clear and, as a result, many many other projects adopted our code. The current version makes it impossible to figure this out so we should fix this, one way or another.

Unmerged revisions

15. By Benjamin Mako Hill on 2012-07-06

added a paragraph to show that both the codes of conduct are released
under CC BY-SA

=== modified file 'CodeOfConduct.txt'
--- CodeOfConduct.txt	2011-03-07 13:20:46 +0000
+++ CodeOfConduct.txt	2012-07-06 15:42:28 +0000
@@ -87,3 +87,8 @@
 issues can be raised with leaders who are engaged, interested and
 competent to help resolve them.
 
+'''The Ubuntu Code of Conduct is licensed under the
+[[http://creativecommons.org/licenses/by-sa/3.0/|Creative Commons
+Attribution-Share Alike 3.0 license]]. You may re-use it for your own
+project, and modify it as you wish, just please allow others to use your
+modifications and give credit to the Ubuntu Project!'''

=== modified file 'LeadershipCodeOfConduct.txt'
--- LeadershipCodeOfConduct.txt	2010-11-25 17:47:41 +0000
+++ LeadershipCodeOfConduct.txt	2012-07-06 15:42:28 +0000
@@ -102,3 +102,9 @@
 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.
+
+'''The Ubuntu Leadership Code of Conduct is licensed under the
+[[http://creativecommons.org/licenses/by-sa/3.0/|Creative Commons
+Attribution-Share Alike 3.0 license]]. You may re-use it for your own
+project, and modify it as you wish, just please allow others to use your
+modifications and give credit to the Ubuntu Project!'''