Merge pull request #3 from yssmcl/revert-2-master

Revert "Merge branch"

.travis.yml

@@ -1,7 +1,7 @@
 language: node_js
 sudo: false
 node_js:
-  - 6
+  - "4.1"
 before_script:
   - npm install -g free-programming-books-lint
 script: fpb-lint .

CONTRIBUTING.md

@@ -1,15 +1,15 @@
 ## Contributor License Agreement
-By contributing you agree to the [LICENSE](https://github.com/EbookFoundation/free-programming-books/blob/master/LICENSE) of this repository.
+By contributing you agree to the [LICENSE](https://github.com/vhf/free-programming-books/blob/master/LICENSE) of this repository.
 
 ## Contributor Code of Conduct
-By contributing you agree to respect the [Code of Conduct](https://github.com/EbookFoundation/free-programming-books/blob/master/CODE_OF_CONDUCT.md) of this repository.
+By contributing you agree to respect the [Code of Conduct](https://github.com/vhf/free-programming-books/blob/master/CODE_OF_CONDUCT.md) of this repository.
 
 ## In a nutshell
 1. "A link to easily download a book" is not always a link to a *free* book. Please only contribute free content. Make sure it's free.
 2. You don't have to know git: if you found something of interest which is *not already in this repo*, please open an issue with your links propositions.
     - If you know git, please fork the repo and send pull requests.
 3. We have 5 kinds of lists. Choose the right one:
-
+    
     - *Books* : PDF, HTML, ePub, a gitbook.io based site, a Git repo, etc.
     - *Courses* : A course is a learning material which is not a book and where there is no interactive tool embedded in the site. [This is a course](http://ocw.mit.edu/courses/electrical-engineering-and-computer-science/6-006-introduction-to-algorithms-fall-2011/).
     - *Interactive Tutorials* : An interactive website which lets the user type code or commands and evaluates the result (by "evaluate" we don't mean "grade"). e.g.: [Try Haskell](http://tryhaskell.org), [Try Github](http://try.github.io).
@@ -18,10 +18,8 @@ By contributing you agree to respect the [Code of Conduct](https://github.com/Eb
 
 4. Make sure to follow the [guidelines below](#guidelines) and respect the [Markdown formatting](#formatting) of the files
 
-5. Travis CI will run tests to make sure your lists are alphabetized and formatting rules are followed. Be sure to check that your changes pass the tests.
-
 ### Guidelines
-- make sure a book is free. Double-check if needed. It helps the admins if you comment in the PR as to why you think the book is free.
+- make sure a book is free. Double-check if needed
 - we don't accept files hosted on google drive, dropbox, mega, scribd, issuu and other similar file upload platforms
 - insert your links in alphabetical order. If you see a misplaced link, please reorder it and submit a PR
 - use the link with the most authoritative source (meaning author's website is better than editor's website is better than third party website)
@@ -40,8 +38,6 @@ By contributing you agree to respect the [Code of Conduct](https://github.com/Eb
     + use the link with the most authoritative source (meaning author's website is better than editor's website is better than third party website)
     + if they link to different editions and you judge these editions are different enough to be worth keeping them, add a separate link with a note about each edition
 - prefer atomic commits (one commit by addition/deletion/modification) over bigger commits. No need to squash your commits before submitting a PR. (We will never enforce this rule as it's just a matter of convenience for the maintainers)
-- if the book is older, include the publication date with the title. 
-- include the author name or names where appropriate. You can shorten author lists with "et al."
 
 ### Formatting
 - All lists are `.md` files. Try to learn [Markdown](https://guides.github.com/features/mastering-markdown/) syntax. It's simple!
@@ -72,7 +68,7 @@ BAD : * [Another Awesome Book] (http://example.com/book.html)
 GOOD: * [Another Awesome Book](http://example.com/book.html)
 ```
 
-- If you include the author, use ` - ` (a dash surrounded by single spaces)
+- If you wish to mention the author, use ` - ` (a dash surrounded by single spaces)
 
 ```
 BAD : * [Another Awesome Book](http://example.com/book.html)- John Doe
@@ -92,18 +88,3 @@ GOOD: * [Another Awesome Book](http://example.com/book.pdf) (PDF)
 BAD : * [Another Awesome Book](http://example.com/book.pdf)- John Doe
 GOOD: * [Another Awesome Book](http://example.com/book.pdf) - John Doe (PDF)
 ```
-
-- Multiple formats:
-
-```
-BAD : * [Another Awesome Book](http://example.com/)- John Doe (HTML)
-BAD : * [Another Awesome Book](https://downloads.example.org/book.html)- John Doe (download site)
-GOOD: * [Another Awesome Book](http://example.com/) - John Doe (HTML) [(PDF, EPUB)](https://downloads.example.org/book.html)
-```
-
-- Include publication year in title for older books:
-
-```
-BAD: * [Another Awesome Book](http://example.com/book.html) - John Doe - 1970
-GOOD: * [Another Awesome Book (1970)](http://example.com/book.html) - John Doe
-```

LICENSE

@@ -1,3 +1,3 @@
-This work, "free-programming-books", is licensed under the Creative Commons Attribution 4.0 International License. To view a copy of this license, visit https://creativecommons.org/licenses/by/4.0/ or send a letter to Creative Commons, PO Box 1866, Mountain View, CA 94042, USA.
+This work, "free-programming-books", is licensed under the Creative Commons Attribution 4.0 International License. To view a copy of this license, visit http://creativecommons.org/licenses/by/4.0/ or send a letter to Creative Commons, PO Box 1866, Mountain View, CA 94042, USA.
 
-It is attributed to Victor Felder and the Free Ebook Foundation. https://github.com/EbookFoundation/free-programming-books
+It is attributed to Victor Felder.

README.md

@@ -1,30 +1,26 @@
 # List of Free Learning Resources [![Awesome](https://cdn.rawgit.com/sindresorhus/awesome/d7305f38d29fed78fa85652e3a63e154dd8e8829/media/badge.svg)](https://github.com/sindresorhus/awesome)
 
-[View the English list](/free-programming-books.md)
+[View the English list](https://github.com/vhf/free-programming-books/blob/master/free-programming-books.md)
 
 ## Intro
-This list was originally a clone of [stackoverflow - List of Freely Available Programming Books](http://web.archive.org/web/20130824154208/http://stackoverflow.com/a/392926) by George Stocker. 
+This list initially was a clone of [stackoverflow - List of Freely Available Programming Books](http://web.archive.org/web/20130824154208/http://stackoverflow.com/a/392926) by George Stocker. Now updated, with dead links gone and new content.
 
-The list was moved to GitHub by Victor Felder for collaborative updating and maintenance. It grew to become one of the [most popular repositories on Github](https://octoverse.github.com/), with over 80,000 stars, over 4000 commits, over 800 contributors, and over 20,000 forks.
-
-The repo is now administered by the [Free Ebook Foundation](https://ebookfoundation.org), a not-for-profit organization devoted to promoting the creation, distribution, archiving and sustainability of free ebooks. [Donations](https://ebookfoundation.org/contributions.html) to the Free Ebook Foundation are tax-deductible in the US.
+Moved to GitHub for collaborative updating.
 
 ### How To Contribute
 
 Please read [CONTRIBUTING](/CONTRIBUTING.md).
 
 ### How to Share
-+ [Share on Twitter](http://twitter.com/home?status=https://github.com/EbookFoundation/free-programming-books%0AFree%20Programming%20Books)
-+ [Share on Facebook](http://www.facebook.com/sharer/sharer.php?s=100&p[url]=https://github.com/EbookFoundation/free-programming-books&p[images][0]=&p[title]=Free%20Programming%20Books&p[summary]=)
-+ [Share on Google Plus](https://plus.google.com/share?url=https://github.com/EbookFoundation/free-programming-books)
-+ [Share on LinkedIn](http://www.linkedin.com/shareArticle?mini=true&url=https://github.com/EbookFoundation/free-programming-books&title=Free%20Programming%20Books&summary=&source=)
++ [Share on Twitter](http://twitter.com/home?status=https://github.com/vhf/free-programming-books%0AFree%20Programming%20Books)
++ [Share on Facebook](http://www.facebook.com/sharer/sharer.php?s=100&p[url]=https://github.com/vhf/free-programming-books&p[images][0]=&p[title]=Free%20Programming%20Books&p[summary]=)
++ [Share on Google Plus](https://plus.google.com/share?url=https://github.com/vhf/free-programming-books)
++ [Share on LinkedIn](http://www.linkedin.com/shareArticle?mini=true&url=https://github.com/vhf/free-programming-books&title=Free%20Programming%20Books&summary=&source=)
 
 
 ### In Other Spoken Languages
-+ Arabic: [github](/free-programming-books-ar.md)
-+ Azerbaijani: [github](/free-programming-books-az.md)
++ Azerbaijan: [github](/free-programming-books-az.md)
 + Bulgarian: [github](/free-programming-books-bg.md)
-+ Burmese: [github](/free-programming-books-mm.md)
 + Chinese: [github](/free-programming-books-zh.md)
 + Czech: [github](/free-programming-books-cs.md)
 + English: [github](/free-programming-books.md)
@@ -55,7 +51,7 @@ Please read [CONTRIBUTING](/CONTRIBUTING.md).
 
 ### Interactive Programming Resources
 + [Free interactive programming tutorials](/free-programming-interactive-tutorials-en.md)
-
+ 
 
 ### JavaScript Frameworks and Resources
 + [Free JavaScript frameworks resources and tutorials - English](/javascript-frameworks-resources.md)
@@ -71,9 +67,4 @@ Free Podcasts and Screencasts:
 
 + Czech: [github](/free-podcasts-screencasts-cs.md)
 + English: [github](/free-podcasts-screencasts-en.md)
-+ Portuguese (Brazil): [github](/free-podcasts-screencasts-pt_BR.md)
 + Russian: [github](/free-podcasts-screencasts-ru.md)
-
-
-### Programming Playgrounds
-+ [Free Programming Playgrounds](/free-programming-playgrounds.md)