merged with upstream

c4adb7eb · Gordon Chiam · 6656b3de · 279224c5 · c4adb7eb · c4adb7eb
20 changed file
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -4,30 +4,30 @@ This guide details how to contribute to this repository.


 ## Contributor license agreement
-By submitting code you agree to the [LICENSE](/LICENSE) of this repository.
+By submitting code you agree to the [LICENSE](https://github.com/vhf/free-programming-books/blob/master/LICENSE) of this repository.


-## Everyone is welcome to add a new free book to the list
-Yep, that is true, you and your friends are welcome to add new free books to the list. And by free, we mean free, really free.
-And you know what? It's really easy, see below.
+## All the steps you need
+1. First of all, what you want to add should be actually 'Free'. Don't mistake "An easy link to Download a book" with "Free".
+2. If you don't know how to work with git or github, just simply go to [Wiki: Contribution](https://github.com/vhf/free-programming-books/wiki/Contribution) and read the rest.
+3. We have 3 kinds of lists. Make sure you know where you're adding the link:
+    
+    + **Books** : PDF, HTML, DJVU, ePub, a gitBook.io based site, a Git repo, etc.
+    + **Courses** : A course is a well designed learning material which was made by an organized group and is availabe for a long time where there is no interactive tool embeded in the site. e.g.: [OpenCourseWare](http://ocw.mit.edu/), [PHPAcademy](https://phpacademy.org), etc.
+    + **Interactive Tutorials** : An application which helps you learn, by actually typing syntax. e.g.: [Codecademy](http://www.codecademy.com/), [Try Github](http://try.github.io/), etc.

-
-## Steps to add a new book
- Make sure that you've read [Contribution](https://github.com/vhf/free-programming-books/wiki/Contribution), which guides you to editing a repository. Then:
-
-1. Again, unlike other projects, we prefer multiple small commits rather than one large change in a pull request - it's fine to have one pull request, but please make sure your title reflects what you've changed.
-2. Use our standard for formatting the .md file. Check it out: [Formatting](#formatting)
-3. Please try to use alphabetic order.
+4. We prefer small commits rather than one large commit in a pull request. If you don't have the time to make small commit, add an issue with all the links included and we'll add them for you.
+5. Use our standard for formatting the .md file. Check it out: [Formatting](#formatting)
+6. Please try to use alphabetic order.


 ### Formatting
-We are adults. Let's respect the next standard.
 + All lists are ```.md``` files. Try to learn Github's Markdown syntax. It's simple!
 + All the lists start with an Index, the idea is to show all of sections and subsections there, so it's important to have an index for each section. Right now it's alphabetized, so please use alphabetic order.
-+ Sections are using level 3 heading (in HTML is ```<h3>```, in Markdown is ```###```), and subsections are using level 4 (in Markdown is ####).
+ Sections are using level 3 heading (in HTML is ```<h3>```, in Markdown is ```###```), and subsections are using level 4 (in HTML is ```<h4>```, in Markdown is ```####```).

 The idea is to have
-+ ```2``` empty lines between last suggested book & header 
+ ```2``` empty lines between last suggested book & new header
 + ```0``` empty line between header & first book of that very section.
 + ```0``` empty line between each book in 1 section.
 + ```1``` empty line at the end of each ```.md``` file.
@@ -42,8 +42,15 @@ Like this example:
 * [IllumOS Dynamic Tracing Guide](http://dtrace.org/guide/preface.html)
 * [Some Other Book](http://so.me/other/book.html)

+BAD : * [IllumOS Dynamic Tracing Guide](http://dtrace.org/guide/preface.html)(PDF)
+GOOD: * [IllumOS Dynamic Tracing Guide](http://dtrace.org/guide/preface.html) (PDF)
+
+BAD : * [IllumOS Dynamic Tracing Guide](http://dtrace.org/guide/preface.html)- Robert
+GOOD: * [IllumOS Dynamic Tracing Guide](http://dtrace.org/guide/preface.html) - Robert
+
 ```

+
 And that's it! Simple, easy and lovely...

 We hope you contribute to this great repository. :+1:
--- a/README.md
+++ b/README.md
@@ -11,9 +11,9 @@ Moved to GitHub for collaborative updating and for the site mentioned above.
 It's [easy](https://github.com/vhf/free-programming-books/wiki/Contribution). Please read [CONTRIBUTING](/CONTRIBUTING.md).
 - [Fork](https://help.github.com/articles/fork-a-repo)
 - 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)
+- [Edit](https://github.com/vhf/free-programming-books/edit/master/free-programming-books.md) (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 19,000 people starred in 4 months. ;)
+- be part of a project that over 24,000 people starred in 7 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.

@@ -28,12 +28,13 @@ It's [easy](https://github.com/vhf/free-programming-books/wiki/Contribution). Pl
 ### In Other Spoken Languages
 + Bulgarian: [github](/free-programming-books-bg.md)
 + Chinese: [github](/free-programming-books-zh.md)
+ Czech: [github](/free-programming-books-cs.md)
 + French: [github](/free-programming-books-fr.md) or [site](http://resrc.io/list/33/livres-gratuits-sur-la-programmation/).
-    The French list was based on <http://progdupeu.pl/forums/sujet/43/une-banque-de-liens>.
+    The French list was based on [this](http://progdupeu.pl/forums/sujet/43/une-banque-de-liens) page.
 + German: [github](/free-programming-books-de.md)
 + Greek: [github](/free-programming-books-gr.md)
 + Hungarian: [github](/free-programming-books-hu.md)
-+ Indonesian : [github] (/free-programming-books-id.md)
+ Indonesian : [github](/free-programming-books-id.md)
 + Italian: [github](/free-programming-books-it.md)
 + Japanese: [github](/free-programming-books-ja.md)
 + Korean: [github](/free-programming-books-ko.md)
@@ -41,6 +42,7 @@ It's [easy](https://github.com/vhf/free-programming-books/wiki/Contribution). Pl
 + Polish: [github](/free-programming-books-pl.md)
 + Portuguese (Brazil): [github](/free-programming-books-pt_BR.md)
 + Portuguese (Portugal): [github](/free-programming-books-pt_PT.md)
+ Romanian (Romania): [github](/free-programming-books-ro.md)
 + Russian: [github](/free-programming-books-ru.md)
 + Turkish: [github](/free-programming-books-tr.md)
 + Spanish: [github](/free-programming-books-es.md)

--- a/free-courses-en.md
+++ b/free-courses-en.md
+###Index
+* [Databases](#databases)
+* [Haskell](#haskell)
+* [HTML / CSS](#html--css)
+* [JS](#js)
+* [iOS](#ios)
+* [Oracle PL/SQL](#oracle-plsql)
+* [Ruby](#ruby)
+
+###Databases
+* [Database Systems](http://ocw.mit.edu/courses/electrical-engineering-and-computer-science/6-830-database-systems-fall-2010/) (MIT's opencourseware)
+* [Introduction to Databases](https://class.stanford.edu/courses/Engineering/db/2014_1/about) (Stanford University)
+
+###Haskell
+* [CIS 194: Introduction to Haskell](http://www.seas.upenn.edu/~cis194/) - Brent Yorgey
+* [CS240h: Functional Systems in Haskell](http://www.scs.stanford.edu/11au-cs240h/notes/) - Bryan O'Sullivan
+
+###HTML / CSS
+* [Code a personal splash page in 1 hour: A Hands-on Intro to HTML & CSS](http://www.thefirehoseproject.com/lessons/splash-page)
+* [Learn HTML5 Programming From Scratch](https://www.udemy.com/learn-html5-programming-from-scratch/)
+
+
+###JS
+* [Egghead.io](https://egghead.io/)
+
+###iOS
+* [Developing iOS 7 Apps for iPhone and iPad](https://itunes.apple.com/us/course/developing-ios-7-apps-for/id733644550) (slides and videos) - Stanford University
+
+
+###Oracle PL/SQL
+* [Steven Feuerstein's PL/SQL Obsession - Videos and Presentations](http://www.toadworld.com/platforms/oracle/w/wiki/8243.plsql-obsession.aspx)
+
+###Ruby
+* [RubyMonk - Interactive Ruby tutorials](http://rubymonk.com)
+
--- a/free-programming-books-cs.md
+++ b/free-programming-books-cs.md
+###Index
+* [Bash](#bash)
+* [Git](#git)
+* [Java](#java)
+* [Language Agnostic](#language-agnostic)
+    * [Algoritmy a datové struktury](#algoritmy-a-datove-struktury)
+    * [Bezpečnost](#bezpecnost)
+    * [Matematika](#matematika)
+    * [Právo](#pravo)
+    * [Regulární výrazy](#regularni-vyrazy)
+    * [Sítě](#site)
+* [LaTeX](#latex)
+* [Linux](#linux)
+    * [Distribuce](#distribuce)
+* [OpenSource](#opensource)
+* [PHP](#php)
+* [Python](#python)
+* [Ruby](#ruby)
+* [TeX](#tex)
+* [XML](#xml)
+
+
+###Bash
+* [Bash očima Bohdana Milara](http://www.root.cz/knihy/bash-ocima-bohdana-milara/stahnout/980/) (PDF)
+
+
+###Java
+* [Java 5.0, novinky jazyka a upgrade aplikací](http://www.root.cz/knihy/java-5-0-novinky-jazyka-a-upgrade-aplikaci/stahnout/1037/) (PDF)
+
+
+###Git
+* [Pro Git](http://www.root.cz/knihy/pro-git/stahnout/1001/) (PDF)
+
+
+###Language Agnostic
+####Algoritmy a datové struktury
+* [Základy algoritmizace](http://www.root.cz/knihy/zaklady-algoritmizace/stahnout/950/) (PDF)
+
+
+####Bezpečnost
+* [Báječný svět elektronického podpisu](http://www.root.cz/knihy/bajecny-svet-elektronickeho-podpisu/) (PDF)
+
+
+####Matematika
+* [Diskrétní matematika](http://math.feld.cvut.cz/habala/teaching/dma.htm) - Petr Habala (PDFs)
+* [Lineární algebra](ftp://math.feld.cvut.cz/pub/olsak/linal/linal.pdf) - Petr Olšák (PDF)
+* [Matematika SŠ](http://www.realisticky.cz/ucebnice.php?id=3) - Martin Krynický (PDFs)
+
+
+####Právo
+* [Internet jako objekt práva](http://www.root.cz/knihy/internet-jako-objekt-prava/) (PDF)
+
+
+####Regulární výrazy
+* [Regulární výrazy](http://www.root.cz/knihy/regularni-vyrazy/) (PDF)
+
+
+####Sítě
+* [Internetový protokol IPv6](http://www.root.cz/knihy/internetovy-protokol-ipv6-treti-vydani/) (PDF)
+
+
+###LaTeX
+* [Ne příliš stručný úvod do systému LaTeX 2e](http://www.root.cz/knihy/ne-prilis-strucny-uvod-do-systemu-latex-2e/) (PDF)
+
+
+###Linux
+* [Linux: Dokumentační projekt](http://www.root.cz/knihy/linux-dokumentacni-projekt/) (PDF)
+* [Učebnice ABCLinuxu](http://www.root.cz/knihy/ucebnice-abclinuxu/) (PDF)
+
+
+####Distribuce
+* [Mandriva Linux 2008 CZ](http://www.root.cz/knihy/mandriva-linux-2008-cz/) (PDF)
+* [Gentoo Handbook česky](http://www.root.cz/knihy/gentoo-handbook-cesky/) (PDF)
+* [Instalace a konfigurace Debian Linuxu](http://www.root.cz/knihy/instalace-a-konfigurace-debian-linuxu/) (PDF)
+* [SUSE Linux: uživatelská příručka](http://www.root.cz/knihy/suse-linux-uzivatelska-prirucka/) (PDF)
+* [Příručka uživatele Fedora 17](http://www.root.cz/knihy/prirucka-uzivatele-fedora-17/) (PDF)
+
+
+###OpenSource
+* [Tvorba open source softwaru](http://www.root.cz/knihy/tvorba-open-source-softwaru/stahnout/1303/) (PDF)
+* [Katedrála a tržiště](http://www.root.cz/knihy/katedrala-a-trziste/) (PDF)
+
+###PHP
+* [PHP Tvorba interaktivních internetových aplikací](http://www.kosek.cz/php/php-tvorba-interaktivnich-internetovych-aplikaci.pdf)
+
+###Python
+* [Ponořme se do Pythonu 3](http://www.root.cz/knihy/ponorme-se-do-pythonu-3/stahnout/1025/) (PDF)
+* [Učebnice jazyka Python](http://www.root.cz/knihy/ucebnice-jazyka-python/stahnout/920/) (PDF)
+
+
+###Ruby
+* [Ruby Tutoriál](http://www.root.cz/knihy/ruby-tutorial/stahnout/924/) (PDF)
+
+
+###TeX
+* [TeXbook naruby](http://www.root.cz/knihy/texbook-naruby/) (PDF)
+* [První setkání s TeXem](http://www.root.cz/knihy/prvni-setkani-s-texem/) (PDF)
+
+
+###XML
+* [XML pro každého](http://www.root.cz/knihy/xml-pro-kazdeho/) (PDF)
--- a/free-programming-books-de.md
+++ b/free-programming-books-de.md
@@ -14,6 +14,7 @@
 * [Javascript](#javascript)
 * [LaTeX](#latex)
 * [Meta-Lists](#meta-lists)
+* [MySQL](#mysql)
 * [PHP](#php)
 * [PostgreSQL](#postgresql)
 * [Python](#python)
@@ -27,7 +28,7 @@
 ###Unabhängig von der Programmiersprache
 * [IT-Handbuch für Fachinformatiker](http://openbook.galileocomputing.de/it_handbuch/)
 * [Objektorientierte Programmierung](http://openbook.galileocomputing.de/oop/)
-* [Scrum und XP im harten Projektalltag](http://www.infoq.com/resource/news/2007/06/scrum-xp-book/en/resources/ScrumAndXpFromTheTrenchesonline_German.pdf)
+* [Scrum und XP im harten Projektalltag](http://www.infoq.com/resource/news/2007/06/scrum-xp-book/en/resources/ScrumAndXpFromTheTrenchesonline_German.pdf) [PDF]


 ###Action Script
@@ -36,7 +37,7 @@


 ###Android
-* [Grundlagen und Programmierung](http://www.dpunkt.de/ebooks_files/free/3436.pdf)
+* [Grundlagen und Programmierung](http://www.dpunkt.de/ebooks_files/free/3436.pdf) [PDF]


 ###Assembly Language
@@ -45,14 +46,14 @@

 ###C
 * [C von A bis Z](http://openbook.galileocomputing.de/c_von_a_bis_z/)
-* [Softwareentwicklung in C](http://www.asc.tuwien.ac.at/~eprog/download/schmaranz.pdf)
+* [Softwareentwicklung in C](http://www.asc.tuwien.ac.at/~eprog/download/schmaranz.pdf) [PDF]


 ###C++
 * [Die Boost C++ Bibliotheken](http://www.highscore.de/cpp/boost/)
 * [Programmieren in C++: Einführung](http://www.highscore.de/cpp/einfuehrung/)
 * [Programmieren in C++: Aufbau](http://www.highscore.de/cpp/aufbau/)
-* [Softwareprogrammierung in C++] (http://www.iaik.tugraz.at/content/teaching/bachelor_courses/betriebssysteme/downloads/schmaranz2.pdf)
+* [Softwareprogrammierung in C++](http://www.iaik.tugraz.at/content/teaching/bachelor_courses/betriebssysteme/downloads/schmaranz2.pdf) [PDF]


 ###C Sharp
@@ -65,7 +66,7 @@
 ###iOS
 * [Apps programmieren für iPhone und iPad](http://openbook.galileocomputing.de/apps_programmieren_fuer_iphone_und_ipad/)
 * [iOS-Rezepte](http://examples.oreilly.de/openbooks/iosrecipesger.zip)
-* [iPad-Programmierung](http://examples.oreilly.de/openbooks/pdf_ipadprogpragger.pdf)
+* [iPad-Programmierung](http://examples.oreilly.de/openbooks/pdf_ipadprogpragger.pdf) [PDF]


 ###Git
@@ -79,14 +80,15 @@

 ### HTML & CSS
 * [HTML5-Handbuch](http://webkompetenz.wikidot.com/docs:html-handbuch)
-* [Self HTML](http://de.selfhtml.org/)
+* [Self HTML](http://de.selfhtml.org)
+* [HTML](http://peterkropff.de/site/html/html.htm) — Peter Kropff [Online, PDF]
+* [CSS](http://peterkropff.de/site/css/css.htm) — Peter Kropff (Grundlagen, OOP, MySQLi, PDO) [Online, PDF]


 ###Java
 * [EJB 3 für Umsteiger: Neuerungen und Änderungen gegenüber dem EJB-2.x-Standard](http://bsd.de/e3fu/umfrage.html) - Heiko W. Rupp
 * [Java 7 Mehr als eine Insel](http://openbook.galileocomputing.de/java7/)
 * [Java ist auch eine Insel](http://openbook.galileocomputing.de/javainsel/)
-* [JSFAtWork, JSF 2.0 und Apache MyFaces](http://jsfatwork.irian.at/book_de/)
 * [Programmieren Java: Einführung](http://www.highscore.de/java/einfuehrung/)
 * [Programmieren Java: Aufbau](http://www.highscore.de/java/aufbau/)

@@ -94,6 +96,7 @@
 ###Javascript
 * [JavaScript und AJAX](http://openbook.galileocomputing.de/javascript_ajax/)
 * [Webseiten erstellen mit Javascript](http://www.highscore.de/javascript/)
+* [JavaScript](http://peterkropff.de/site/javascript/javascript.htm) — Peter Kropff (Grundlagen, AJAX, DOM, OOP) [Online, PDF]


 ###LaTeX
@@ -104,13 +107,20 @@
 * [Galileo Computing - openbook](http://www.galileocomputing.de/katalog/openbook)


+###MySQL
+* [MySQL](http://peterkropff.de/site/mysql/mysql.htm) — Peter Kropff [Online, PDF]
+
+
 ###PHP
 * [PHP PEAR](http://openbook.galileocomputing.de/php_pear/)
-* [Praktischer Einstieg in MySQL mit PHP](http://examples.oreilly.de/openbooks/pdf_einmysql2ger.pdf)
+* [Praktischer Einstieg in MySQL mit PHP](http://examples.oreilly.de/openbooks/pdf_einmysql2ger.pdf) [PDF]
+* [PHP](http://peterkropff.de/site/php/php.htm) — Peter Kropff (Grundlagen, OOP, MySQLi, PDO) [Online, PDF]
+

 ###PostgreSQL
 * [PostgreSQL Einführung](http://cybertec.at/pgbook/)

+
 ###Python
 * [Python Das umfassende Handbuch](http://openbook.galileocomputing.de/python/)
 * [Programmiereinführung mit Python](http://opentechschool.github.io/python-beginners/de/)
@@ -118,18 +128,18 @@

 ###Ruby
 * [Programmieren mit Ruby](http://approximity.com/rubybuch2/)
-* [Ruby on Rails 2](http://openbook.galileocomputing.de/ruby_on_rails/)


 ###Ruby on Rails
-* [Praxiswissen Ruby](http://www.oreilly.de/german/freebooks/rubybasger/pdf_rubybasger.pdf)
-* [Praxiswissen Ruby On Rails](http://examples.oreilly.de/openbooks/pdf_rubyonrailsbasger.pdf)
-* [Rails Kochbuch](http://examples.oreilly.de/openbooks/pdf_railsckbkger.pdf)
+* [Praxiswissen Ruby](http://www.oreilly.de/german/freebooks/rubybasger/pdf_rubybasger.pdf) [PDF]
+* [Praxiswissen Ruby On Rails](http://examples.oreilly.de/openbooks/pdf_rubyonrailsbasger.pdf) [PDF]
+* [Rails Kochbuch](http://examples.oreilly.de/openbooks/pdf_railsckbkger.pdf) [PDF]
 * [Ruby on Rails 2](http://openbook.galileocomputing.de/ruby_on_rails/)
+* [Ruby on Rails 3.2 für Ein-, Um- und Quereinsteiger](http://ruby-auf-schienen.de/3.2/)


 ###Scilab
-* [Einführung in Scilab/Xcos 5.4](http://www.buech-gifhorn.de/scilab/Einfuehrung.pdf)
+* [Einführung in Scilab/Xcos 5.4](http://www.buech-gifhorn.de/scilab/Einfuehrung.pdf) [PDF]


 ###UML

--- a/free-programming-books-es.md
+++ b/free-programming-books-es.md
@@ -10,11 +10,13 @@
    * [Paradigmas de Programación](#paradigmas-de-programaci%C3%B3n)
    * [Sistemas Operativos](#sistemas-operativos)
 * [Android](#android)
+* [C](#C)
+* [C++](#c-1)
 * [CSS](#CSS)
 * [Coffeescript](#coffeescript)
-* [C++](#c)
 * [Emacs](#emacs)
 * [Ensamblador](#ensamblador)
+* [Erlang](#erlang)
 * [Git](#git)
 * [Haskell](#haskell)
 * [JavaScript](#javascript)
@@ -25,9 +27,13 @@
 * [.NET (C# Visual Studio)](#net-c--visual-studio)
 * [PHP](#php)
 * [Python](#python)
+    * [Django](#django)
+    * [Web2py](#web2py)
 * [Ruby](#ruby)
-* [Ruby on Rails](#ruby-on-rails)
+    * [Ruby on Rails](#ruby-on-rails)
 * [R](#R)
+* [Scala](#scala)
+* [SQL](#sql)


 ###Metalistas
@@ -41,6 +47,7 @@
 * [Algoritmos y Programación (Guía para docentes)](http://www.eduteka.org/pdfdir/AlgoritmosProgramacion.pdf) (PDF)
 * [Análisis de Algoritmos](http://docencia.izt.uam.mx/pece/pagina_academica/AA/indexa.html)
 * [Análisis y Diseño de Algoritmos](http://www.aliatuniversidades.com.mx/bibliotecasdigitales/pdf/sistemas/Analisis_y_disenio_de_algoritmos.pdf) (PDF)
+* [Apuntes de Algoritmos y Estructuras de Datos](https://sites.google.com/site/prog3unlp/home/exp_algoritmos.pdf?attredirects=0&d=1) (PDF)
 * [Aprenda a programar como si estuviera en primero](http://www1.ceit.es/asignaturas/Informat1/ayudainf/aprendainf/Programar/Programar.pdf) (PDF)
 * [Breves Notas sobre Análisis de Algoritmos](http://www.matematicas.unam.mx/jloa/publicaciones/analisisdeAlgoritmos.pdf) (PDF)
 * [Técnicas de Diseño de Algoritmos ](http://www.lcc.uma.es/~av/Libro/indice.html) ([PDF](http://www.lcc.uma.es/%7eav/Libro/Libro.zip))
@@ -67,6 +74,7 @@
 ####Metodologías de desarrollo de software
 * [Compendio de Ingeniería del Software](http://www.navegapolis.com/files/cis.pdf) (PDF)
 * [Diseño Ágil con TDD](http://www.dirigidoportests.com/el-libro)
+* [Ingeniería de Software: Una Guía para Crear Sistemas de Información](http://www.wolnm.org/apa/articulos/Ingenieria_Software.pdf) (PDF)
 * [Metodologías Ágiles para el Desarrollo de Software](http://www.desarrolloweb.com/manuales/metodologias-agil-desarrollo-software.html)
 * [Scrum y XP desde la trincheras](http://www.proyectalis.com/wp-content/uploads/2008/02/scrum-y-xp-desde-las-trincheras.pdf) (PDF)
 * [Scrum & Extreme Programming (para programadores)](http://www.cursosdeprogramacionadistancia.com/static/pdf/material-sin-personalizar-agile.pdf) (PDF)
@@ -75,6 +83,7 @@
 ####Misceláneos
 * [97 cosas que todo programador debería saber](http://97cosas.com/programador)
 * [El camino a un mejor programador](http://emanchado.github.io/camino-mejor-programador/)
+* [Videojuegos Multiplataforma con OpenFL](http://www.openflbook.com/)


 ####Paradigmas de Programación
@@ -90,6 +99,14 @@
 ###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

+###C
+* [Introducción a la programación con C](http://repositori.uji.es/xmlui/bitstream/handle/10234/24306/s29.pdf)
+* [GNU/Linux: Programación de Sistemas](http://www.alcancelibre.org/filemgmt_data/files/programaciongnulinux.pdf) (PDF)
+
+
+###C++
+* [Ejercicios de programación creativos y recreativos en C++](http://antares.sip.ucm.es/cpareja/libroCPP/)
+

 ###CSS
 * [CSS avanzado](http://librosweb.es/css_avanzado/)
@@ -102,10 +119,6 @@
 * [Coffeescript, un pequeño gran libro – Javi Jiménez](https://leanpub.com/coffeescript)


-###C++
-* [Ejercicios de programación creativos y recreativos en C++](http://antares.sip.ucm.es/cpareja/libroCPP/)
-
-
 ###Emacs
 * [Emacs: Iniciación a la edición](http://www.rpublica.net/emacs/emacs.html)

@@ -115,6 +128,11 @@
 * [Lenguaje Ensamblador para PC - Paul Carter](http://drpaulcarter.com/pcasm/)


+###Erlang
+* [Erlang/OTP: Un mundo concurrente](http://erlang-otp.es/)
+* [Programación en Erlang](https://es.wikibooks.org/wiki/Programaci%C3%B3n_en_Erlang) en Wikibooks
+
+
 ###Git
 * [Git Immersion en Español](http://gitimmersion.mx)
 * [Gitmagic](http://www-cs-students.stanford.edu/~blynn/gitmagic/intl/es/)
@@ -157,7 +175,8 @@

 ###.NET (C# / Visual Studio)
 * [El lenguaje de programación C#](http://dis.um.es/~bmoros/privado/bibliografia/LibroCsharp.pdf) (PDF)
-* [Introducción a C#](http://zarza.usal.es/~fgarcia/docencia/poo/04-05/Trabajos/C_Sharp.pdf) (PDF)
+* [Guía de Arquitectura N-capas Orientadas al Dominio](http://msdn.microsoft.com/es-es/architecture/default.aspx)
+


 ###PHP
@@ -175,7 +194,7 @@
 * [El tutorial de Python](http://tutorialpython.com.ar)
 * [Inmersión en Python](http://es.diveintopython.net/toc.html)
 * [Inmersión en Python 3](http://inmersionenpython3.googlecode.com/files/inmersionEnPython3.0.11.pdf) (PDF)
-* [Introducción a la programación con Python](http://www.uji.es/bin/publ/edicions/ippython.pdf) (PDF)
+* [Introducción a la programación con Python](http://repositori.uji.es/xmlui/bitstream/handle/10234/24305/s23.pdf) (PDF)
 * [Introducción a Programando con Python](http://opentechschool.github.io/python-beginners/es_CL/)
 * [Python instantáneo](http://www.arrakis.es/~rapto/AprendaPython.html)
 * [Python para ciencia e ingeniería](https://github.com/mgaitan/python-ingenieria)
@@ -183,12 +202,20 @@
 * [Python para principiantes (PDF)](http://www.cursosdeprogramacionadistancia.com/static/pdf/material-sin-personalizar-python.pdf) [(HTML)](http://librosweb.es/libro/python/)


+####Django
+* [El libro de Django 1.0](http://django-book.mkaufmann.com.ar/)
+
+
+####Web2py
+* [Web2py - Manual de Referencia Completo, 5a Edición](http://www.web2py.com/books/default/chapter/41)
+
+
 ###Ruby
 * [Guía para aprender a programar con Ruby. Adaptación al español del libro "Learn to Program" de Chris Pine](https://github.com/rubyperu/aprende.a.programar)
 * [Ruby en 20 minutos](https://www.ruby-lang.org/es/documentation/quickstart/)


-###Ruby on Rails
+####Ruby on Rails
 * [El maldito libro de los Descarrilados](http://yottabi.com/mld.pdf) (PDF)


@@ -202,3 +229,12 @@
 * [Optimización Matemática con R: Volumen I](http://cran.r-project.org/doc/contrib/Optimizacion_Matematica_con_R_Volumen_I.pdf)
 * [R para Principiantes](http://cran.r-project.org/doc/contrib/rdebuts_es.pdf)

+
+###Scala
+* [Escala con Ejemplos](https://github.com/ErunamoJAZZ/ScalaByExample-es) (En proceso)
+* [Manual de Scala para programadores Java](http://www.scala-lang.org/docu/files/ScalaTutorial-es_ES.pdf) (PDF)
+
+
+###SQL
+* [Tutorial de SQL](http://www.desarrolloweb.com/manuales/9/)
+
--- a/free-programming-books-fr.md
+++ b/free-programming-books-fr.md
@@ -6,7 +6,6 @@
    * [Logiciels libres](#logiciels-libres)
    * [Makefile](#makefile)
    * [Méthodes de développment](#méthodes-de-développement)
-    * [Systèmes informatiques](#systèmes-informatiques)
    * [Théorie des langages](#théorie-des-langages)
 * [Assembleur](#assembleur)
 * [Bash / Shell](#bash--shell)
@@ -36,7 +35,7 @@


 ###Méta-listes
-* [Le SILO: Sciences du numérique &amp; Informatique au Lycée: Oui!](https://wiki.inria.fr/sciencinfolycee/Accueil) 
+* [Le SILO: Sciences du numérique &amp; Informatique au Lycée: Oui!](https://wiki.inria.fr/sciencinfolycee/Accueil)


 ###Non dépendant du langage
@@ -68,10 +67,6 @@
 * [Scrum et XP depuis les tranchées](http://www.infoq.com/resource/news/2007/06/scrum-xp-book/en/resources/ScrumAndXpFromTheTrenches_French.pdf), par Henrik Kniberg


-####Systèmes Informatiques
-* [Systèmes Informatiques (C, Unix/Linux,...)](http://sinf1252.info.ucl.ac.be/), par Olivier Bonaventure ([sources](https://github.com/obonaventure/SystemesInformatiques))
-
-
 ####Théorie des langages
 * [Compilation. Théorie des langages](http://www.lisyc.univ-brest.fr/pages_perso/leparc/Etud/Master/Compil/Doc/CoursCompilation.pdf) par Université de Bretagne Occidentale

@@ -85,7 +80,6 @@


 ###Caml
-* [Introduction à Objective Caml](http://form-ocaml.forge.ocamlcore.org/html/index.html), par Maxence Guesdon
 * [Le language Caml](http://caml.inria.fr/)


@@ -185,7 +179,7 @@ Voir aussi [TeX](#tex)


 ###Sage
-* [Calcul mathématique avec Sage](http://sagebook.gforge.inria.fr/), par A. Casamayou, N. Cohen, G. Connan, T. Dumont, L. Fousse, F. Maltey, M. Meulien, M. Mezzarobba, C. Pernet, N. M. Thiéry, P. Zimmermann 
+* [Calcul mathématique avec Sage](http://sagebook.gforge.inria.fr/), par A. Casamayou, N. Cohen, G. Connan, T. Dumont, L. Fousse, F. Maltey, M. Meulien, M. Mezzarobba, C. Pernet, N. M. Thiéry, P. Zimmermann


 ###Scilab
@@ -203,5 +197,4 @@ Voir aussi [LaTeX](#latex)


 ###Vim
-* [A Byte of Vim](http://swaroopch.com/notes/Vim_fr/)
 * [Learn Vim Progressively](http://yannesposito.com/Scratch/fr/blog/Learn-Vim-Progressively/)
--- a/free-programming-books-id.md
+++ b/free-programming-books-id.md
 ###Index

-* [JAVA](#java)
 * [HTML & CSS](#html-css)
 * [Javascript](#javascript)
 * [PHP](#php)

-###java
-* [JENI Programming](http://www.taryo.net/free-e-book-pemrograman-java-edisi-indonesia-lengkap.html)
-
 ###html-css
 * [Belajar HTML dan CSS](http://www.ariona.net/ebook-belajar-html-dan-css/)


--- a/free-programming-books-it.md
+++ b/free-programming-books-it.md
@@ -27,7 +27,6 @@

 ####Algoritmi e Strutture Dati
 * [Dispense del Corso di Algoritmi e Strutture Dati](http://www.dmi.unict.it/nicosia/lectures/programmazione-scientifica/algo.pdf)
-* [Algoritmi e Strutture Dati](http://homes.di.unimi.it/~bertoni/Algoritmi%20e%20Strutture%20Dati.pdf)


 ###Android

--- a/free-programming-books-ja.md
+++ b/free-programming-books-ja.md
@@ -39,6 +39,7 @@
 * [Lua](#lua)
 * [Maven](#maven)
 * [Mercurial](#mercurial)
+* [ML](#ml)
 * [NoSQL](#nosql)
 * [Objective-C](#objective-c)
 * [OCaml](#ocaml)
@@ -320,6 +321,8 @@
 * [Mercurial: The Definitive Guide](http://foozy.bitbucket.org/hgbook-ja/index.ja.html) - Bryan O'Sullivan, 藤原克則(翻訳)
 * [Mercurial チュートリアル hginit.com の和訳](http://d.hatena.ne.jp/mmitou/20100501/1272680474) - Joel Spolsky, id:mmitou(翻訳)

+###ML
+* [ATSプログラミング入門](http://jats-ug.metasepi.org/doc/ATS2/INT2PROGINATS/index.html)

 ###NoSQL
 * [MongoDBの薄い本](http://www.cuspy.org/diary/2012-04-17/the-little-mongodb-book-ja.pdf) (PDF) - Karl Seguin, 濱野司(翻訳)
@@ -381,7 +384,7 @@
 * [Python 2.7.2 ドキュメント日本語訳](http://docs.python.jp/2.7/) - Python Software Foundation
 * [Python の学習](http://skitazaki.github.io/python-school-ja/index.html) - KITAZAKI Shigeru
 * [Google Python スタイルガイド](http://works.surgo.jp/translation/pyguide.html) - Amit Patel, Antoine Picard, Eugene Jhong, Jeremy Hylton, Matt Smart, Mike Shields, Kosei Kitahara(翻訳)
-* [機械学習の Python との出会い (Machine Learning Meets Python)](http://www.kamishima.net/mlmpyja/) ([PDF](http://www.kamishima.net/archive/mlmpyja.pdf), [EPUB](http://www.kamishima.net/archive/mlmpyja.epub))- 神嶌敏弘
+* [機械学習の Python との出会い (Machine Learning Meets Python)](http://www.kamishima.net/mlmpyja/) [PDF](http://www.kamishima.net/archive/mlmpyja.pdf), [EPUB](http://www.kamishima.net/archive/mlmpyja.epub) - 神嶌敏弘
 * [The Programming Historian](https://sites.google.com/site/theprogramminghistorianja/) - William J. Turkel, Alan MacEachern, @moroshigeki(翻訳), @historyanddigi(翻訳), @Say\_no(翻訳), @knagasaki(翻訳), @mak\_goto(翻訳)
 * [Python Scientific Lecture Notes (一部翻訳)](http://turbare.net/transl/scipy-lecture-notes/) - 打田旭宏(翻訳)
 * [Notes on scientific computing with python](http://japanichaos.appspot.com/) - 花田康高

--- a/free-programming-books-pl.md
+++ b/free-programming-books-pl.md
@@ -2,12 +2,15 @@
 * [Niezależne od języka programowania](#niezale%C5%BCne-od-j%C4%99zyka-programowania)
 * [C](#c)
 * [C++](#c-1)
+* [CSS](#css)
 * [Common Lisp](#common-lisp)
 * [Haskell](#haskell)
+* [HTML](#html)
 * [Java](#java)
 * [JavaScript](#javascript)
 * [LaTeX](#latex)
 * [PHP](#php)
+* [Prolog](#prolog)
 * [Python](#python)
 * [Ruby](#ruby)
 * [SQL](#sql)
@@ -16,6 +19,7 @@
 ###Niezależne od języka programowania
 * [W obronie wolności](http://stallman.helion.pl)
 * [Git](http://pl.wikibooks.org/wiki/Git)
+* [Pro Git](http://git-scm.com/book/pl)
 * [SVN](http://pl.wikibooks.org/wiki/Subversion)
 * [System kontroli wersji Subversion](http://svnbook.opensys.pl)
 * [Pisanie OS](http://pl.wikibooks.org/wiki/Pisanie_OS)
@@ -29,10 +33,13 @@
 ###C++
 * [Kurs C++](http://cpp0x.pl/kursy/Kurs-C++/1)
 * [Zaawansowane C++](http://wazniak.mimuw.edu.pl/index.php?title=Zaawansowane_CPP)
-* [OpenGL w C++](http://cpp0x.pl/kursy/Kurs-OpenGL-C++/)
 * [Megatutorial "Od zera do gier kodera"](http://xion.org.pl/productions/texts/coding/megatutorial/)


+###CSS
+* [Moja pierwsza strona internetowa w HTML5 i CSS3](http://ferrante.pl/books/html/)
+
+
 ###Common Lisp
 * [Kurs programowania w języku Common Lisp](http://jcubic.pl/lisp_tutorial.php)

@@ -41,6 +48,10 @@
 * [Haskell](http://pl.wikibooks.org/wiki/Haskell)


+###HTML
+* [Moja pierwsza strona internetowa w HTML5 i CSS3](http://ferrante.pl/books/html/)
+
+
 ###Java
 * [Java start](http://javastart.pl/)

@@ -56,6 +67,11 @@

 ###PHP
 * [PHP](http://pl.wikibooks.org/wiki/PHP)
+* [PHP: The Right Way](http://pl.phptherightway.com/)
+
+
+###Prolog
+* [Programowanie w logice z ograniczeniami: Łagodne wprowadzenie dla platformy ECLiPSe](http://www.pwlzo.pl/)


 ###Python

--- a/free-programming-books-pt_BR.md
+++ b/free-programming-books-pt_BR.md
@@ -3,10 +3,12 @@
 * [Engenharia de software](#engenharia-de-software)
    * [Metodologias de Desenvolvimento de Software](#metodologias-de-desenvolvimento-de-software)
 * [Git](#git)
+* [Grunt](#grunt)
 * [Haskell](#haskell)
 * [HTML / CSS](#html--css)
 * [Java](#java)
 * [JavaScript](#javascript)
+* [PHP](#php)
 * [LaTeX](#latex)
 * [Python](#python)
 * [Ruby](#ruby)
@@ -15,18 +17,26 @@

 ###C
 * [Introdução a Programação](https://github.com/edusantana/introducao-a-programacao-livro/releases) - livro adotado na UFPB.
-
+* [Projeto de Algoritmos em C](http://www.ime.usp.br/~pf/algoritmos/).
+* [Introdução ao Curso de C ](http://www.ic.unicamp.br/~mc102/introducao-ao-curso-de-c.html).
+* [O Fantástico Mundo da Linguagem C] (https://fiorix.wordpress.com/2014/04/12/livro-sobre-c-e-linux/)

 ###Engenharia de Software
 ####Metodologias de Desenvolvimento de Software
+* [Kanban e Scrum - obtendo o melhor de ambos](http://www.infoq.com/br/minibooks/kanban-scrum-minibook)
+* [Kanban em 10 Passos](http://www.infoq.com/br/minibooks/priming-kanban-jesper-boeg)
 * [Scrum e XP direto das Trincheiras](http://www.infoq.com/br/minibooks/scrum-xp-from-the-trenches)


 ###Git
+* [Aprendendo Git](http://www.slideshare.net/bismarckjunior/aprendendo-git)
 * [Git Magic](http://www-cs-students.stanford.edu/~blynn/gitmagic/intl/pt_br/)
 * [Pro Git](http://git-scm.com/book/pt-br)


+###Grunt
+* [Grunt - Voce deveria estar usando](http://tableless.com.br/grunt-voce-deveria-estar-usando/)
+
 ###Haskell
 * [Aprender o Haskell será um grande bem para você(tradução em andamento)](https://github.com/taylorrf/learnhaskell)

@@ -34,6 +44,8 @@
 ###HTML / CSS
 * [Estruturando o HTML com CSS](http://pt-br.learnlayout.com/)
 * [Dive Into HTML5](http://diveintohtml5.com.br/)
+* [Desenvolvendo para browsers antigos](http://tableless.com.br/browsers-antigos-guerra-contra-o-terror/)
+* [Curso de HTML5 em vídeo do Guanabara](http://www.youtube.com/playlist?list=PLHz_AreHm4dlAnJ_jJtV29RFxnPHDuk9o)


 ###Java
@@ -47,7 +59,11 @@
 * [Eloquent Javascript PT-BR](https://leanpub.com/eloquentejavascript)
 * [Fundamentos de jQuery](http://herberthamaral.com/posts/2013-02-25-sobre-o-jquery-fundamentals.html)
 * [Guia Rápido de Desenvolvimento para Firefox OS: Criando apps com HTML5 para o Firefox OS](https://leanpub.com/guiarapidofirefoxos)
+* [Node.js para Leigos](http://udgwebdev.com/nodejs)
+* [Tudo sobre Meteor](http://udgwebdev.com/meteor)

+###Php
+* [PHP](http://www.etelg.com.br/paginaete/downloads/informatica/php.pdf)

 ###LaTeX
 * [Introdução ao LaTeX 2 - Ou LaTeX 2 em 105 minutos](http://ctan.org/pkg/lshort-portuguese-br)
@@ -56,6 +72,7 @@
 ###Python
 * [A Byte of Python](http://rodrigoamaral.net/a-byte-of-python/)
 * [Python para Desenvolvedores](http://ark4n.files.wordpress.com/2010/01/python_para_desenvolvedores_2ed.pdf)
+* [O tutorial de Python](http://turing.com.br/pydoc/2.7/tutorial/)


 ###Ruby
@@ -66,5 +83,6 @@
 * [Tutorial de Ruby](http://dl.dropbox.com/u/1482800/eustaquiorangel.com/tutorialruby.pdf)


+
 ###Shell
 * [Introdução ao Shell Script](http://aurelio.net/shell/apostila-introducao-shell.pdf)
--- a/free-programming-books-pt_PT.md
+++ b/free-programming-books-pt_PT.md
 ##Indice
-* [Revistas](#revistas)
-  * [Programar](#revista-programar)
 * [Livros e Textos Académicos](#livros)
  * [C/C++](#cc)
  * [CSS](#css)
@@ -10,52 +8,6 @@
  * [LaTeX](#latex)


-## Revistas
-### Revista Programar
-* [1ª Edição - Começar a programar (Março de 2006)](http://www.revista-programar.info/?action=editions&type=viewmagazine&n=1) (PDF)
-* [2ª Edição - Iniciação à programação em Visual Basic (Maio de 2006)](http://www.revista-programar.info/?action=editions&type=viewmagazine&n=2) (PDF)
-* [3ª Edição - Segurança e hacking: Scripts NASL (Julho de 2006)](http://www.revista-programar.info/?action=editions&type=viewmagazine&n=3) (PDF)
-* [4ª Edição - Microcontroladores (Setembro de 2006)](http://www.revista-programar.info/?action=editions&type=viewmagazine&n=4) (PDF)
-* [5ª Edição - Base de Dados (Novembro de 2006)](http://www.revista-programar.info/?action=editions&type=viewmagazine&n=5) (PDF)
-* [6ª Edição - Scheme (Janeiro de 2007)](http://www.revista-programar.info/?action=editions&type=viewmagazine&n=6) (PDF)
-* [7ª Edição - Introdução ao WML (WAP) (Março de 2007)](http://www.revista-programar.info/?action=editions&type=viewmagazine&n=7) (PDF)
-* [8ª Edição - Windows Vista para Programadores (Maio de 2007)](http://www.revista-programar.info/?action=editions&type=viewmagazine&n=8) (PDF)
-* [9ª Edição - AJAX & PHP (Julho 2007)](http://www.revista-programar.info/?action=editions&type=viewmagazine&n=9) (PDF)
-* [10ª Edição - Iniciação ao Assembly x86 (Setembro de 2007)](http://www.revista-programar.info/?action=editions&type=viewmagazine&n=10) (PDF)
-* [11ª Edição - Programação Concorrente em Ambientes UNIX (Novembro de 2007)](http://www.revista-programar.info/?action=editions&type=viewmagazine&n=11) (PDF)
-* [12ª Edição - Programação Orientada a Objectos em C# (Janeiro de 2008)](http://www.revista-programar.info/?action=editions&type=viewmagazine&n=12) (PDF)
-* [13ª Edição - Assinaturas Digitais em XML (Março de 2008)](http://www.revista-programar.info/?action=editions&type=viewmagazine&n=13) (PDF)
-* [14ª Edição - Reflection (Maio 2008)](http://www.revista-programar.info/?action=editions&type=viewmagazine&n=14) (PDF)
-* [15ª Edição - Estado de Visualização em ASP.NET (Agosto 2008)](http://www.revista-programar.info/?action=editions&type=viewmagazine&n=15) (PDF)
-* [16ª Edição - Visual Studio 2008 e .NET Framework 3.5 (Outubro 2008)](http://www.revista-programar.info/?action=editions&type=viewmagazine&n=16) (PDF)
-* [17ª Edição - Subversion: Controlo total sobre o software (Dezembro 2008)](http://www.revista-programar.info/?action=editions&type=viewmagazine&n=17) (PDF)
-* [18ª Edição - Cloud Computing (Fevereiro 2009)](http://www.revista-programar.info/?action=editions&type=viewmagazine&n=18) (PDF)
-* [19ª Edição - Google Web Toolkit (Abril 2009)](http://www.revista-programar.info/?action=editions&type=viewmagazine&n=19) (PDF)
-* [20ª Edição - Metaprogramação em C++ (Junho 2009)](http://www.revista-programar.info/?action=editions&type=viewmagazine&n=20) (PDF)
-* [21ª Edição - Construção de Diagramas de Blocos (Setembro 2009)](http://www.revista-programar.info/?action=editions&type=viewmagazine&n=21) (PDF)
-* [22ª Edição - Computação em Grid (Novembro 2009)](http://www.revista-programar.info/?action=editions&type=viewmagazine&n=22) (PDF)
-* [23ª Edição - Introdução à Programação para Android (Março 2010)](http://www.revista-programar.info/?action=editions&type=viewmagazine&n=23) (PDF)
-* [24ª Edição - Introdução a Bases de Dados para Objectos (Junho 2010)](http://www.revista-programar.info/?action=editions&type=viewmagazine&n=24) (PDF)
-* [25ª Edição - Pong com Slick2D em Java (Setembro 2010)](http://www.revista-programar.info/?action=editions&type=viewmagazine&n=25) (PDF)
-* [26ª Edição - LINQ:TakeLast, TakeLastWhile, SkipLast e SkipLastWhile (Dezembro 2010)](http://www.revista-programar.info/?action=editions&type=viewmagazine&n=26) (PDF)
-* [27ª Edição - Introdução ao ASP .NET MVC 3.0 (Fevereiro 2011)](http://www.revista-programar.info/?action=editions&type=viewmagazine&n=27) (PDF)
-* [28ª Edição - Business Connectivity Services (Abril 2011)](http://www.revista-programar.info/?action=editions&type=viewmagazine&n=28) (PDF)
-* [29ª Edição - GIT - Controlo de Versões para Pequenos e Grandes Projectos (Junho 2011)](http://www.revista-programar.info/?action=editions&type=viewmagazine&n=29) (PDF)
-* [30ª Edição - Introdução ao Ruby on Rails (Agosto 2011)](http://www.revista-programar.info/?action=editions&type=viewmagazine&n=30) (PDF)
-* [31ª Edição - NHibernate (Outubro 2011)](http://www.revista-programar.info/?action=editions&type=viewmagazine&n=31) (PDF)
-* [32ª Edição - iOS, Cocoa Touch & MVC (Dezembro 2011)](http://www.revista-programar.info/?action=editions&type=viewmagazine&n=32) (PDF)
-* [33ª Edição - Kinect Hack (Fevereiro 2012)](http://www.revista-programar.info/?action=editions&type=viewmagazine&n=33) (PDF)
-* [34ª Edição - Mobile World (Abril 2012)](http://www.revista-programar.info/?action=editions&type=viewmagazine&n=34) (PDF)
-* [35ª Edição - Tema de capa Desenvolvimento de Aplicações Web Ricas (RIA) com Ext JS 4 e Rails 3 (Junho 2012)](http://www.revista-programar.info/?action=editions&type=viewmagazine&n=35) (PDF)
-* [36ª Edição - As Novidades do Visual Studio 2012 RC (Agosto 2012)](http://www.revista-programar.info/?action=editions&type=viewmagazine&n=36) (PDF)
-* [37ª Edição - Makefiles (Outubro 2012)](http://www.revista-programar.info/?action=editions&type=viewmagazine&n=37) (PDF)
-* [38ª Edição - Introdução à Programação em CUDA  (Dezembro 2012)](http://www.revista-programar.info/?action=editions&type=viewmagazine&n=38) (PDF)
-* [39ª Edição - Windows 8 Store Apps - Do sonho à realidade (Fevereiro 2013)](http://www.revista-programar.info/?action=editions&type=viewmagazine&n=39) (PDF)
-* [40ª Edição - Estruturas vs Objetos (Abril 2013)](http://www.revista-programar.info/?action=editions&type=viewmagazine&n=40) (PDF)
-* [41ª Edição - Java EE & Java Web (Junho 2013)](http://www.revista-programar.info/?action=editions&type=viewmagazine&n=41) (PDF)
-* [42ª Edição - Web Persistente/Local Storage (Setembro 2013)](http://www.revista-programar.info/?action=editions&type=viewmagazine&n=42) (PDF)
-
-
 ## Livros
 ### C/C++
 * [Apontamentos de Programação em C/C++](http://www.dei.isep.ipp.pt/~pbsousa/aulas/ano_0/2006_07/c/Sebenta-cpp-03-2006.pdf) (PDF) - Paulo Baltarejo e Jorge Santos

--- a/free-programming-books-ro.md
+++ b/free-programming-books-ro.md
+###Index
+* [Ajaxa](#ajax)
+* [CSS](#css)
+* [HTML](#hmtl)
+* [Java](#java)
+* [JavaScript](#javascript)
+* [MySQL](#mysql)
+* [PHP](#php)
+* [XHTML](#xhtml)
+
+
+###Ajax
+* [Ajax](http://etutoriale.ro/articles/1483/1/Tutorial-Ajax/)
+
+
+###CSS
+* [CSS](http://www.tutorialeweb.net/css/)
+
+
+###HMTL
+* [HTML](http://tutorialehtml.com/htmlt)
+
+
+###Java
+* [Curs practic de Java](http://web.info.uvt.ro/~iordan/PIII/Cristian_Frasinaru-Curs_practic_de_Java.pdf) - Cristian Frasinaru [PDF]
+
+
+###JavaScript
+* [JavaScript](http://www.tutorialeweb.net/javascript/)
+
+
+###MySQL
+* [MySQL](http://profs.info.uaic.ro/~busaco/teach/courses/net/docs/mysql-ro.pdf)
+
+
+###PHP
+* [PHP](http://www.tutorialeweb.net/php/)
+* [PHP](http://php.punctsivirgula.ro)
+
+
+###XHTML
+* [XHTML](http://www.tutorialeweb.net/xhtml/)
--- a/free-programming-books-ru.md
+++ b/free-programming-books-ru.md
@@ -104,6 +104,7 @@


 ###Git
+* [Простое руководство по работе с Git](http://rogerdudler.github.io/git-guide/index.ru.html)
 * [Волшебство Git](http://www-cs-students.stanford.edu/~blynn/gitmagic/intl/ru/)
 * [Pro Git](http://git-scm.com/book/ru)

@@ -114,6 +115,7 @@

 ###Haskell
 * [Developing Web Applications with Haskell and Yesod](https://bitbucket.org/darkus/yesod/downloads) - Майкл Сноймен
+* [О Haskell по-человечески](http://ohaskell.ru/) - Денис Шевченко


 ###LaTeX
@@ -136,11 +138,14 @@


 ###Perl
-* [Pragmatic Perl (журнал)](http://pragmaticperl.com)
+* [Введение в Perl](http://www.opennet.ru/docs/RUS/perl-maslov/) - Маслов Владимир Викторович
+* [Краткий экскурс в Perl-программирование](http://www.opennet.ru/docs/RUS/perl_help/) - Докучаев Дмитрий
+* [Pragmatic Perl](http://pragmaticperl.com) - журнал


 ###PHP
 * [Руководство по PHP](http://docs.php.net/manual/ru/)
+* [PHP: Правильный Путь](http://getjump.github.io/ru-php-the-right-way/)
 * [Самоучитель (учебник) по PHP](http://www.php-s.ru/self-teacher/)


@@ -165,8 +170,10 @@


 ###Ruby
+* [Ruby за двадцать минут](https://www.ruby-lang.org/ru/documentation/quickstart/)
 * [Ruby](https://github.com/Krugloff/rus_ruby_book) - Круглов А.
 * [Ruby](http://ru.wikibooks.org/wiki/Ruby) - Викиучебник
+* [Учись программировать](http://www.shokhirev.com/mikhail/ruby/ltp/title.html) - Крис Пайн


 ###RSpec
@@ -174,8 +181,8 @@


 ###Ruby on Rails
-* [Ruby on Rails Guides](http://rusrails.ru)
-* [Ruby on Rails Tutorial](http://railstutorial.ru)
+* [Ruby on Rails Tutorial. Изучение Rails на Примерах](http://railstutorial.ru/chapters/4_0/beginning) Майкл Хартл
+* [Ruby on Rails по-русски](http://rusrails.ru)


 ###Scala
@@ -201,7 +208,7 @@

 ###Vim
 * [Просто о Vim](http://rus-linux.net/MyLDP/BOOKS/Vim/prosto-o-vim.pdf)
-
+* [Поваренная Книга Vim](http://www.opennet.ru/docs/RUS/vim_cookbook/) - Steve Oualline

 ###Parallel
 * [Параллельные технологии](http://www.inp.nsk.su/~baldin/Parallel/index.html)
--- a/free-programming-books-tr.md
+++ b/free-programming-books-tr.md
@@ -3,6 +3,7 @@
 * [D](#d)
 * [Fortran](#fortran)
 * [Git](#git)
+* [Go](#go)
 * [Java](#java)
 * [JavaScript](#javascript)
 * [LaTeX](#latex)
@@ -28,6 +29,9 @@
 ###Git
 * [git - basit rehber](http://rogerdudler.github.io/git-guide/index.tr.html)

+###Go
+* [Go Turu](http://tur.a.golang.org.tr)
+
 ###Java
 * [Java Yazılım Tasarımı](http://tdsoftware.net/2011/09/23/java-yazalim-tasarimi-kitabi-pdf/)

@@ -37,7 +41,6 @@

 ###LaTeX
 * [İnce bir LaTeX2ε Elkitabı](http://www.ctan.org/tex-archive/info/lshort/turkish)
- 

 ###Linux
 * [UNIX/Linux Sistem Programlama Kurs Notları](http://www.kaanaslan.com/resource/course_note/course_note.php)

--- a/free-programming-books-zh.md
+++ b/free-programming-books-zh.md
 ###目录
 * [在线教育](#在线教育)
 * [软件开发方法](#%e8%bd%af%e4%bb%b6%e5%bc%80%e5%8f%91%e6%96%b9%e6%b3%95)
+* [操作系统](#操作系统)
 * [HTML / CSS](#html--css)
 * [版本控制](#版本控制)
 * [Ruby](#ruby)
@@ -11,6 +12,9 @@
 * [Scala](#scala)
 * [Shell](#shell)
 * [Database](#database)
+* [Golang](#golang)
+* [Python](#python)
+* [Visual Prolog](#visual-prolog)


 ###在线教育
@@ -19,12 +23,15 @@
 * [Udacity](https://www.udacity.com/)
 * [xuetangX](https://www.xuetangx.com/)
 * [Codecademy](http://www.codecademy.com/?locale_code=zh)
+* [CodeSchool](https://www.codeschool.com/)


 ###软件开发方法
 * [硝烟中的 Scrum 和 XP](http://www.infoq.com/cn/minibooks/scrum-xp-from-the-trenches)
 * [文章《Functional Programming For The Rest of Us》的中文翻译](https://github.com/justinyhuang/Functional-Programming-For-The-Rest-of-Us-Cn)

+###操作系统
+* [UNIX TOOLBOX](http://cb.vu/unixtoolbox_zh_CN.xhtml)

 ###HTML / CSS
 * [学习CSS布局](http://zh.learnlayout.com/)
@@ -73,3 +80,16 @@

 ### Database
 * [The Little MongoDB Book 中文版](https://github.com/justinyhuang/the-little-mongodb-book-cn)
+* [Redis 设计与实现](http://www.redisbook.com)
+
+### Golang
+* [Go Web编程](https://github.com/astaxie/build-web-application-with-golang)
+* [Go编程基础](https://github.com/Unknwon/go-fundamental-programming)
+
+### Python
+* [深入Python](http://woodpecker.org.cn/diveintopython/)
+* [笨办法学 Python](http://sebug.net/paper/books/LearnPythonTheHardWay/)
+
+### Visual Prolog
+* [Visual Prolog 7边练边学](http://wiki.visual-prolog.com/index.php?title=Visual_Prolog_for_Tyros_in_Chinese)
+* [Visual Prolog 7初学指南](http://wiki.visual-prolog.com/index.php?title=A_Beginners_Guide_to_Visual_Prolog_in_Chinese)
--- a/free-programming-books.md
+++ b/free-programming-books.md
--- a/free-programming-interactive-tutorials-en.md
+++ b/free-programming-interactive-tutorials-en.md
@@ -61,6 +61,10 @@
 * [Interactive Tutorials for MATLAB, Simulink, Signal Processing, Controls, and Computational Mathematics](http://www.mathworks.com/tutorials)


+###Node
+* [Node School](http://nodeschool.io/)
+
+
 ###NoSQL
 * [MongoDB Koans](https://github.com/chicagoruby/MongoDB_Koans)
 * [Try Redis](http://try.redis.io/)

--- a/javascript-frameworks-resources.md
+++ b/javascript-frameworks-resources.md
@@ -11,6 +11,7 @@
 * [egghead.io: Learn AngularJS with Tutorial Videos & Training](http://egghead.io)
 * [egghead.io youtube channel: Learn AngularJS with Tutorial Videos & Training](https://www.youtube.com/user/johnlindquist)
 * [Mastering AngularJS Directives](http://pascalprecht.github.com/slides/mastering-angularjs-directives/)
+* [Seven-Part Introduction to Angular](http://ngokevin.com/blog/angular-1)
 * [Unit Testing Best Practices in AngularJS](http://andyshora.com/unit-testing-best-practices-angularjs.html)


@@ -37,6 +38,8 @@
 * [Ember.js - Getting started](http://emberjs.com/guides/getting-started/)
 * [Ember 101](http://ember101.com/)
 * [Let's Learn Ember](http://freecourses.tutsplus.com/lets-learn-ember/)
+* [EmberFlare](https://emberflare.com/)
+* [Ember App with RailsApi](http://reefpoints.dockyard.com/ember/2013/01/07/building-an-ember-app-with-rails-api-part-1.html)


 ## Knockout.js