summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
-rw-r--r--CONTRIBUTING.md25
-rw-r--r--README.md4
2 files changed, 14 insertions, 15 deletions
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 152bb318c..3f3ab4d5f 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -3,19 +3,17 @@ Want to contribute? Great! First, read this page.
### Before you contribute
Before we can use your code, you must sign the
-[Google Individual Contributor License Agreement]
-(https://cla.developers.google.com/about/google-individual)
-(CLA), which you can do online. The CLA is necessary mainly because you own the
-copyright to your changes, even after your contribution becomes part of our
-codebase, so we need your permission to use and distribute your code. We also
-need to be sure of various other things—for instance that you'll tell us if you
-know that your code infringes on other people's patents. You don't have to sign
-the CLA until after you've submitted your code for review and a member has
-approved it, but you must do it before we can put your code into our codebase.
-Before you start working on a larger contribution, you should get in touch with
-us first through the issue tracker with your idea so that we can help out and
-possibly guide you. Coordinating up front makes it much easier to avoid
-frustration later on.
+[Google Individual Contributor License Agreement][gcla] (CLA), which you can do
+online. The CLA is necessary mainly because you own the copyright to your
+changes, even after your contribution becomes part of our codebase, so we need
+your permission to use and distribute your code. We also need to be sure of
+various other things—for instance that you'll tell us if you know that your
+code infringes on other people's patents. You don't have to sign the CLA until
+after you've submitted your code for review and a member has approved it, but
+you must do it before we can put your code into our codebase. Before you start
+working on a larger contribution, you should get in touch with us first through
+the issue tracker with your idea so that we can help out and possibly guide you.
+Coordinating up front makes it much easier to avoid frustration later on.
### Coding Guidelines
All code should conform to the [Go style guidelines][gostyle].
@@ -70,4 +68,5 @@ the one above, the
[Software Grant and Corporate Contributor License Agreement]
(https://cla.developers.google.com/about/google-corporate).
+[gcla]: https://cla.developers.google.com/about/google-individual
[gostyle]: https://github.com/golang/go/wiki/CodeReviewComments
diff --git a/README.md b/README.md
index dc500d445..7fb9acd79 100644
--- a/README.md
+++ b/README.md
@@ -394,7 +394,7 @@ here when available.
## Community
-Join the [gvisor-discuss mailing list][gvisor-discuss-list] to discuss all things
+Join the [gvisor-users mailing list][gvisor-users-list] to discuss all things
gVisor.
Sensitive security-related questions and comments can be sent to the private
@@ -412,7 +412,7 @@ See [Contributing.md](CONTRIBUTING.md).
[docker]: https://www.docker.com
[docker-storage-driver]: https://docs.docker.com/engine/reference/commandline/dockerd/#daemon-storage-driver
[git]: https://git-scm.com
-[gvisor-discuss-list]: https://groups.google.com/forum/#!forum/gvisor-users
+[gvisor-users-list]: https://groups.google.com/forum/#!forum/gvisor-users
[gvisor-security-list]: https://groups.google.com/forum/#!forum/gvisor-security
[kvm]: https://www.linux-kvm.org
[netstack]: https://github.com/google/netstack