Merge branch 'master' into patch-1

Author: plaindocs

user/deployment/pypi.md

@@ -51,7 +51,7 @@ deploy:
 
 If you tag a commit locally, remember to run `git push --tags` to ensure that your tags are uploaded to GitHub.
 
-## Deploying specific braches
+## Deploying specific branches
 
 You can explicitly specify the branch to release from with the **on** option:
 

user/for-beginners.md

@@ -43,7 +43,7 @@ You need to sign up for a [GitHub account](https://github.com/) if you do not al
 
    > Note: Travis only runs a build on the commits you push after adding the repository to Travis.
 
-   Wait for Travis CI to run a build on your fork of the `travis-broken-example` repository, check the [build status](https://travis-ci.org/repositories) and notice that the build fails. (Travis CI sends you an email when this happens)
+   Wait for Travis CI to run a build on your fork of the `travis-broken-example` repository, check the [build status](https://travis-ci.org) and notice that the build fails. (Travis CI sends you an email when this happens)
 
 6. Fix the code by making sure that `2=1+1` in `Test.php`, commit and push to GitHub. This time, the build does not fail.
 

user/languages/javascript-with-nodejs.md

@@ -83,7 +83,16 @@ Travis CI uses [npm](http://npmjs.org/) to install your project dependencies:
 npm install
 ```
 
-> Note that there are no npm packages installed by default in the Travis CI environment , your dependencies are downloaded and installed every build.
+> Note that there are no npm packages installed by default in the Travis CI environment, your dependencies are downloaded and installed during each build.
+
+#### Using a specific npm version
+
+Add the following to the [`before_install` phase](/user/customizing-the-build/#The-Build-Lifecycle) of `.travis.yml`:
+
+```yaml
+before_install:
+  - npm i -g npm@version-number
+```
 
 #### Caching with `npm`
 
@@ -113,6 +122,17 @@ Note that `yarn` requires Node.js version 4 or later.
 If the job does not meet this requirement, `npm install` is used
 instead.
 
+
+#### Using a specific yarn version
+
+Add the following to the [`before_install` phase](/user/customizing-the-build/#The-Build-Lifecycle) of `.travis.yml`:
+
+```yaml
+before_install:
+  - curl -o- -L https://yarnpkg.com/install.sh | bash -s -- --version version-number
+  - export PATH="$HOME/.yarn/bin:$PATH"
+```
+
 #### Caching with `yarn`
 
 You can cache `$HOME/.cache/yarn` with: