Merge branch 'master' into dev2019

Author: TimidRobot

CODE_OF_CONDUCT.md

@@ -8,6 +8,6 @@ project and all other Creative Commons open source projects are governed by our
 
 For a history of updates, see the [page history here][updates].
 
-[code_of_conduct]:https://creativecommons.github.io/community/code-of-conduct/
-[reporting_guide]:https://creativecommons.github.io/community/code-of-conduct/enforcement/
-[updates]:https://github.com/creativecommons/creativecommons.github.io-source/commits/master/content/community/code-of-conduct/contents.lr
+[code_of_conduct]:https://opensource.creativecommons.org/community/code-of-conduct/
+[reporting_guide]:https://opensource.creativecommons.org/community/code-of-conduct/enforcement/
+[updates]:https://github.com/creativecommons/creativecommons.github.io-source/commits/master/content/community/code-of-conduct/contents.lr

CONTRIBUTING.md

@@ -8,7 +8,7 @@ a set of guidelines to help you contribute to this project.
 By participating in this project, you are expected to uphold our [Code of
 Conduct][code_of_conduct].
 
-[code_of_conduct]:https://creativecommons.github.io/community/code-of-conduct/
+[code_of_conduct]:https://opensource.creativecommons.org/community/code-of-conduct/
 
 ## Project Documentation
 
@@ -22,10 +22,10 @@ you'd like to see documented.
 Please follow the processes in our general [Contributing Code][contributing]
 guidelines on the Creative Common Open Source website.
 
-[contributing]:https://creativecommons.github.io/contributing-code/
+[contributing]:https://opensource.creativecommons.org/contributing-code/
 
 ## Questions or Thoughts?
 
 Talk to us on [one of our community forums][community].
 
-[community]:https://creativecommons.github.io/community/
+[community]:https://opensource.creativecommons.org/community/

README.md

@@ -1,8 +1,8 @@
 # creativecommons.org
 
 Website parent project ([When we share, everyone wins - Creative
-Commons][ccorg]), legalcode and translations, and primary GitHub repository for
-public issues
+Commons][ccorg]), legalcode and translations, and GitHub Issues for public
+help and support
 
 [ccorg]: https://creativecommons.org/
 
@@ -18,6 +18,24 @@ This repostory is currently for:
 [issues]: https://github.com/creativecommons/creativecommons.org/issues
 
 
+## Code of Conduct
+
+[`CODE_OF_CONDUCT.md`](CODE_OF_CONDUCT.md):
+> The Creative Commons team is committed to fostering a welcoming community.
+> This project and all other Creative Commons open source projects are governed
+> by our [Code of Conduct][code_of_conduct]. Please report unacceptable
+> behavior to [conduct@creativecommons.org](mailto:conduct@creativecommons.org)
+> per our [reporting guidelines][reporting_guide].
+
+[code_of_conduct]:https://opensource.creativecommons.org/community/code-of-conduct/
+[reporting_guide]:https://opensource.creativecommons.org/community/code-of-conduct/enforcement/
+
+
+## Contributing
+
+See [`CONTRIBUTING.md`](CONTRIBUTING.md).
+
+
 ## Issues
 
 This repository's [Issues][issues] is also the primary location for public help