Merge branch 'master' into ha-matrix-dim-inheritance

Author: plaindocs

README.md

@@ -1,4 +1,4 @@
-master# About this repository [![Build Status](https://travis-ci.org/travis-ci/docs-travis-ci-com.svg?branch=master)](https://travis-ci.org/travis-ci/docs-travis-ci-com)
+# About this repository [![Build Status](https://travis-ci.org/travis-ci/docs-travis-ci-com.svg?branch=master)](https://travis-ci.org/travis-ci/docs-travis-ci-com)
 
 This is the documentation site for Travis CI! (<http://docs.travis-ci.com/>)
 

_layouts/en.html

@@ -14,7 +14,7 @@
 
         <main id="main" class="main" data-swiftype-index='true'>
           {% unless page.no_header %}
-            <aside class="improve-page"><a href="{{ site.docs_github }}edit/gh-pages/{{ page.path }}" target="_blank" title="Edit this page on GitHub" class="button-pen" data-proofer-ignore>Improve this page on GitHub</a></aside>
+            <aside class="improve-page"><a href="{{ site.docs_github }}edit/master/{{ page.path }}" target="_blank" title="Edit this page on GitHub" class="button-pen" data-proofer-ignore>Improve this page on GitHub</a></aside>
             <h1 class="title">{{ page.title }}</h1>
           {% endunless %}
           {{ content }}

user/customizing-the-build.md

@@ -140,12 +140,12 @@ When deploying files to a provider, prevent Travis CI from resetting your
 working directory and deleting all changes made during the build ( `git stash
 --all`) by adding `skip_cleanup` to your `.travis.yml`:
 
-```yml
+```yaml
 deploy:
   skip_cleanup: true
 ```
 
-You can run steps before a deploy by using the `before_deploy` phase. A non-zero exit code in this command will mark the build as **errored**.
+You can run steps before a deploy by using the `before_deploy` phase. A non-zero exit code in this phase will mark the build as **errored**.
 
 If there are any steps you'd like to run after the deployment, you can use the `after_deploy` phase.
 
@@ -159,7 +159,7 @@ One of the key features of Travis CI is the ease of running your test suite agai
 
 If your dependencies need native libraries to be available, you can use **passwordless sudo to install them**:
 
-```yml
+```yaml
 before_install:
 - sudo apt-get update -qq
 - sudo apt-get install -qq [packages list]
@@ -178,7 +178,7 @@ If you need a native dependency that is not available from the official Ubuntu r
 
 If you need to install a second programming language in your current build environment, for example installing a more recent version of Ruby than the default version present in all build environments you can do so in the `before_install` stage of the build:
 
-```yml
+```yaml
 before_install:
 - rvm install 2.1.5
 ```
@@ -190,10 +190,10 @@ You can also use other installation methods such as `apt-get`.
 It is very common for test suites or build scripts to hang.
 Travis CI has specific time limits for each job, and will stop the build and add an error message to the build log in the following situations:
 
-- A job takes longer than 50 minutes on travis-ci.org
-- A job takes longer than 120 minutes on travis-ci.com
-- A job takes longer than 50 minutes on OSX infrastructure or travis-ci.org or travis-ci.com
 - A job produces no log output for 10 minutes
+- A job on travis-ci.org takes longer than 50 minutes 
+- A job running on OS X infrastructure takes longer than 50 minutes (applies to travis-ci.org or travis-ci.com)
+- A job on Linux infrastructure on travis-ci.com takes longer than 120 minutes 
 
 Some common reasons why builds might hang:
 
@@ -267,7 +267,7 @@ You can disable the download of LFS objects when cloning ([`git lfs smudge
 --skip`](https://github.com/git-lfs/git-lfs/blob/master/docs/man/git-lfs-smudge.1.ronn))
 by setting the following in `.travis.yml`:
 
-``` yml
+```yaml
 git:
   lfs_skip_smudge: true
 ```
@@ -280,7 +280,7 @@ Travis CI uses the `.travis.yml` file from the branch containing the git commit
 
 Specify which branches to build using a safelist, or blocklist branches that you do not want to be built:
 
-```yml
+```yaml
 # blocklist
 branches:
   except:
@@ -300,10 +300,12 @@ If you use both a safelist and a blocklist, the safelist takes precedence. By de
 
 To build _all_ branches:
 
-    branches:
-      only:
-        - gh-pages
-        - /.*/
+```yaml
+branches:
+  only:
+  - gh-pages
+  - /.*/
+```
 
 > Note that for historical reasons `.travis.yml` needs to be present *on all active branches* of your project.
 
@@ -376,7 +378,7 @@ parameters, you can specify only those and omit the varying parts.
 
 Suppose you have:
 
-```yml
+```yaml
 language: ruby
 rvm:
 - 1.9.3
@@ -396,7 +398,7 @@ gemfile:
 This results in a 3×3×4 build matrix. To exclude all jobs which have `rvm` value `2.0.0` *and*
 `gemfile` value `Gemfile`, you can write:
 
-```yml
+```yaml
 matrix:
   exclude:
   - rvm: 2.0.0
@@ -405,7 +407,7 @@ matrix:
 
 Which is equivalent to:
 
-```yml
+```yaml
 matrix:
   exclude:
   - rvm: 2.0.0
@@ -580,7 +582,7 @@ The `-v` flag makes the shell print all lines in the script before executing the
 
 Assuming the script above is stored as `scripts/run-tests.sh` in your repository, and with the right permissions too (run `chmod ugo+x scripts/run-tests.sh` before checking it in), you can call it from your `.travis.yml`:
 
-```
+```yaml
 script: ./scripts/run-tests.sh
 ```
 

user/deployment/heroku.md

@@ -163,7 +163,6 @@ You can either use a shorthand for the [default buildpacks](https://devcenter.he
 Travis CI supports different mechanisms for deploying to Heroku:
 
 - **api:** Uses Heroku's [Build API](https://devcenter.heroku.com/articles/build-and-release-using-the-api). This is the default strategy.
-- **anvil:** Uses an [unofficial build server](https://github.com/ddollar/anvil), which accepts archives of the application you want to deploy.
 - **git:** Does a `git push` over HTTPS.
 - **git-ssh:** Does a `git push` over SSH. This will generate a new key on every deployment.
 - **git-deploy-key:** Does a `git push` over SSH. It will reuse the same key on every deployment. This is only available for private projects.
@@ -177,7 +176,9 @@ deploy:
   strategy: git
 ```
 
-Note that the **anvil**, **git-ssh** and **git-deploy-key** strategies are considered **deprecated**. Please contact us if you have issues switching away from these.
+> Note that the `git-ssh` and `git-deploy-key` strategies are **deprecated**, and will be shut
+> down on June 26th, 2017.
+> Please contact us if you have issues switching away from these.
 
 #### Using `.gitignore` on `git` strategy
 

user/for-beginners.md

@@ -23,6 +23,7 @@ You need to sign up for a [GitHub account](https://github.com/) if you do not al
 
    ```yaml
    language: php
+   dist: trusty
    php:
    - 5.5
    - 5.4

user/languages/javascript-with-nodejs.md

@@ -69,7 +69,7 @@ If you already use Gulp to manage your tests, install it and run the default
 
 ```yaml
 before_script:
-  - npm install -g gulp
+  - npm install -g gulp-cli
 script: gulp
 ```