Skip to content

2.11 -> 2.12 in some more places #572

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Dec 7, 2016
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion _includes/footer.html
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<li><a href="http://www.scala-lang.org/api/current/index.html#package">API</a></li>
<li><a href="http://docs.scala-lang.org/overviews/">Overviews/Guides</a></li>
<li><a href="http://docs.scala-lang.org/tutorials/">Tutorials</a></li>
<li><a href="{{ site.baseurl }}/files/archive/spec/2.11/">Language Specification</a></li>
<li><a href="{{ site.baseurl }}/files/archive/spec/2.12/">Language Specification</a></li>
</ul>
<ul>
<li><h5>Download</h5></li>
Expand Down
2 changes: 1 addition & 1 deletion _layouts/frontpage.html
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ <h2 style="font-weight: 700;">Object-Oriented Meets Functional</h2>
<p class="getting-started"><a href="http://www.scala-lang.org/api/current/"><b>Current API Docs</b></a></p>
<p class="dev-releases"><img src="{{ site.baseurl }}/resources/img/list.png" alt="list icon" /><a href="{{ site.baseurl }}/documentation/api.html">&nbsp;API Docs (other versions)</a></p>
<p class="dev-releases"><img src="{{ site.baseurl }}/resources/img/books.png" alt="books icon" /><a href="{{ site.baseurl }}/documentation/">&nbsp;Scala Documentation</a></p>
<p class="all-releases"><img src="{{ site.baseurl }}/resources/img/books.png" alt="books icon" /><a href="{{ site.baseurl }}/files/archive/spec/2.11/">&nbsp;Language Specification</a></p>
<p class="all-releases"><img src="{{ site.baseurl }}/resources/img/books.png" alt="books icon" /><a href="{{ site.baseurl }}/files/archive/spec/2.12/">&nbsp;Language Specification</a></p>
</div>
</div>
</div>
Expand Down
4 changes: 2 additions & 2 deletions contribute/hacker-guide.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ This guide is intended to help you get from an idea of fixing a bug or implement

This guide covers the entire process, from the conception of your idea or bugfix to the point where it is merged into Scala. Throughout, we will use a running example of an idea or bugfix one might wish to contribute.

Other good starting points for first-time contributors include the [Scala README](https://github.com/scala/scala#get-in-touch) and [contributor's guidelines](https://github.com/scala/scala/blob/2.11.x/CONTRIBUTING.md).
Other good starting points for first-time contributors include the [Scala README](https://github.com/scala/scala#get-in-touch) and [contributor's guidelines](https://github.com/scala/scala/blob/2.12.x/CONTRIBUTING.md).

## The Running Example

Expand Down Expand Up @@ -336,7 +336,7 @@ Let's go into each of these points in more detail.
The [Git Basics](http://git-scm.com/book/en/Git-Basics) chapter in the Git online book covers most of the basic workflow during this stage.
There are two things you should know here:

1. Commit messages are often the only way to understand the intentions of authors of code written a few years ago. Thus, writing a quality is of utmost importance. The more context you provide for the change you've introduced, the larger the chance that some future maintainer understand your intentions. Consult [the pull request policies](https://github.com/scala/scala/blob/2.11.x/CONTRIBUTING.md) for more information about the desired style of your commits.
1. Commit messages are often the only way to understand the intentions of authors of code written a few years ago. Thus, writing a quality is of utmost importance. The more context you provide for the change you've introduced, the larger the chance that some future maintainer understand your intentions. Consult [the pull request policies](https://github.com/scala/scala/blob/2.12.x/CONTRIBUTING.md) for more information about the desired style of your commits.
2. Keeping Scala's git history clean is also important. Therefore we won't accept pull requests for bug fixes that have more than one commit. For features, it is okay to have several commits, but all tests need to pass after every single commit. To clean up your commit structure, you want to [rewrite history](http://git-scm.com/book/en/Git-Branching-Rebasing) using `git rebase` so that your commits are against the latest revision of `master`.

Once you are satisfied with your work, synced with `master` and cleaned up your commits you are ready to submit a patch to the central Scala repository. Before proceeding make sure you have pushed all of your local changes to your fork on GitHub.
Expand Down
2 changes: 1 addition & 1 deletion documentation/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ title: Documentation
<p>Dive straight into the API.</p>
</div>
<div class="span4 doc-block">
<h3><a href="{{ site.baseurl }}/files/archive/spec/2.11/">Specification</a></h3>
<h3><a href="{{ site.baseurl }}/files/archive/spec/2.12/">Specification</a></h3>
<p>Get an in-depth overview of the language.</p>
</div>
</div>
Expand Down