Merge branch 'master' into sw-pypi

Author: plaindocs

STYLE.md

@@ -39,7 +39,7 @@ If you have long lists you can wrap them into 2 (`.column-2`) or 3 (`.column-3`)
 
 ```css
 * long list item 1
-* lont list item 2
+* long list item 2
 {: .column-2 }
 ```
 

user/deployment/google-app-engine.md

@@ -18,9 +18,11 @@ deploy:
 Then go to the [Google Cloud Console Dashboard](http://console.developers.google.com) and:
 
 1. Enable "Google App Engine Admin API",
-2. Go to "Credentials", click "Add Credential" and "Service account key", finally click "JSON" to download the your Service Account JSON file.
+2. Go to "Credentials", click "Add Credential" and "Service account key", finally click "JSON" to download your Service Account JSON file.
 
-It is *strongly* recommended that you encrypt your key before committing it to a repo. First make sure you have the Travis command line tool installed.
+It is *strongly* recommended that you encrypt your key before committing it to a repo.
+First make sure you have the [Travis command line tool](https://github.com/travis-ci/travis.rb#readme) installed.
+Then execute the following command from the terminal:
 
 ```bash
 travis encrypt-file client-secret.json --add

user/languages/java.md

@@ -132,7 +132,7 @@ jdk:
 
 > Note that testing against multiple Java versions is not supported on OS X. See the [OS X Build Environment](/user/osx-ci-environment/#JDK-and-OS-X) for more details. 
 
-Travis CI provides OpenJDK 6, OpenJDK 7, Oracle JDK 7, and Oracle JDK 8. Sun JDK 6 is not provided, because it is EOL as of November 2012. OpenJDK 8 is available on our Trusty images, spcify `dist: trusty` to make use of it.
+Travis CI provides OpenJDK 6, OpenJDK 7, Oracle JDK 7, and Oracle JDK 8. Sun JDK 6 is not provided, because it is EOL as of November 2012. OpenJDK 8 is available on our Trusty images, specify `dist: trusty` to make use of it.
 
 JDK 7 is backwards compatible, we think it's time for all projects to start testing against JDK 7 first and JDK 6 if resources permit.
 

user/languages/javascript-with-nodejs.md

@@ -293,5 +293,3 @@ addons:
       - g++-4.8
 ```
 
-Due to recent decision by the LLVM team to remove APT support, it is currently not possible to update clang on Travis CI via `apt-get` or the `apt` addon.
-See <https://github.com/travis-ci/travis-ci/issues/6120>.