Merge branch 'master' into master

README.md

@@ -19,4 +19,3 @@ We're always looking for new localizations of Contributor Covenant and are thank
 ## Examples of Projects Using the Contributor Covenant
 
 This code of conduct has been adopted by [thousands of open source projects](https://github.com/search?l=markdown&q=%22contributor+covenant%22&ref=searchresults&type=Code&utf8=✓). For examples, see [our adopters page](http://contributor-covenant.org/adopters/).
-

adopters/index.html

@@ -125,6 +125,7 @@ <h3>A Sample of Projects Adopting the Contributor Covenant</h3>
 			<li><a href="https://github.com/patternfly/patternfly">PatternFly</a></li>
 			<li><a href="https://github.com/PerfectlySoft/Perfect">Perfect</a></li>
 			<li><a href="https://github.com/pexip/pexkit-sdk">Pexip - Video Conferencing SDK</a></li>
+			<li><a href="https://github.com/pivpn/pivpn">PiVPN</a></li>
 			<li><a href="https://github.com/pixijs/pixi-haxe">Pixi.js Haxe Externs</a></li>
 			<li><a href="http://vectorpoem.com/playscii">Playscii</a></li>
 			<li><a href="https://github.com/bruceadams/pmap">pmap</a></li>
@@ -175,6 +176,7 @@ <h3>A Sample of Projects Adopting the Contributor Covenant</h3>
 			<li><a href="https://github.com/virtapi/">VirtAPI-Stack</a></li>
 			<li><a href="https://github.com/Microsoft/visualfsharp">Visual F#</a></li>
 			<li><a href="https://github.com/voltrb/volt">Volt.rb</a></li>
+			<li><a href="https://voxpupuli.org/">Vox Pupuli</a></li>
 			<li><a href="https://github.com/vuejs/vue">Vue.js</a></li>
 			<li><a href="https://gitlab.com/cpp.cabrera/wai-request-spec">WAI-request-spec</a></li>
 			<li><a href="https://github.com/adireddy/waud">Waud</a></li>

i18n/index.html

@@ -150,6 +150,8 @@ <h3>Contributor Covenant Translations</h3>
         </tr>
       </tbody>
     </table>
+    <p>We're looking for new localizations of Contributor Covenant and are thankful to the volunteers who spend their time on translations. Now, thanks to @wfdd, there is a <a href="version/1/4/.index-template.html">Pandoc HTML generation template</a> for v1.4 of the Contributor Covenant.</p>
+
     <p>The Contributor Covenant uses semantic versioning for revisions so all URLs are permanent. Previous versions are available here: <a href="/version/1/0/0/">1.0</a>, <a href="/version/1/1/0/">1.1</a>, <a href="/version/1/2/0/">1.2</a>, and <a href="/version/1/3/0/">1.3</a>.</p>
   </section>
 

index.html

@@ -32,7 +32,7 @@ <h1>Contributor Covenant</h1>
 	</nav>
 
 	<section id="preamble">
-		<p>Open Source has always been a foundation of the Internet, and with the advent of social open source networks this is more true than ever. But free, libre, and open source projects suffer from a startling lack of diversity, with dramatically low representation of women, people of color, and other marginalized populations.</p>
+		<p>Open Source has always been a foundation of the Internet, and with the advent of social open source networks this is more true than ever. But free, libre, and open source projects suffer from a startling lack of diversity, with dramatically low representation by women, people of color, and other margi
 		<p>Part of this problem lies with the very structure of some projects: the use of insensitive language, thoughtless use of pronouns, assumptions of gender, and even sexualized or culturally insensitive names.</p>
 		<p>Marginalized people also suffer some of the unintended consequences of dogmatic insistence on meritocratic principles of governance. Studies have shown that organizational cultures that value meritocracy <a href="http://asq.sagepub.com/content/55/4/543.short" target="_blank">often result in greater inequality</a>. People with "merit" are often <a href="https://modelviewculture.com/pieces/the-dehumanizing-myth-of-the-meritocracy" target="_blank">excused for their bad behavior</a> in public spaces based on the value of their technical contributions. Meritocracy also naively assumes a level playing field, in which everyone has access to the same resources, free time, and common life experiences to draw upon. These factors and more make contributing to open source a daunting prospect for many people, especially women and other underrepresented people. (For more critical analysis of meritocracy, refer to <a href="http://geekfeminism.wikia.com/wiki/Meritocracy" target="_blank">this entry</a> on the Geek Feminism wiki.)</p>
 	</section>
@@ -74,11 +74,14 @@ <h3>Using the Contributor Covenant</h3>
 		<blockquote>Please note that this project is released with a Contributor Code of Conduct. By participating in this project you agree to abide by its terms.</blockquote>
  		<p>You may also use the permalinks given above to reference from your project home page.</p>
  		<p><em class="important">Important!</em> You must add a contact method to the placeholder in the document so that people know how to report violations.</p>
-    <p><em>The Contributor Covenant is released under an <a href="https://github.com/ContributorCovenant/contributor_covenant/blob/master/LICENSE">MIT license</a>, which requires that the copyright notice and permission notice be included.</em></p>
+		<p><em>The Contributor Covenant is released under the <a href="https://github.com/ContributorCovenant/contributor_covenant/blob/master/LICENSE">Creative Commons Attribution 4.0 International Public License</a>, which requires that attribution be included.</em></p>
 	</section>
 
 	<section id="enforcement">
 		<h3>Enforcing the Contributor Covenant</h3>
+
+		<p>"Morality cannot be legislated, but behavior can be regulated." (Dr. Martin Luther King, Jr.)</p>
+
 		<p><b>Do not</b> simply add the Contributor Covenant to your project and assume that any problems with civility, harassment, or discrimination will be solved. As a project maintainer you must be committed to enforcing the code of conduct. A code of conduct without enforcement sends a false signal that your project is welcoming and inclusive, and can create a dangerous situation for marginalized people who participate. Adding the Contributor Covenant to a project places responsibility on the project team that must not be taken lightly.</p>
 
 		<p>Before adopting the Contributor Covenant take the time to discuss and decide how to deal with problems as they emerge. Document the policy and procedure for enforcement, and add it to your README or in another visible, appropriate place. Consider if your project team has the willingness and maturity to follow through on your enforcement procedures.</p>
@@ -154,7 +157,8 @@ <h3>How to Contribute</h3>
 	</section>
 
 	<footer id="footer">
-		The Contributor Covenant was created by <a href="http://where.coraline.codes/" title="Coraline Ada Ehmke">Coraline Ada Ehmke</a> in 2014 and is released under an <a href="https://github.com/ContributorCovenant/contributor_covenant/blob/master/LICENSE">MIT license</a>.<br>
+		The Contributor Covenant was created by <a href="http://where.coraline.codes/" title="Coraline Ada Ehmke">Coraline Ada Ehmke</a> in 2014 and is released under the <a href="https://github.com/ContributorCovenant/contributor_covenant/blob/master/LICENSE">Creative Commons Attribution 4.0 International Public License</a>.<br>
+
 		Support this and other diversity initiatives through <a href="https://www.patreon.com/coraline" title="Patreon">our Patreon</a>.
 	</footer>