Merge branch 'pr/1996'

This commit is contained in:
Victor Felder 2016-08-01 14:42:27 +02:00
commit ae15ece036

View File

@ -780,6 +780,7 @@
* [Getting Started with BASH](http://www.hypexr.org/bash_tutorial.php) * [Getting Started with BASH](http://www.hypexr.org/bash_tutorial.php)
* [Google Shell Style Guide](http://google-styleguide.googlecode.com/svn/trunk/shell.xml) * [Google Shell Style Guide](http://google-styleguide.googlecode.com/svn/trunk/shell.xml)
* [Introduction to the Command Line](https://launchschool.com/books/command_line) - Launch School * [Introduction to the Command Line](https://launchschool.com/books/command_line) - Launch School
* [Linux Fundamentals](http://linux-training.be/linuxfun.pdf) - Paul Cobbaut (PDF)
* [Linux Shell Scripting Tutorial - A Beginner's Handbook](http://www.freeos.com/guides/lsst/) * [Linux Shell Scripting Tutorial - A Beginner's Handbook](http://www.freeos.com/guides/lsst/)
* [The Bash Academy](http://www.bash.academy) * [The Bash Academy](http://www.bash.academy)
* [The Command Line Crash Course](http://learncodethehardway.org/cli/book/) Z. A. Shaw * [The Command Line Crash Course](http://learncodethehardway.org/cli/book/) Z. A. Shaw
@ -1249,7 +1250,6 @@
* [The Java Tutorial 4th Edition](http://download.oracle.com/javase/tutorial/) - Sharon Zakhour, Scott Hommel, Jacob Royal, Isaac Rabinovitch, Tom Risser, Mark Hoeber * [The Java Tutorial 4th Edition](http://download.oracle.com/javase/tutorial/) - Sharon Zakhour, Scott Hommel, Jacob Royal, Isaac Rabinovitch, Tom Risser, Mark Hoeber
* [Think Java: How to Think Like a Computer Scientist](http://greenteapress.com/thinkapjava/) - Allen B. Downey * [Think Java: How to Think Like a Computer Scientist](http://greenteapress.com/thinkapjava/) - Allen B. Downey
* [Thinking in Java](http://www.mindview.net/Books/TIJ/) * [Thinking in Java](http://www.mindview.net/Books/TIJ/)
* [UML For Java Programmers](http://www.csd.uoc.gr/~hy252/references/UML_for_Java_Programmers-Book.pdf) - Robert Cecil Martin (PDF) (PDF)
* [Welcome to Java for Python Programmers](http://interactivepython.org/runestone/static/java4python/index.html) - Brad Miller * [Welcome to Java for Python Programmers](http://interactivepython.org/runestone/static/java4python/index.html) - Brad Miller
* [Welcome to the Java Workshop](http://javaworkshop.sourceforge.net) - An Apache Project * [Welcome to the Java Workshop](http://javaworkshop.sourceforge.net) - An Apache Project
* [What's New in Java 8](https://leanpub.com/whatsnewinjava8/read) - Adam L. Davis * [What's New in Java 8](https://leanpub.com/whatsnewinjava8/read) - Adam L. Davis