summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJason Zaugg <jzaugg@gmail.com>2016-02-01 14:13:06 +1000
committerJason Zaugg <jzaugg@gmail.com>2016-02-01 14:13:06 +1000
commitd796f2c3a19a01cb4f08ca951014931b7d47b9bc (patch)
tree7ef62eb1fb9f9b54fa6d506fbf9ad88529a1654a
parent7a9e7c52dfc510f1f9fe55c4fbbe1e6a8b38878d (diff)
parent33113a6b6bb7970eee40884f08fbd95988f360b5 (diff)
downloadscala-d796f2c3a19a01cb4f08ca951014931b7d47b9bc.tar.gz
scala-d796f2c3a19a01cb4f08ca951014931b7d47b9bc.tar.bz2
scala-d796f2c3a19a01cb4f08ca951014931b7d47b9bc.zip
Merge pull request #4922 from SethTisue/fix-cla-links
fix broken links to Scala CLA
-rw-r--r--CONTRIBUTING.md2
-rw-r--r--README.md2
2 files changed, 2 insertions, 2 deletions
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index d01a71b9bd..462b5404b2 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -14,7 +14,7 @@ By the way, the team at Typesafe is: @adriaanm, @lrytz, @retronym, and @SethTisu
## What kind of PR are you submitting?
-Regardless of the nature of your Pull Request, we have to ask you to digitally sign the [Scala CLA](http://typesafe.com/contribute/cla/scala), to protect the OSS nature of the code base.
+Regardless of the nature of your Pull Request, we have to ask you to digitally sign the [Scala CLA](http://www.typesafe.com/contribute/cla/scala), to protect the OSS nature of the code base.
You don't need to submit separate PRs for 2.11.x, 2.12.x, and 2.13.x. Any changes accepted on one of these branches will, in time, be merged into the later branches.
diff --git a/README.md b/README.md
index d8af37a8f9..89454ee6fd 100644
--- a/README.md
+++ b/README.md
@@ -3,7 +3,7 @@ This is the official repository for the [Scala Programming Language](http://www.
# How to contribute
-To contribute to the Scala Standard Library, Scala Compiler and Scala Language Specification, please send us a [pull request](https://help.github.com/articles/using-pull-requests/#fork--pull) from your fork of this repository! We do have to ask you to sign the [Scala CLA](http://typesafe.com/contribute/cla/scala) before we can merge any of your work into our code base, to protect its open source nature.
+To contribute to the Scala Standard Library, Scala Compiler and Scala Language Specification, please send us a [pull request](https://help.github.com/articles/using-pull-requests/#fork--pull) from your fork of this repository! We do have to ask you to sign the [Scala CLA](http://www.typesafe.com/contribute/cla/scala) before we can merge any of your work into our code base, to protect its open source nature.
For more information on building and developing the core of Scala, read on!