Skip to content

Commit

Permalink
updating link to code of conduct in org repository
Browse files Browse the repository at this point in the history
Signed-off-by: Vanessa Sochat <vsochat@stanford.edu>
  • Loading branch information
vsoch committed Feb 28, 2019
1 parent edc719f commit 51b91fe
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 8 deletions.
12 changes: 5 additions & 7 deletions CONTRIBUTING.md
Expand Up @@ -7,7 +7,7 @@ The content of this repository is licensed under the [Apache License, Version 2.

## Code of Conduct

Participation in the Open Container community is governed by [Open Container Code of Conduct][code-of-conduct].
Participation in the Open Container community is governed by the [OCI Code of Conduct][code-of-conduct].

## Meetings

Expand All @@ -27,12 +27,9 @@ OCI discussion happens on #opencontainers on [Freenode][] ([logs][irc-logs]).

## Git

### Security issues
### Security

If you are reporting a security issue, do not create an issue or file a pull
request on GitHub. Instead, disclose the issue responsibly by sending an email
to security@opencontainers.org (which is inhabited only by the maintainers of
the various OCI projects).
If you wish to report a security issue, please see the protocol under [security][security].

### Pull requests are always welcome

Expand Down Expand Up @@ -139,12 +136,13 @@ using your real name (sorry, no pseudonyms or anonymous contributions.)

You can add the sign off when creating the git commit via `git commit -s`.

[code-of-conduct]: https://github.com/opencontainers/tob/blob/d2f9d68c1332870e40693fe077d311e0742bc73d/code-of-conduct.md
[code-of-conduct]: https://github.com/opencontainers/org/blob/master/CODE_OF_CONDUCT.md
[developercertificate.org]: http://developercertificate.org/
[Freenode]: https://freenode.net/
[irc-logs]: http://ircbot.wl.linuxfoundation.org/eavesdrop/%23opencontainers/
[mailing-list]: https://groups.google.com/a/opencontainers.org/forum/#!forum/dev
[meeting.ics]: https://github.com/opencontainers/runtime-spec/blob/master/meeting.ics
[minutes]: http://ircbot.wl.linuxfoundation.org/meetings/opencontainers/
[rfc5545]: https://tools.ietf.org/html/rfc5545
[security]: https://github.com/opencontainers/org/blob/master/security
[UberConference]: https://www.uberconference.com/opencontainers
2 changes: 1 addition & 1 deletion README.md
Expand Up @@ -35,6 +35,6 @@ Responsible disclosure for security issues is discussed [here](CONTRIBUTING.md#s
You can subscribe and browse the mailing list on [Google Groups][mailing-list].

[charter]: https://www.opencontainers.org/about/governance
[code-of-conduct]: https://github.com/opencontainers/tob/blob/master/code-of-conduct.md
[code-of-conduct]: https://github.com/opencontainers/org/blob/master/CODE_OF_CONDUCT.md
[issues]: https://github.com/opencontainers/distribution-spec/issues
[mailing-list]: https://groups.google.com/a/opencontainers.org/forum/#!forum/dev

0 comments on commit 51b91fe

Please sign in to comment.