From 54789bcf03a8ca1ad2ad05712b0373cfab4c5b52 Mon Sep 17 00:00:00 2001 From: Alexander Fefelov Date: Wed, 8 Jan 2014 05:43:48 +0400 Subject: [PATCH 1/4] Added "The Neophyte's Guide to Scala" --- free-programming-books.md | 1 + 1 file changed, 1 insertion(+) diff --git a/free-programming-books.md b/free-programming-books.md index 186c57e21..c8ab52169 100644 --- a/free-programming-books.md +++ b/free-programming-books.md @@ -1323,6 +1323,7 @@ See also [TeX](#tex) * [Scala By Example](http://www.scala-lang.org/docu/files/ScalaByExample.pdf) (PDF) * [Scala for the Impatient](http://typesafe.com/resources/book/scala-for-the-impatient) - Cay S. Horstmann * [Scala School by Twitter](http://twitter.github.io/scala_school/) +* [The Neophyte's Guide to Scala](http://danielwestheide.com/scala/neophytes.html) - Daniel Westheide * [A Scala Tutorial for Java programmers](http://www.scala-lang.org/docu/files/ScalaTutorial.pdf) (PDF) * [Xtrace](http://github.com/leithaus/XTrace/tree/monadic/src/main/book/content/) From 2f0d8b23de5c032ab2306c82f5da7d3fe2fcf0e0 Mon Sep 17 00:00:00 2001 From: Alexander Fefelov Date: Wed, 8 Jan 2014 05:50:55 +0400 Subject: [PATCH 2/4] Alphabetized Scala section --- free-programming-books.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/free-programming-books.md b/free-programming-books.md index c8ab52169..de9c6f74f 100644 --- a/free-programming-books.md +++ b/free-programming-books.md @@ -1312,11 +1312,12 @@ See also [TeX](#tex) ###Scala +* [A Scala Tutorial for Java programmers](http://www.scala-lang.org/docu/files/ScalaTutorial.pdf) (PDF) * [Another tour of Scala](http://naildrivin5.com/scalatour) * [Effective Scala](http://twitter.github.com/effectivescala/) * [Exploring Lift](http://exploring.liftweb.net/) (published earlier as "The Definitive Guide to Lift", [PDF](http://groups.google.com/group/the-lift-book)) -* [Lift](http://github.com/tjweir/liftbook) * [Lift Cookbook](http://chimera.labs.oreilly.com/books/1234000000030/index.html) - Richard Dallaway +* [Lift](http://github.com/tjweir/liftbook) * [Pro Scala: Monadic Design Patterns for the Web](http://github.com/leithaus/XTrace/tree/monadic/src/main/book/content/) * [Programming in Scala, First Edition](http://www.artima.com/pins1ed/) * [Programming Scala](http://programming-scala.labs.oreilly.com/index.html) @@ -1324,7 +1325,6 @@ See also [TeX](#tex) * [Scala for the Impatient](http://typesafe.com/resources/book/scala-for-the-impatient) - Cay S. Horstmann * [Scala School by Twitter](http://twitter.github.io/scala_school/) * [The Neophyte's Guide to Scala](http://danielwestheide.com/scala/neophytes.html) - Daniel Westheide -* [A Scala Tutorial for Java programmers](http://www.scala-lang.org/docu/files/ScalaTutorial.pdf) (PDF) * [Xtrace](http://github.com/leithaus/XTrace/tree/monadic/src/main/book/content/) From d2ca3497fa3db45c111e7da680c0d7e17006e972 Mon Sep 17 00:00:00 2001 From: Alexander Fefelov Date: Wed, 8 Jan 2014 08:05:32 +0400 Subject: [PATCH 3/4] Fixed Scala alphabetizing --- free-programming-books.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/free-programming-books.md b/free-programming-books.md index de9c6f74f..78252604d 100644 --- a/free-programming-books.md +++ b/free-programming-books.md @@ -1316,8 +1316,8 @@ See also [TeX](#tex) * [Another tour of Scala](http://naildrivin5.com/scalatour) * [Effective Scala](http://twitter.github.com/effectivescala/) * [Exploring Lift](http://exploring.liftweb.net/) (published earlier as "The Definitive Guide to Lift", [PDF](http://groups.google.com/group/the-lift-book)) -* [Lift Cookbook](http://chimera.labs.oreilly.com/books/1234000000030/index.html) - Richard Dallaway * [Lift](http://github.com/tjweir/liftbook) +* [Lift Cookbook](http://chimera.labs.oreilly.com/books/1234000000030/index.html) - Richard Dallaway * [Pro Scala: Monadic Design Patterns for the Web](http://github.com/leithaus/XTrace/tree/monadic/src/main/book/content/) * [Programming in Scala, First Edition](http://www.artima.com/pins1ed/) * [Programming Scala](http://programming-scala.labs.oreilly.com/index.html) From 79fa0d94daa428f11285e06c797b3242943ae91f Mon Sep 17 00:00:00 2001 From: Alexander Fefelov Date: Wed, 8 Jan 2014 10:28:53 +0400 Subject: [PATCH 4/4] Added "Play Framework Recipes" --- free-programming-books.md | 1 + 1 file changed, 1 insertion(+) diff --git a/free-programming-books.md b/free-programming-books.md index 78252604d..f08b24539 100644 --- a/free-programming-books.md +++ b/free-programming-books.md @@ -1318,6 +1318,7 @@ See also [TeX](#tex) * [Exploring Lift](http://exploring.liftweb.net/) (published earlier as "The Definitive Guide to Lift", [PDF](http://groups.google.com/group/the-lift-book)) * [Lift](http://github.com/tjweir/liftbook) * [Lift Cookbook](http://chimera.labs.oreilly.com/books/1234000000030/index.html) - Richard Dallaway +* [Play Framework Recipes](http://alvinalexander.com/scala/scala-cookbook-play-framework-recipes-pdf-ebook) - Alvin Alexander * [Pro Scala: Monadic Design Patterns for the Web](http://github.com/leithaus/XTrace/tree/monadic/src/main/book/content/) * [Programming in Scala, First Edition](http://www.artima.com/pins1ed/) * [Programming Scala](http://programming-scala.labs.oreilly.com/index.html)