Merge remote-tracking branch 'upstream/master'

README.md

@@ -17,7 +17,7 @@ It's [easy](https://github.com/vhf/free-programming-books/wiki/Contribution).
 - Read the [TODO](/TODO.md) file(Adding new books is our #1 priority, but things like Alphabetizing are important, too.)
 - Edit (we prefer multiple small commits rather than one large change)
 - [Send a PR](https://help.github.com/articles/using-pull-requests)
-- be part of a project that over 16,000 people starred in 3 months. ;)
+- be part of a project that over 17,000 people starred in 4 months. ;)
 
 **Again, unlike other projects, we prefer multiple small commits rather than one large change in a pull request - it's fine to have one PR, but please make sure your title reflects what you're changing**, thanks.
 

free-programming-books-es.md

@@ -4,9 +4,10 @@
     * [Algoritmos y Estructuras de Datos](#algoritmos)
     * [Base de Datos](#base-de-datos)
     * [Ciencia Computacional](#ciencia-computacional)
-    * [Sistemas Operativos](#sistemas-operativos)
     * [Metodologías de desarrollo de software](#metodolog%C3%ADas-de-desarrollo-de-software)
-    * [Misceláneos](#miscelaneos)
+    * [Misceláneos](#miscel%C3%A1neos)
+    * [Paradigmas de Programación](#paradigmas-de-programaci%C3%B3n)
+    * [Sistemas Operativos](#sistemas-operativos)
 * [Android](#android)
 * [Assembly Language](#assembly-language)
 * [CSS](#CSS)
@@ -17,6 +18,7 @@
 * [Git](#git)
 * [Haskell](#haskell)
 * [JavaScript](#javascript)
+    * [node.js](#nodejs)
 * [Java](#java)
 * [LaTeX](#latex)
 * [PHP](#php)
@@ -55,17 +57,21 @@
 ###Emacs
 * [Emacs: Iniciación a la edición](http://www.rpublica.net/emacs/emacs.html)
 
-####Sistemas Operativos
-* [Sistemas Operativos, por Dr. David Luis la Red](http://exa.unne.edu.ar/depar/areas/informatica/SistemasOperativos/sistope2.PDF) (PDF)
-
 ####Metodologías de desarrollo de software
 * [Scrum y XP desde la trincheras](http://www.proyectalis.com/wp-content/uploads/2008/02/scrum-y-xp-desde-las-trincheras.pdf) (PDF)
 * [Diseño Ágil con TDD](http://www.dirigidoportests.com/el-libro)
-* [Metodologías Ágiles para el Desarrollo de Software] (http://www.desarrolloweb.com/manuales/metodologias-agil-desarrollo-software.html)
+* [Metodologías Ágiles para el Desarrollo de Software](http://www.desarrolloweb.com/manuales/metodologias-agil-desarrollo-software.html)
+* [Scrum & Extreme Programming (para programadores)](http://www.cursosdeprogramacionadistancia.com/static/pdf/material-sin-personalizar-agile.pdf) (PDF)
 
 ####Misceláneos
 * [97 cosas que todo programador debería saber](http://97cosas.com/programador)
 
+####Sistemas Operativos
+* [Sistemas Operativos, por Dr. David Luis la Red](http://exa.unne.edu.ar/depar/areas/informatica/SistemasOperativos/sistope2.PDF) (PDF)
+
+####Paradigmas de Programación
+* [Programación Funcional](http://www.staff.science.uu.nl/~fokke101/courses/fp-sp.pdf) (PDF)
+
 ###Android
 * [Curso de Programación Android](http://www.sgoliver.net/blog/wp-content/uploads/2011/11/Manual-Programacion-Android-SgoliverNet-v3-muestra.zip) (PDF) by Salvador Gómez Oliver
 
@@ -118,6 +124,11 @@
 * [Introducción a JavaScript](http://librosweb.es/javascript/)
 * [Jardín de JavaScript](http://bonsaiden.github.io/JavaScript-Garden/es)
 
+####Node.js
+
+* [Introducción a Node.js a través de Koans](http://nodejskoans.com/)
+* [El Libro para Principiantes en Node.js](http://www.nodebeginner.org/index-es.html)
+
 ###LaTeX
 
 * [La introducción no-tan-corta a LaTeX 2ε](http://www.ctan.org/tex-archive/info/lshort/spanish)
@@ -141,7 +152,7 @@
 * [Python para todos](https://launchpadlibrarian.net/18980633/Python%20para%20todos.pdf) (PDF)
 * [Introducción a la programación con Python](http://www.uji.es/bin/publ/edicions/ippython.pdf) (PDF)
 * [Doma de Serpientes para Niños](http://code.google.com/p/swfk-es/)
-* [Python para principiantes](http://librosweb.es/libro/python/)
+* [Python para principiantes (PDF)](http://www.cursosdeprogramacionadistancia.com/static/pdf/material-sin-personalizar-python.pdf) [(HTML)](http://librosweb.es/libro/python/)
 
 ###Ruby
 

free-programming-books-ja.md

@@ -52,6 +52,7 @@
 * [R](#r)
 * [Ruby](#ruby)
 * [Sather](#sather)
+* [Scala](#scala)
 * [Scheme](#scheme)
 * [sed](#sed)
 * [Smalltalk](#smalltalk)
@@ -423,6 +424,10 @@
 * [Sather を試そう](http://www.shido.info/sather/index.html) - 紫藤貴文
 
 
+###Scala
+* [tetrix in Scala](http://eed3si9n.com/tetrix-in-scala-html5-book)
+
+
 ###Scheme
 * [Gauche ユーザリファレンス](http://practical-scheme.net/gauche/man/gauche-refj.html) - 川合史朗
 * [お気楽 Scheme プログラミング入門](http://www.geocities.jp/m_hiroi/func/scheme.html) - 広井誠

free-programming-books-ru.md

@@ -1,12 +1,15 @@
 ###Index
 * [Списки книг](#meta-lists)
 * [Language Agnostic](#language-agnostic)
+    * [Networking](#networking)
     * [Programming Paradigms](#programming-paradigms)
 * [Assembly](#assembly)
 * [Bash](#bash)
 * [C](#c)
 * [CoffeeScript](#coffeescript)
 * [Git](#git)
+* [Erlang](#erlang)
+* [Haskell](#haskell)
 * [Java](#java)
 * [JavaScript](#javascript)
 * [LaTeX](#latex)
@@ -33,8 +36,16 @@
 
 * [Scrum и XP: заметки с передовой](http://scrum.org.ua/wp-content/uploads/2008/12/scrum_xp-from-the-trenches-rus-final.pdf)
 * [Эффективные алгоритмы и сложность вычислений](http://discopal.ispras.ru/Ru.book-advanced-algorithms.htm) - Н. Н. Кузюрин, С. А. Фомин
+* [E-maxx.ru: Сборник алгоритмов с примерами на C++](http://e-maxx.ru/upload/e-maxx_algo.pdf)
+* [Занимательное программирование. Самоучитель](http://padabum.com/x.php?id=35055) - Мозговой М.В.
+
+####Networking
+
+* [TCP/IP Крупным планом](http://www.soslan.ru/tcp/)
+
 
 ####Programming Paradigms
+
 * [Введение в функциональное программирование](https://code.google.com/p/funprog-ru/) - John Harrison
 * [Практика функционального программирования](http://fprog.ru/) - журнал
 
@@ -51,6 +62,8 @@
 ###C
 
 * [Особенности языка C. Учебное пособие](http://younglinux.info/sites/default/files/programmingC.pdf)
+* [Си/Си++. От дилетанта до профессионала](http://ermak.cs.nstu.ru/cprog/html/) - Романов Е.Л.
+
 
 ###CoffeeScript
 
@@ -72,6 +85,13 @@
 * [Pro Git](http://git-scm.com/book/ru)
 
 
+###Erlang
+* [Программирование на Эрланге](https://github.com/dyp2000/Russian-Armstrong-Erlang) - Джо Армстронг
+
+
+###Haskell
+* [Developing Web Applications with Haskell and Yesod](https://bitbucket.org/darkus/yesod/downloads) - Майкл Сноймен
+
 ###LaTeX
 
 * [LaTeX, GNU/Linux и русский стиль (сборник статей)](http://www.inp.nsk.su/~baldin/LaTeX/index.html)
@@ -154,6 +174,7 @@
 ###Unix
 
 * [Архитектура операционной системы Unix](http://lib.ru/BACH/)
+* [Введение в системное администрирование UNIX](http://lib.ru/unixhelp/) - Мошков. М
 
 ###Vim
 

free-programming-books.md

@@ -343,6 +343,7 @@
 * [How to Think Like a Computer Scientist](http://openbookproject.net/thinkcs/) -  Peter Wentworth, Jeffrey Elkner, Allen B. Downey, and Chris Meyers
 * [I Am a Bug](http://www.amibug.com/iamabug/p01.html)
 * [Learn to Program](http://pine.fm/LearnToProgram/)
+* [Learning 30 Technologies in 30 Days: A Developer Challenge](https://www.openshift.com/blogs/learning-30-technologies-in-30-days-a-developer-challenge) - Shekhar Gulati
 * [Linked Data Patterns: A pattern catalogue for modelling, publishing, and consuming Linked Data](http://patterns.dataincubator.org/book/) - Leigh Dodds, Ian Davis
 * [Magic Ink: Information Software and The Graphical Interface](http://worrydream.com/#!/MagicInk) by Bret Victor
 * [Mobile Developer's Guide to the Galaxy](https://leanpub.com/mobiledevelopersguide)
@@ -789,22 +790,24 @@
 
 
 ###Haskell
+* [A Gentle Introduction to Haskell](http://www.haskell.org/tutorial/)
 * [A Haskell School of Music](http://haskell.cs.yale.edu/?post_type=publication&p=112) (PDF) (work in progress)
 * [Anatomy of Programming Languages](http://www.cs.utexas.edu/~wcook/anatomy/) - William R. Cook
 * [Beautiful Code, Compelling Evidence](http://vis.renci.org/jeff/2009/01/16/beautiful-code-compelling-evidence/) (PDF)
+* [Exploring Generic Haskell](http://www.andres-loeh.de/ExploringGH.pdf) - Andres L¨oh
 * [Haskell and Yesod](http://www.yesodweb.com/book-1.2)
-* [Learn You a Haskell for Great Good](http://learnyouahaskell.com/) - Miran Lipovača
+* [Haskell no panic](http://lisperati.com/haskell/)
+* [Haskell web Programming](http://yannesposito.com/Scratch/fr/blog/Yesod-tutorial-for-newbies/) (Yesod tutorial)
+* [Learn Haskell Fast and Hard](http://yannesposito.com/Scratch/en/blog/Haskell-the-Hard-Way)
+* [Learn You a Haskell for Great Good](http://learnyouahaskell.com/) - Miran Lipovaca
 * [Natural Language Processing for the Working Programmer](http://nlpwp.org/book/index.xhtml)
 * [Parallel and Concurrent Programming in Haskell](http://chimera.labs.oreilly.com/books/1230000000929)
+* [Reactive Objects and Functional Programming](http://staff.www.ltu.se/~nordland/Thesis.pdf) - Johan Nordlander
 * [Real World Haskell](http://book.realworldhaskell.org/)
-* [Wikibook Haskell](http://en.wikibooks.org/wiki/Haskell)
-* [Yet Another Haskell Tutorial](http://hal3.name/docs/daume02yaht.pdf) (PDF)
-* [Haskell no panic](http://lisperati.com/haskell/)
-* [A Gentle Introduction to Haskell](http://www.haskell.org/tutorial/)
 * [Speeding Through Haskell](http://www.sthaskell.com/)
-* [Learn Haskell Fast and Hard](http://yannesposito.com/Scratch/en/blog/Haskell-the-Hard-Way)
-* [Haskell web Programming](http://yannesposito.com/Scratch/fr/blog/Yesod-tutorial-for-newbies/) (Yesod tutorial)
 * [The Haskell Road to Logic, Math and Programming](http://fldit-www.cs.uni-dortmund.de/~peter/PS07/HR.pdf) (PDF)
+* [Wikibook Haskell](http://en.wikibooks.org/wiki/Haskell)
+* [Yet Another Haskell Tutorial](http://hal3.name/docs/daume02yaht.pdf) (PDF)
 
 
 ###HTML / CSS
@@ -973,6 +976,7 @@ See also [TeX](#tex)
 * [Getting Started with Ubuntu](http://ubuntu-manual.org/)
 * [GNU Autoconf, Automake and Libtool](http://sources.redhat.com/autobook/download.html)
 * [GTK+/Gnome Application Development](http://www.linuxtopia.org/online_books/gui_toolkit_guides/gtk+_gnome_application_development/index.html)
+* [Learn Linux The Hard Way](http://nixsrv.com/llthw)
 * [Linux Advanced Routing & Traffic Control HOWTO](http://lartc.org/)
 * [The Debian Administrator's Handbook](http://debian-handbook.info/)
 * [The Linux Command Line](http://linuxcommand.org/tlcl.php) (PDF)
@@ -1182,6 +1186,8 @@ See also [TeX](#tex)
         * [The Tiny Book of Rules](https://drupal.org/files/tiny-book-of-rules.pdf) (PDF)
         * [Master Drupal in 7 hours](http://dl.dropboxusercontent.com/u/54624702/Master%20Drupal%20in%207%20hours_v1.1.pdf) (PDF)
     * Drupal 8
+* CakePHP Framework
+    * [CakePHP Cookbook 2.x](http://book.cakephp.org/2.0/_downloads/en/CakePHPCookbook.pdf)
 * [PHP Internals Book](http://www.phpinternalsbook.com/)
 * [PHP Best Practices](https://phpbestpractices.org/)
 * [PHP Programming](http://en.wikibooks.org/wiki/PHP_Programming)
@@ -1372,6 +1378,7 @@ 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)
+* [EAI Patterns with Actor Model](https://github.com/alexanderfefelov/eai-patterns-with-actor-model) - Vaughn Vernon
 * [Effective Scala](http://twitter.github.com/effectivescala/)
 * [Pro Scala: Monadic Design Patterns for the Web](http://github.com/leithaus/XTrace/tree/monadic/src/main/book/content/)
 * [Program Transformation in Scala](http://homepages.cwi.nl/~ai/MScThesis-A-Izmaylova.pdf) - Anastasia Izmaylova
@@ -1380,9 +1387,11 @@ See also [TeX](#tex)
 * [Scala By Example](http://www.scala-lang.org/docu/files/ScalaByExample.pdf) (PDF)
 * [Scala Cookbook: Bonus Chapters](http://examples.oreilly.com/9781449339616-files/Scala_Cookbook_bonus_chapters.pdf) - Alvin Alexander
 * [Scala & Design Patterns: Exploring Language Expressivity](http://www.scala-lang.org/old/sites/default/files/FrederikThesis.pdf) - Fredrik Skeel Løkke
+* [Scala for Perl 5 Programmers](https://github.com/garu/scala-for-perl5-programmers) - Breno G. de Oliveira
 * [Scala for the Impatient (A1 Scala Level chapters)](http://typesafe.com/resources/book/scala-for-the-impatient) - Cay S. Horstmann
 * [Scala School by Twitter](http://twitter.github.io/scala_school/)
 * [Scala Tutorial](http://www.tutorialspoint.com/scala/scala_tutorial.pdf)
+* [tetrix in Scala](http://eed3si9n.com/tetrix-in-scala-html5-book)
 * [The Neophyte's Guide to Scala](http://danielwestheide.com/scala/neophytes.html) - Daniel Westheide
 * [Xtrace](http://github.com/leithaus/XTrace/tree/monadic/src/main/book/content/)
 

free-programming-interactive-tutorials-en.md

@@ -1,13 +1,26 @@
+###Bash
+* [Learn Shell Programming](http://www.learnshell.org)
+
+###C
+* [Learn C](http://www.learn-c.org/)
+
+###C#
+* [Learn C#](http://www.learncs.org/)
+
 ###Clojure
 * [Clojure Koans](http://clojurekoans.com/)
 * [ClojureScript Koans](http://clojurescriptkoans.com/)
+* [Try Clojure](http://tryclj.com/)
 
 
 ###CoffeeScript
 * [Smooth CoffeeScript, Interactive Edition](http://autotelicum.github.io/Smooth-CoffeeScript/interactive/interactive-coffeescript.html)
 
+###Erlang
+* [Try Erlang](http://www.tryerlang.org/)
 
 ###Git
+* [Githug](https://github.com/Gazler/githug) (Tutorial in shell)
 * [Try Git](http://try.github.io)
 * [Learn Git Branching](http://pcottle.github.io/learnGitBranching/)
 
@@ -15,9 +28,18 @@
 ###Go
 * [The Go Tutorial](http://golang.org/doc/go_tutorial.html)
 
+###Haskell
+* [Try Haskell!](http://tryhaskell.org/)
+
+###Java
+* [Learn Java](http://www.learnjavaonline.org/)
+
 
 ###Javascript
 * [Learning Advanced JavaScript](http://ejohn.org/apps/learn/)
+* [Learn JavaScript](http://www.learn-js.org/)
+* [Learn knockout.js](http://learn.knockoutjs.com)
+* [Try jQuery](http://try.jquery.com/)
 
 
 ###Lisp
@@ -30,15 +52,27 @@
 
 ###NoSQL
 * [MongoDB Koans](https://github.com/chicagoruby/MongoDB_Koans)
+* [Try Redis](http://try.redis.io/)
 
 ###Objective-C
-
 * [Try Objective-C](http://tryobjectivec.codeschool.com)
 
+###Ocaml
+* [Try Ocaml](http://try.ocamlpro.com/)
+
+###Perl
+* [Perltuts.com](http://perltuts.com)
+
+###PHP
+* [Learn PHP](http://www.learn-php.org/)
+
 ###Python
 * [How to Think Like a Computer Scientist: Learning with Python, Interactive Edition](http://interactivepython.org/courselib/static/thinkcspy/index.html)
+* [Learn Python](http://www.learnpython.org/)
 * [Python Koans](https://github.com/gregmalcolm/python_koans)
 
+###R
+* [Try R](http://tryr.codeschool.com)
 
 ###Ruby
 * [RubyMonk - Interactive Ruby tutorials](http://rubymonk.com)
@@ -48,3 +82,6 @@
 
 ###Scala
 * [Scala Tour](http://www.scala-tour.com/)
+
+###Vim
+* [Interactive Vim Tutorial](http://www.openvim.com/tutorial.html)