docs: update the code of conduct based on latest contributor covenant (#17)

This PR updates the code of conduct to a modified version of the latest
"Contributor Covenant." It also changes the README.md to reflect
the current active social channels.

Author: mgechev

CODE_OF_CONDUCT.md

@@ -1,12 +1,71 @@
-# Contributor Code of Conduct
-## Version 0.3b-angular
+# Contributor Covenant Code of Conduct
 
-As contributors and maintainers of the Angular project, we pledge to respect everyone who contributes by posting issues, updating documentation, submitting pull requests, providing feedback in comments, and any other activities.
+## Our Pledge
 
-Communication through any of Angular's channels (GitHub, Gitter, IRC, mailing lists, Google+, Twitter, etc.) must be constructive and never resort to personal attacks, trolling, public or private harassment, insults, or other unprofessional conduct.
+In the interest of fostering an safe and welcoming environment, we as
+the Angular team pledge to make participation in our project and
+our community a harassment-free experience for everyone, regardless of age, body
+size, disability, ethnicity, sex characteristics, gender identity, gender expression,
+level of experience, education, socio-economic status, nationality, personal
+appearance, race, religion, or sexual identity and orientation.
 
-We promise to extend courtesy and respect to everyone involved in this project regardless of gender, gender identity, sexual orientation, disability, age, race, ethnicity, religion, or level of experience. We expect anyone contributing to the Angular project to do the same.
+## Our Standards
 
-If any member of the community violates this code of conduct, the maintainers of the Angular project may take action, removing issues, comments, and PRs or blocking accounts as deemed appropriate.
+Examples of behavior that contributes to creating a positive environment
+include:
 
-If you are subject to or witness unacceptable behavior, or have any other concerns, please email us at [[email protected]](mailto:[email protected]).
+* Use welcoming and inclusive language
+* Respect each other
+* Provide and gracefully accept constructive criticism
+* Show empathy towards other community members
+
+Examples of unacceptable behavior by participants include:
+
+* Trolling, insulting/derogatory comments, and personal or political attacks
+* Public or private harassment
+* Publishing others' private information, such as a physical or electronic
+  address, without explicit permission
+* The use of sexualized language or imagery
+* Unwelcome sexual attention or advances
+* Other conduct which could reasonably be considered inappropriate in a
+  professional setting
+
+## Our Responsibilities
+
+Angular team are responsible for clarifying the standards of acceptable
+behavior and are expected to take appropriate and fair corrective action in
+response to any instances of unacceptable behavior.
+
+Angular team have the right and responsibility to remove, edit, or
+reject comments, commits, code, wiki edits, issues, and other contributions
+that are not aligned to this Code of Conduct, and to ban temporarily or
+permanently any contributor for other behaviors that they deem inappropriate,
+threatening, offensive, or harmful.
+
+## Scope
+
+This Code of Conduct applies to all Angular communication channels - online or in person,
+and it also applies when an individual is representing the project or its community in
+public spaces. Examples of representing a project or community include using an official
+project e-mail address, posting via an official social media account, or acting
+as an appointed representative at an online or offline event. Representation of
+a project may be further defined and clarified by project maintainers.
+
+## Enforcement
+
+Instances of abusive, harassing, or otherwise unacceptable behavior may be
+reported by contacting the Angular team at [email protected]. All
+complaints will be reviewed and investigated and will result in a response that
+is deemed necessary and appropriate to the circumstances. The Angular team
+will maintain confidentiality with regard to the reporter of an incident.
+Enforcement may result in an indefinite ban from all official Angular communication
+channels, or other actions as deemed appropriate by the Angular team.
+
+Angular maintainers who do not follow or enforce the Code of Conduct in good
+faith may face temporary or permanent repercussions as determined by other
+members of the project's leadership.
+
+## Attribution
+
+This Code of Conduct is adapted from the [Contributor Covenant](https://www.contributor-covenant.org), version 1.4,
+available at https://www.contributor-covenant.org/version/1/4/code-of-conduct.html

README.md

@@ -2,22 +2,16 @@
 
 See [CODE_OF_CONDUCT.md](https://github.com/angular/code-of-conduct/blob/master/CODE_OF_CONDUCT.md).
 
-This code of conduct applies to all of the projects under the [Angular organization on GitHub](https://github.com/orgs/angular/) and the Angular community at large (IRC, mailing lists, Google+, Twitter, etc.).
-
-See the [contributing guidelines](https://github.com/angular/angular.js/blob/master/CONTRIBUTING.md) and the [tutorial on building angular](http://docs.angularjs.org/misc/contribute) for technical details of contributing to AngularJS or its satellite projects.
+This code of conduct applies to all of the projects under the [Angular organization on GitHub](https://github.com/orgs/angular/) and the Angular community at large (mailing lists, Twitter, YouTube etc.).
 
+See the [contributing guidelines](https://github.com/angular/angular/blob/master/CONTRIBUTING.md) for technical details of contributing to Angular or its satellite projects.
 
 ## Events
 
-If you are running an Angular meetup, conference, user group, or other type of event, we encourage you to adopt and provide an appropriate code of conduct.
-The [confcodeofconduct.com](http://confcodeofconduct.com/) template is a good starting point.
-You should also provide contact information for atttendees to get help or report a violation.
-
-For more on adopting a code of conduct, see [Ashe Dryden's FAQ](http://ashedryden.com/blog/codes-of-conduct-101-faq).
+If you are running an Angular meetup, conference, user group, or other type of event, we encourage you to adopt and provide an appropriate code of conduct. The [confcodeofconduct.com](http://confcodeofconduct.com/) template is a good starting point.
 
+You should also provide contact information for attendees to get help or report a violation. For more on adopting a code of conduct, see [Ashe Dryden's FAQ](http://ashedryden.com/blog/codes-of-conduct-101-faq).
 
 ## Credits
 
-Based on the [Contributor Covenant](https://github.com/Bantik/contributor_covenant) by [Coraline Ada Ehmke (Bantik)](https://github.com/Bantik).
-
-If you have suggestions to improve this code of conduct, please submit an issue or PR.
+Based on the [Contributor Covenant](https://github.com/EthicalSource/contributor_covenant). If you have suggestions to improve this code of conduct, please submit an issue or PR.