Skip to content

Commit fae5382

Browse files
authored
Merge pull request #572 from SethTisue/more-version-bumps
2.11 -> 2.12 in some more places
2 parents b287dc0 + f5ebcc2 commit fae5382

File tree

4 files changed

+5
-5
lines changed

4 files changed

+5
-5
lines changed

_includes/footer.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<li><a href="http://www.scala-lang.org/api/current/index.html#package">API</a></li>
88
<li><a href="http://docs.scala-lang.org/overviews/">Overviews/Guides</a></li>
99
<li><a href="http://docs.scala-lang.org/tutorials/">Tutorials</a></li>
10-
<li><a href="{{ site.baseurl }}/files/archive/spec/2.11/">Language Specification</a></li>
10+
<li><a href="{{ site.baseurl }}/files/archive/spec/2.12/">Language Specification</a></li>
1111
</ul>
1212
<ul>
1313
<li><h5>Download</h5></li>

_layouts/frontpage.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ <h2 style="font-weight: 700;">Object-Oriented Meets Functional</h2>
5959
<p class="getting-started"><a href="http://www.scala-lang.org/api/current/"><b>Current API Docs</b></a></p>
6060
<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>
6161
<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>
62-
<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>
62+
<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>
6363
</div>
6464
</div>
6565
</div>

contribute/hacker-guide.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ This guide is intended to help you get from an idea of fixing a bug or implement
88

99
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.
1010

11-
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).
11+
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).
1212

1313
## The Running Example
1414

@@ -336,7 +336,7 @@ Let's go into each of these points in more detail.
336336
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.
337337
There are two things you should know here:
338338

339-
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.
339+
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.
340340
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`.
341341

342342
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.

documentation/index.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ title: Documentation
2121
<p>Dive straight into the API.</p>
2222
</div>
2323
<div class="span4 doc-block">
24-
<h3><a href="{{ site.baseurl }}/files/archive/spec/2.11/">Specification</a></h3>
24+
<h3><a href="{{ site.baseurl }}/files/archive/spec/2.12/">Specification</a></h3>
2525
<p>Get an in-depth overview of the language.</p>
2626
</div>
2727
</div>

0 commit comments

Comments
 (0)