Merge branch 'master' of github.com:vhf/free-programming-books

TODO.md

@@ -1,32 +1,32 @@
 TODO
 ===
 
-- [ ] : Add new books
+- [ ] Add new books
-- [x] : Wiki
+- [x] Wiki
-    - [x] : How to Contribute
+    - [x] How to Contribute
-    - [x] : Link to License
+    - [x] Link to License
-- [x] : Readme.md
+- [x] Readme.md
-    - [x] : Better symantics
+    - [x] Better symantics
-    - [x] : Links to other Files
+    - [x] Links to other Files
-    - [x] : Description
+    - [x] Description
-    - [x] : Link to License
+    - [x] Link to License
-- [ ] : Getting the word out there.
+- [ ] Getting the word out there.
-    - [ ] : Graphic Pack
+    - [ ] Graphic Pack
-    - [x] : Share links of tw,fb,gp,li,...
+    - [x] Share links of tw,fb,gp,li,...
-- [ ] : Alphabetizing the entries in the pages
+- [ ] Alphabetizing the entries in the pages
-    - [ ] : bg
+    - [ ] bg
-    - [ ] : de
+    - [ ] de
-    - [x] : es
+    - [x] es
-    - [ ] : en
+    - [ ] en
-    - [x] : fa_IR
+    - [x] fa_IR
-    - [ ] : fr
+    - [ ] fr
-    - [ ] : it
+    - [ ] it
-    - [ ] : ja
+    - [ ] ja
-    - [ ] : ko
+    - [ ] ko
-    - [ ] : pt_BR
+    - [ ] pt_BR
-    - [ ] : pt_PT
+    - [ ] pt_PT
-    - [x] : ru
+    - [x] ru
-    - [ ] : tr
+    - [ ] tr
-    - [ ] : zh
+    - [ ] zh
-    - [ ] : javascript framework
+    - [ ] javascript framework
-    - [ ] : courses
+    - [ ] courses

free-courses-en.md

@@ -3,9 +3,9 @@
 * [Databases](#databases)
 * [Haskell](#haskell)
 * [HTML / CSS](#html--css)
-* [JS](#js)
-* [Java](#java)
 * [iOS](#ios)
+* [Java](#java)
+* [JS](#js)
 * [OCaml](#ocaml)
 * [Oracle PL/SQL](#oracle-plsql)
 * [Python](#python)
@@ -32,23 +32,22 @@
 * [Learn HTML5 Programming From Scratch](https://www.udemy.com/learn-html5-programming-from-scratch/)
 
 
-###JS
+###iOS
-* [Egghead.io](https://egghead.io/)
+* [AppCoda Complete iOS Tutorial](http://www.appcoda.com/ios-programming-course/)
-* [Codecademy Walkthrough](http://www.codecademy.com/tracks/javascript)
+* [Developing iOS 7 Apps for iPhone and iPad](https://itunes.apple.com/us/course/developing-ios-7-apps-for/id733644550)
-* [LearnStreet Walkthrough](https://www.learnstreet.com/lessons/study/javascript)
 
 
 ###Java
-* [Introduction to Java](http://ocw.mit.edu/courses/electrical-engineering-and-computer-science/6-092-introduction-to-programming-in-java-january-iap-2010/)
 * [Central Connecticut State University, Introduction to CS Using Java](http://chortle.ccsu.edu/CS151/cs151java.html)
-* [Problem Solving With Java](https://www.udacity.com/course/cs046)
+* [Introduction to Java](http://ocw.mit.edu/courses/electrical-engineering-and-computer-science/6-092-introduction-to-programming-in-java-january-iap-2010/)
 * [Princeton Algorithms, Part 1](https://www.coursera.org/course/algs4partI)
 * [Princeton Algorithms, Part 2](https://www.coursera.org/course/algs4partII)
+* [Problem Solving With Java](https://www.udacity.com/course/cs046)
 
 
-###iOS
+###JS
-* [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
+* [Egghead.io](https://egghead.io/)
-* [AppCoda Complete iOS Tutorial](http://www.appcoda.com/ios-programming-course/)
+* [LearnStreet Walkthrough](https://www.learnstreet.com/lessons/study/javascript)
 
 
 ###OCaml
@@ -60,8 +59,8 @@
 
 
 ###Python
-* [Google's Python Course](https://developers.google.com/edu/python/)
 * [Berkeley's Structure and Interpretation of Computer Programs](http://www-inst.eecs.berkeley.edu/~cs61a/)
+* [Google's Python Course](https://developers.google.com/edu/python/)
 
 
 ###Ruby

free-programming-interactive-tutorials-en.md

@@ -52,6 +52,8 @@
 
 
 ###JavaScript
+* [Codecademy jquery track](http://www.codecademy.com/tracks/jquery)
+* [Javascript interactive tutorial](http://www.codecademy.com/tracks/javascript)
 * [Learning Advanced JavaScript](http://ejohn.org/apps/learn/)
 * [Learn JavaScript](http://www.learn-js.org/)
 * [Learn knockout.js](http://learn.knockoutjs.com)