Merge branch 'copychanges'

travissarles · travissarles · commit 18116b75769c · 2017-05-31T15:59:30.000+02:00
diff --git a/_books/1-programming-in-scala-3rd.md b/_books/1-programming-in-scala-3rd.md
@@ -0,0 +1,12 @@
+---
+title: "Programming in Scala, 3rd ed"
+link: http://booksites.artima.com/programming_in_scala_3ed
+image: /resources/img/books/ProgrammingInScala.gif
+status: Updated for Scala 2.12
+authors: ["Martin Odersky", "Lex Spoon", "Bill Benners"]
+publisher: 
+---
+
+(First edition [available for free online reading](http://www.artima.com/pins1ed/))
+
+Being co-written by the language's designer, Martin Odersky, you will find it provides additional depth and clarity to the diverse features of the language. The book provides both an authoritative reference for Scala and a systematic tutorial covering all the features in the language. Once you are familiar with the basics of Scala you will appreciate having this source of invaluable examples and precise explanations of Scala on hand. The book is available from [Artima](http://booksites.artima.com/programming_in_scala_3ed). Award winning book - [Jolt Productivity award](http://www.drdobbs.com/joltawards/232601431) for Technical Books.
diff --git a/_books/2-scala-for-the-impatient.md b/_books/2-scala-for-the-impatient.md
@@ -0,0 +1,22 @@
+---
+title: "Scala for the Impatient"
+link: http://www.horstmann.com/scala/index.html
+image: /resources/img/books/scala_for_the_impatient.png
+status: Available Now
+authors: ["Cay S. Horstmann"]
+publisher: Addison-Wesley
+publisherLink: https://heuk.pearson.com/about-us.html/Addison-Wesley/
+---
+
+What you get:
+
+* A rapid introduction to Scala for programmers who are competent in Java, C#, or C++
+* Blog-length chunks of information that you can digest quickly
+* An organization that you'll find useful as a quick reference
+
+What you don't get:
+
+* An introduction into programming or object-oriented design
+* Religion about the superiority of one paradigm or another
+* Cute or academic examples
+* Mind-numbing details about syntax minutiae
diff --git a/_books/3-programming-scala.md b/_books/3-programming-scala.md
@@ -0,0 +1,11 @@
+---
+title: "Programming Scala"
+link: http://shop.oreilly.com/product/0636920033073.do
+image: /resources/img/books/ProgrammingScala-final-border.gif
+status: Updated for Scala 2.11
+authors: ["Alex Payne", "Dean Wampler"]
+publisher: O’Reilly
+publisherLink: http://www.oreilly.com/
+---
+
+Both are industry experts, Alex Payne being the lead API programmer at Twitter, a social networking service based on Scala. O’Reilly, the publisher, writes: "Learn how to be more productive with Scala, a new multi-paradigm language for the Java Virtual Machine (JVM) that integrates features of both object-oriented and functional programming. With this book, you'll discover why Scala is ideal for highly scalable, component-based applications that support concurrency and distribution. You'll also learn how to leverage the wealth of Java class libraries to meet the practical needs of enterprise and Internet projects more easily."
diff --git a/_books/4-functional-programming-in-scala.md b/_books/4-functional-programming-in-scala.md
@@ -0,0 +1,11 @@
+---
+title: "Functional Programming in Scala"
+link: https://www.manning.com/books/functional-programming-in-scala
+image: /resources/img/books/FPiS_93x116.png
+status: Available now
+authors: ["Paul Chiusano", "Rúnar Bjarnason"]
+publisher: Manning
+publisherLink: http://www.manning.com/
+---
+
+"Functional programming (FP) is a style of software development emphasizing functions that don't depend on program state... Functional Programming in Scala is a serious tutorial for programmers looking to learn FP and apply it to the everyday business of coding. The book guides readers from basic techniques to advanced topics in a logical, concise, and clear progression. In it, you'll find concrete examples and exercises that open up the world of functional programming." 
diff --git a/_books/5-scala-in-depth.md b/_books/5-scala-in-depth.md
@@ -0,0 +1,11 @@
+---
+title: "Scala in Depth"
+link: http://www.manning.com/suereth
+image: /resources/img/books/icon_Scala_in_Depth_93x116.png
+status: Available now
+authors: ["Joshua D. Suereth"]
+publisher: Manning
+publisherLink: http://www.manning.com/
+---
+
+"While information about the Scala language is abundant, skilled practitioners, great examples, and insight into the best practices of the community are harder to find. Scala in Depth bridges that gap, preparing you to adopt Scala successfully for real world projects. Scala in Depth is a unique new book designed to help you integrate Scala effectively into your development process. By presenting the emerging best practices and designs from the Scala community, it guides you though dozens of powerful techniques example by example. There's no heavy-handed theory here-just lots of crisp, practical guides for coding in Scala." 
diff --git a/_books/6-scala-puzzlers.md b/_books/6-scala-puzzlers.md
@@ -0,0 +1,11 @@
+---
+title: "Scala Puzzlers"
+link: http://www.artima.com/shop/scala_puzzlers
+image: /resources/img/books/icon_Scala_in_Depth_93x116.png
+status: Available now
+authors: ["Andrew Phillips", "Nermin Šerifović"]
+publisher: Artima Press
+publisherLink: http://www.artima.com/index.jsp
+---
+
+"Getting code to do what we want it to do is perhaps the essence of our purpose as developers. So there are few things more intriguing or important than code that we think we understand, but that behaves rather contrary to our expectations. Scala Puzzlers is a collection of such examples in Scala. It is not only an entertaining and instructive way of understanding this highly expressive language better. It will also help you recognize many counter-intuitive traps and pitfalls and prevent them from inflicting further production bug hunt stress on Scala developers." 
diff --git a/_config.yml b/_config.yml
@@ -15,6 +15,10 @@ keywords:
 - Document
 - Guide
 
+collections:
+  books:
+    output: false
+
 scala-version: 2.12.2
 
 highlighter: rouge
diff --git a/_layouts/tour.html b/_layouts/tour.html
@@ -0,0 +1,6 @@
+---
+layout: inner-page-no-masthead
+includeTOC: true
+includeCollectionTOC: true
+---
+{{content}}
diff --git a/getting-started.md b/getting-started.md
@@ -17,6 +17,7 @@ These tutorials will get you writing Scala code as quickly as possible. Choose o
 
 ## Next Steps
 Once you've finished these tutorials, check out
+
 * [The Tour of Scala](http://docs.scala-lang.org/tutorials/tour/tour-of-scala.html)
 * [Guides](guides.html)
 * [Learning Resources](learn) including books and online courses
diff --git a/guides.md b/guides.md
@@ -7,9 +7,9 @@ redirect_from:
 ---
 
 ## Guides
-* [Frequently Asked Questions](http://docs.scala-lang.org/tutorials/FAQ/finding-symbols) from StackOverflow.
-* [Scala for Java Programmers](http://docs.scala-lang.org/tutorials/scala-for-java-programmers.html): a comparison of the two languages.
-* [Style Guide](http://docs.scala-lang.org/style/)
+* [Frequently Asked Questions](/tutorials/FAQ/finding-symbols) from StackOverflow.
+* [Scala for Java Programmers](/tutorials/scala-for-java-programmers.html): a comparison of the two languages.
+* [Style Guide](/style/)
 
 <div class="page-header-index">
   <h2>Core Scala</h2>
diff --git a/tutorials/tour/_posts/2017-02-13-abstract-types.md b/tutorials/tour/_posts/2017-02-13-abstract-types.md
@@ -1,5 +1,5 @@
 ---
-layout: inner-page-no-masthead
+layout: overview
 title: Abstract Types
 
 disqus: true
diff --git a/tutorials/tour/_posts/2017-02-13-annotations.md b/tutorials/tour/_posts/2017-02-13-annotations.md
@@ -1,5 +1,5 @@
 ---
-layout: inner-page-no-masthead
+layout: overview
 title: Annotations
 
 disqus: true
diff --git a/tutorials/tour/_posts/2017-02-13-basics.md b/tutorials/tour/_posts/2017-02-13-basics.md
@@ -1,5 +1,5 @@
 ---
-layout: inner-page-no-masthead
+layout: overview
 title: Basics
 
 disqus: true
diff --git a/tutorials/tour/_posts/2017-02-13-by-name-parameters.md b/tutorials/tour/_posts/2017-02-13-by-name-parameters.md
@@ -1,5 +1,5 @@
 ---
-layout: inner-page-no-masthead
+layout: overview
 title: By-name Parameters
 
 disqus: true
diff --git a/tutorials/tour/_posts/2017-02-13-case-classes.md b/tutorials/tour/_posts/2017-02-13-case-classes.md
@@ -1,5 +1,5 @@
 ---
-layout: inner-page-no-masthead
+layout: overview
 title: Case Classes
 
 disqus: true
diff --git a/tutorials/tour/_posts/2017-02-13-classes.md b/tutorials/tour/_posts/2017-02-13-classes.md
@@ -1,5 +1,5 @@
 ---
-layout: inner-page-no-masthead
+layout: overview
 title: Classes
 
 disqus: true
diff --git a/tutorials/tour/_posts/2017-02-13-compound-types.md b/tutorials/tour/_posts/2017-02-13-compound-types.md
@@ -1,5 +1,5 @@
 ---
-layout: inner-page-no-masthead
+layout: overview
 title: Compound Types
 
 disqus: true
diff --git a/tutorials/tour/_posts/2017-02-13-currying.md b/tutorials/tour/_posts/2017-02-13-currying.md
@@ -1,5 +1,5 @@
 ---
-layout: inner-page-no-masthead
+layout: overview
 title: Currying
 
 disqus: true
diff --git a/tutorials/tour/_posts/2017-02-13-default-parameter-values.md b/tutorials/tour/_posts/2017-02-13-default-parameter-values.md
@@ -1,5 +1,5 @@
 ---
-layout: inner-page-no-masthead
+layout: overview
 title: Default Parameter Values
 
 disqus: true
diff --git a/tutorials/tour/_posts/2017-02-13-extractor-objects.md b/tutorials/tour/_posts/2017-02-13-extractor-objects.md
@@ -1,5 +1,5 @@
 ---
-layout: inner-page-no-masthead
+layout: overview
 title: Extractor Objects
 
 disqus: true
diff --git a/tutorials/tour/_posts/2017-02-13-generic-classes.md b/tutorials/tour/_posts/2017-02-13-generic-classes.md
@@ -1,5 +1,5 @@
 ---
-layout: inner-page-no-masthead
+layout: overview
 title: Generic Classes
 
 disqus: true
diff --git a/tutorials/tour/_posts/2017-02-13-higher-order-functions.md b/tutorials/tour/_posts/2017-02-13-higher-order-functions.md
@@ -1,5 +1,5 @@
 ---
-layout: inner-page-no-masthead
+layout: overview
 title: Higher-order Functions
 
 disqus: true
diff --git a/tutorials/tour/_posts/2017-02-13-implicit-conversions.md b/tutorials/tour/_posts/2017-02-13-implicit-conversions.md
@@ -1,5 +1,5 @@
 ---
-layout: inner-page-no-masthead
+layout: overview
 title: Implicit Conversions
 
 disqus: true
diff --git a/tutorials/tour/_posts/2017-02-13-implicit-parameters.md b/tutorials/tour/_posts/2017-02-13-implicit-parameters.md
@@ -1,5 +1,5 @@
 ---
-layout: inner-page-no-masthead
+layout: overview
 title: Implicit Parameters
 
 disqus: true
diff --git a/tutorials/tour/_posts/2017-02-13-inner-classes.md b/tutorials/tour/_posts/2017-02-13-inner-classes.md
@@ -1,5 +1,5 @@
 ---
-layout: inner-page-no-masthead
+layout: overview
 title: Inner Classes
 
 disqus: true
diff --git a/tutorials/tour/_posts/2017-02-13-local-type-inference.md b/tutorials/tour/_posts/2017-02-13-local-type-inference.md
@@ -1,5 +1,5 @@
 ---
-layout: inner-page-no-masthead
+layout: overview
 title: Local Type Inference
 
 disqus: true
diff --git a/tutorials/tour/_posts/2017-02-13-lower-type-bounds.md b/tutorials/tour/_posts/2017-02-13-lower-type-bounds.md
@@ -1,5 +1,5 @@
 ---
-layout: inner-page-no-masthead
+layout: overview
 title: Lower Type Bounds
 
 disqus: true
diff --git a/tutorials/tour/_posts/2017-02-13-mixin-class-composition.md b/tutorials/tour/_posts/2017-02-13-mixin-class-composition.md
@@ -1,5 +1,5 @@
 ---
-layout: inner-page-no-masthead
+layout: overview
 title: Mixin Class Composition
 
 disqus: true
diff --git a/tutorials/tour/_posts/2017-02-13-named-arguments.md b/tutorials/tour/_posts/2017-02-13-named-arguments.md
@@ -1,5 +1,5 @@
 ---
-layout: inner-page-no-masthead
+layout: overview
 title: Named Arguments
 
 disqus: true
diff --git a/tutorials/tour/_posts/2017-02-13-nested-functions.md b/tutorials/tour/_posts/2017-02-13-nested-functions.md
@@ -1,5 +1,5 @@
 ---
-layout: inner-page-no-masthead
+layout: overview
 title: Nested Methods
 
 disqus: true
diff --git a/tutorials/tour/_posts/2017-02-13-operators.md b/tutorials/tour/_posts/2017-02-13-operators.md
@@ -1,5 +1,5 @@
 ---
-layout: inner-page-no-masthead
+layout: overview
 title: Operators
 
 disqus: true
diff --git a/tutorials/tour/_posts/2017-02-13-pattern-matching.md b/tutorials/tour/_posts/2017-02-13-pattern-matching.md
@@ -1,5 +1,5 @@
 ---
-layout: inner-page-no-masthead
+layout: overview
 title: Pattern Matching
 
 disqus: true
diff --git a/tutorials/tour/_posts/2017-02-13-polymorphic-methods.md b/tutorials/tour/_posts/2017-02-13-polymorphic-methods.md
@@ -1,5 +1,5 @@
 ---
-layout: inner-page-no-masthead
+layout: overview
 title: Polymorphic Methods
 
 disqus: true
diff --git a/tutorials/tour/_posts/2017-02-13-regular-expression-patterns.md b/tutorials/tour/_posts/2017-02-13-regular-expression-patterns.md
@@ -1,5 +1,5 @@
 ---
-layout: inner-page-no-masthead
+layout: overview
 title: Regular Expression Patterns
 
 disqus: true
diff --git a/tutorials/tour/_posts/2017-02-13-self-types.md b/tutorials/tour/_posts/2017-02-13-self-types.md
@@ -1,5 +1,5 @@
 ---
-layout: inner-page-no-masthead
+layout: overview
 title: Self-type
 
 disqus: true
diff --git a/tutorials/tour/_posts/2017-02-13-sequence-comprehensions.md b/tutorials/tour/_posts/2017-02-13-sequence-comprehensions.md
@@ -1,5 +1,5 @@
 ---
-layout: inner-page-no-masthead
+layout: overview
 title: Sequence Comprehensions
 
 disqus: true
diff --git a/tutorials/tour/_posts/2017-02-13-singleton-objects.md b/tutorials/tour/_posts/2017-02-13-singleton-objects.md
@@ -1,5 +1,5 @@
 ---
-layout: inner-page-no-masthead
+layout: overview
 title: Singleton Objects
 
 disqus: true
diff --git a/tutorials/tour/_posts/2017-02-13-tour-of-scala.md b/tutorials/tour/_posts/2017-02-13-tour-of-scala.md
@@ -1,5 +1,5 @@
 ---
-layout: inner-page-no-masthead
+layout: overview
 title: Introduction
 
 disqus: true
diff --git a/tutorials/tour/_posts/2017-02-13-traits.md b/tutorials/tour/_posts/2017-02-13-traits.md
@@ -1,5 +1,5 @@
 ---
-layout: inner-page-no-masthead
+layout: overview
 title: Traits
 
 disqus: true
diff --git a/tutorials/tour/_posts/2017-02-13-unified-types.md b/tutorials/tour/_posts/2017-02-13-unified-types.md
@@ -1,5 +1,5 @@
 ---
-layout: inner-page-no-masthead
+layout: overview
 title: Unified Types
 
 disqus: true
diff --git a/tutorials/tour/_posts/2017-02-13-upper-type-bounds.md b/tutorials/tour/_posts/2017-02-13-upper-type-bounds.md
@@ -1,5 +1,5 @@
 ---
-layout: inner-page-no-masthead
+layout: overview
 title: Upper Type Bounds
 
 disqus: true
diff --git a/tutorials/tour/_posts/2017-02-13-variances.md b/tutorials/tour/_posts/2017-02-13-variances.md
@@ -1,5 +1,5 @@
 ---
-layout: inner-page-no-masthead
+layout: overview
 title: Variances
 
 disqus: true
