Movatterモバイル変換


[0]ホーム

URL:


Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Sign up
Appearance settings

Commit2cc2d3b

Browse files
committed
Merge pull requestscala#468 from SethTisue/front-page-tweaks
front page tweaks
2 parentsacb75a1 +e7202fe commit2cc2d3b

File tree

3 files changed

+11
-12
lines changed

3 files changed

+11
-12
lines changed

‎_includes/footerbar.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
</div>
3030
<div class="container copyright">
3131
<p>
32-
Copyright &copy; 2011-2013 EPFL. All rights reserved.
32+
Copyright &copy; 2011-2015 EPFL. All rights reserved.
3333
<a href="https://github.com/scala/scala.github.com/commits/gh-pages.atom"><img align="right" height="20px" width="20px" src="{{ site.baseurl }}/resources/images/rss.png" alt="RSS feed of updates to the github repo hosting this site"></a>
3434
</p>
3535
</div>

‎_includes/frontpage-content.txt

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -30,38 +30,37 @@
3030

3131
<div class="span8">
3232

33-
<h2>We’re growing…</h2>
34-
<p>We’re working on porting much of Scala’s useful documentation to this documentation repository. So hang on, content is soon forthcoming.<p>
33+
<h2>Available Documentation</h2>
3534

3635
<h3><a href="{{ site.baseurl }}/sips">Scala Improvement Process</a> <span class="label success">Available</span></h3>
3736
<p>Read language improvement proposals, participate in discussions surrounding submitted proposals, or submit your own improvement proposal.</p>
3837

3938
<h3><a href="{{ site.baseurl }}/overviews">Guides and Overviews</a> <span class="label success">Some Available</span></h3>
40-
<p>Some guides, such as Martin Odersky’s Collections Overview arealready available. Others are currently being converted to markdown markup for inclusion here.</p>
39+
<p>Some guides, such as Martin Odersky’s Collections Overview arenow available.</p>
4140

4241
<h3><a href="{{ site.baseurl }}/tutorials">Tutorials</a> <span class="label success">Some Available</span></h3>
43-
<p>Some tutorials, such as the <em>Scala for Java Programmers</em> guide is already available. Othersarecurrently being converted to markdown markup for inclusion here.</p>
42+
<p>Some tutorials, such as the <em>Scala for Java Programmers</em> guide,arenow available.</p>
4443

4544
<h3><a href="{{ site.baseurl }}/glossary">Glossary</a> <span class="label success">Available</span></h3>
4645
<p>With permission from Artima Inc., we reproduce the glossary from <em>Programming in Scala</em> here, for easy reference.</p>
4746

4847
<h3><a href="{{ site.baseurl }}/cheatsheets">Cheatsheets</a> <span class="label success">Available</span></h3>
49-
<p>We've currently got one cheatsheet, thanks to Brendan O’Connor, and are looking for more to include!</p>
48+
<p>We've currently got one cheatsheet, thanks to Brendan O’Connor. Contributions in this area are welcome.</p>
5049

5150
<h3><a href="{{ site.baseurl }}/style">Scala Style Guide</a> <span class="label success">Available</span></h3>
52-
<p>Daniel Spiewak and David Copeland’s <em>Scala Style Guide</em> is now available. Thanks to themfor putting together such an excellent style guide, and thanks to Simon Ochsenreither for converting it tomarkdown!</p>
51+
<p>Thanks toDaniel Spiewak and David Copelandfor putting together such an excellent style guide, and thanks to Simon Ochsenreither for converting it toMarkdown.</p>
5352

5453
<h3><a href="http://www.scala-lang.org/files/archive/spec/2.11/">Language Specification</a> <span class="label success">Available</span></h3>
55-
<p>The official definition of Scala. For when you just have to know the truth, beautiful or ugly.</p>
54+
<p>The official definition of Scala. For when you just have to know the truth.</p>
5655

5756
<p>&nbsp;</p><p>&nbsp;</p>
5857

5958
</div>
6059
<div class="span8">
6160
<h1>Contributions Welcomed!</h1>
62-
This site was designedso it would be easyfor core committers and the community alike to build documentation. We’d love help of any kind&nbsp;– from detailed articles or overviews of Scala’s language features, to help converting documents tomarkdown.
61+
This site was designed for core committers and the community alike to build documentation. We’d love help of any kind&nbsp;– from detailed articles or overviews of Scala’s language features, to help converting documents toMarkdown.
6362
<p>&nbsp;</p>
64-
<p><b>If you’d like to help us, please see the <a href="{{ site.baseurl }}/contribute.html">Contribute</a> section of the site, and feel free to contact <a href="http://people.epfl.ch/heather.miller">Heather</a>.</b></p>
63+
<p><b>If you’d like to help, please see the <a href="{{ site.baseurl }}/contribute.html">Contribute</a> section of the site, and feel free to contact <a href="http://people.epfl.ch/heather.miller">Heather</a>.</b></p>
6564

6665
<div id="recentcomments" class="dsq-widget"><h2 class="dsq-widget-title">Recent Comments</h2><script type="text/javascript" src="http://scalasip.disqus.com/recent_comments_widget.js?num_items=5&hide_avatars=0&avatar_size=32&excerpt_length=200"></script></div>
6766

‎style/index.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -163,6 +163,6 @@ title: Scala Style Guide
163163
<p>This document is intended to outline some basic Scala stylistic guidelines which should be followed with more or less fervency. Wherever possible, this guide attempts to detail why a particular style is encouraged and how it relates to other alternatives. As with all style guides, treat this document as a list of rules to be broken. There are certainly times when alternative styles should be preferred over the ones given here.</p>
164164

165165
<h3>Thanks to</h3>
166-
<p><ahref="http://www.codecommit.com/">Daniel Spiewak</a> and <ahref="http://www.naildrivin5.com/">David Copeland</a> for putting this style guide together, and Simon Ochsenreither for converting it tomarkdown.</p>
166+
<p><ahref="http://www.codecommit.com/">Daniel Spiewak</a> and <ahref="http://www.naildrivin5.com/">David Copeland</a> for putting this style guide together, and Simon Ochsenreither for converting it toMarkdown.</p>
167167

168-
</div>
168+
</div>

0 commit comments

Comments
 (0)

[8]ページ先頭

©2009-2025 Movatter.jp