Merge pull request #3 from vhf/master

sync with vhf:master
pull/1097/head
Sun Xiaobo 2014-08-14 13:10:50 +08:00
commit 77cd494d9f
3 changed files with 16 additions and 2 deletions

View File

@ -15,7 +15,7 @@ It's [easy](https://github.com/vhf/free-programming-books/wiki/Contribution). Pl
- Read the [TODO](/TODO.md) file(Adding new books is our #1 priority, but things like Alphabetizing are important, too.)
- [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 27,000 people starred in 8 months. ;)
- be part of a project that over 28,000 people starred in 8 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.

View File

@ -1,8 +1,23 @@
### Index
* [Javascript](#javascript)
* [Python](#python)
* [Ruby](#ruby)
### Javascript
* [Screencast] - [ShowMeDo - Javascript Screencasts](http://showmedo.com/videotutorials/javascript)
* [Screencast] - [Free Quality Javascript video tutorials and screencasts](http://screencasts.org/topics/javascript)
* [Screencast] - [Node Tuts - Node.JS Video Tutorials](nodetuts.com)
### Python
* [Screencast] - [ShowMeDo - Python Videos, Tutorials and Screencasts](http://showmedo.com/videotutorials/python)
* [Screencast] - [Diving into Django](http://code.tutsplus.com/articles/diving-into-django--net-2969)
* [Screencast] - [Try Django Tutorial](http://youtu.be/3DccH9AMwFQ?list=PLEsfXFp6DpzRgedo9IzmcpXYoSeDg29Tx)
### Ruby
* [Podcast] - [5by5 - Ruby on Rails Podcast](http://5by5.tv/rubyonrails)
* [Podcast] - [ENVY LABS - Ruby5](http://ruby5.envylabs.com/)
* [Podcast] - [Ruby Rogues](http://rubyrogues.com/)
* [Screencast] - [Free Ruby on Rails Screencasts](http://railscasts.com/?type=free)
* [Screencast] - [Ruby Videos, Tutorials and Screencasts](http://showmedo.com/videotutorials/ruby)
* [Screencast] - [Ruby Tapas | Free Screencasts](http://www.rubytapas.com/episodes?filter=free)
* [Podcast] - [The Ruby Show](http://rubyshow.com/)

View File

@ -1546,7 +1546,6 @@ See also [TeX](#tex)
### Ruby
* [A community-driven Ruby style guide](https://github.com/bbatsov/ruby-style-guide)
* [CodeCademy Ruby](http://www.codecademy.com/tracks/ruby)
* [How To Think Like a Computer Scientist: Learning With Ruby](http://mysite.verizon.net/hpassel/thinkruby/)
* [Just Enough Ruby to Get By](http://dmtri.com/posts/65)
* [Learn Ruby the hard way](http://ruby.learncodethehardway.org/book/)
* [Learn to Program, by Chris Pine](http://pine.fm/LearnToProgram/)