Merge branch 'master' into remove-links-to-jira

Author: propensive

contribute/codereviews.md

@@ -6,7 +6,7 @@ includeTOC: true
 ---
 ## Code Review Contributions
 
-In addition to [bug fixing](/contribute/guide/), you can help us review
+In addition to [bug fixing](/contribute/guide.html), you can help us review
 [waiting pull requests](#pull-requests-awaiting-comment).
 This is also a good (and recommended) way to get to know the feel of
 the bug-fixing and submissions process before jumping in with your
@@ -51,4 +51,4 @@ own pull requests.
 </div>
 </div>
 
-Also note that the [Tools contributions](/contribute/tools/) page has more projects that will generate pull requests.
+Also note that the [Tools contributions](/contribute/tools.html) page has more projects that will generate pull requests.

contribute/guide.md

@@ -61,11 +61,11 @@ This is the impatient developer's checklist for the steps to submit a bug-fix pu
 3. [Fork the Scala repository](/contribute/hacker-guide.html#fork) and clone your fork (if you haven't already).
 4. [Create a feature branch](/contribute/hacker-guide.html#branch) to work on: use the branch name `issue/NNNN` where NNNN is the GitHub issue number.
 5. [Fix the bug, or implement the new small feature](/contribute/hacker-guide.html#implement), include new tests (yes, for bug fixes too).
-6. [Test, rinse](/contribute/hacker-guide.html#test) and [test some more](/contribute/partest-guide/) until [all the tests pass](/contribute/hacker-guide.html#verify).
+6. [Test, rinse](/contribute/hacker-guide.html#test) and [test some more](/contribute/partest-guide.html) until [all the tests pass](/contribute/hacker-guide.html#verify).
 7. [Commit your changes](/contribute/hacker-guide.html#commit) to your feature branch in your fork. Please choose your commit message based on the [Git Hygiene](https://github.com/scala/scala#user-content-git-hygiene) section of the Scala project README.
 8. If necessary [re-write git history](http://git-scm.com/book/en/Git-Branching-Rebasing) so that [commits are organized by major steps to the fix/feature](
 https://github.com/scala/scala#git-hygiene). For bug fixes, a single commit is requested, for features several commits may be desirable (but each separate commit must compile and pass all tests)
-9. [Submit a pull request](./hacker-guide.html#submit) following the [Scala project pull-request guidelines](http://docs.scala-lang.org/scala/pull-request-policy.html).
+9. [Submit a pull request](./hacker-guide.html#submit).
 10. [Work with a reviewer](https://github.com/scala/scala#reviewing) to [get your pull request merged in](/contribute/hacker-guide.html#review).
 11. Celebrate!
 

contribute/hacker-guide.md

@@ -30,7 +30,7 @@ Sometimes it's appealing to hack alone and not to have to interact with others o
 this might not be the very best idea. There are people in the Scala community who have spent years accumulating knowledge about Scala libraries and internals. They might provide
 unique insights and, what's even better, direct assistance in their areas, so it is not only advantageous, but recommended to communicate with the community about your new patch.
 
-Typically bug fixes and new features start out as an idea or an experiment posted on one of [our mailing lists]({{ site.baseurl }}/community/index.html#mailing-lists) to find out how people feel
+Typically bug fixes and new features start out as an idea or an experiment posted on one of [our mailing lists]({{ site.baseurl }}/community/index.html#forums--mailing-lists) to find out how people feel
 about things you want to implement. People proficient in certain areas of Scala usually monitor mailing lists, so you'll often get some help
 by simply posting a message. But the most efficient way to connect is to cc your message to one of the people responsible for maintaining the aspect of Scala which you wish to contribute to.
 

contribute/scala-standard-library-api-documentation.md

@@ -77,7 +77,7 @@ component so that they show up in the correct issue filters.
 Please familiarize yourself with the following before contributing
 new API documentation to save time, effort, mistakes and repetition.
 
-* [Forking the Repo](./hacker-guide.html#set-up) - follow the setup steps through
+* [Forking the Repo](./hacker-guide.html#2-set-up) - follow the setup steps through
   the Branch section. If providing new documentation related to an existing GitHub issue, use `issue/NNNN`
   or `ticket/NNNN` as the guide states. If providing API documentation with no associated
   GitHub issue, use `scaladoc/xxxx` instead.

contribute/tools.md

@@ -33,11 +33,11 @@ projects:
   - title: DBuild
     description: Multi-project build tool.
     icon: https://avatars3.githubusercontent.com/u/784923?v=3&s=200
-    link: https://github.com/typesafehub/dbuild
-    homeLink: http://typesafehub.github.io/dbuild
-    issuesLink: https://github.com/typesafehub/dbuild/issues
-    readmeLink: https://github.com/typesafehub/dbuild/blob/master/README.md
-    contributingLink: https://github.com/typesafehub/dbuild/blob/master/README.md#get-involved
+    link: https://github.com/lightbend/dbuild
+    homeLink: http://lightbend.github.io/dbuild
+    issuesLink: https://github.com/lightbend/dbuild/issues
+    readmeLink: https://github.com/lightbend/dbuild/blob/master/README.md
+    contributingLink: https://github.com/lightbend/dbuild/blob/master/README.md#get-involved
   - title: Partest
     description: Scala Compiler/Library Testing
     icon: https://avatars1.githubusercontent.com/u/57059?v=3&s=200
@@ -52,8 +52,8 @@ projects:
     link: https://github.com/ensime/ensime-server
     homeLink: http://ensime.github.io/
     issuesLink: https://github.com/ensime/ensime-server/issues
-    readmeLink: https://github.com/ensime/ensime-server/blob/2.0/README.md
-    contributingLink: https://ensime.github.io/contributing/
+    readmeLink: http://ensime.github.io/
+    contributingLink: http://ensime.github.io/server/contributing/
   - title: Scoverage
     description: Scala code coverage tool
     icon: https://avatars1.githubusercontent.com/u/5998302?v=3&s=200