Merge branch 'master' into Heading-Update-v2

Author: nrios14

user/billing-overview.md

@@ -251,8 +251,9 @@ arch:
   - ppc64le
   - s390x
 ```
+{: data-file=".travis.yml"}
 
-Please see our [Build Environment overview](/user/reference/overview/) and [Building for Multiple CPU architectures](/user/multi-cpu-architectures/) pages for more details.
+For more details, please see our [Build Environment overview](/user/reference/overview/) and [Building for Multiple CPU architectures](/user/multi-cpu-architectures/) pages.
 
 In order to start a build in the Usage-based Plan, a positive credits balance is required in the account (at least 1 credit). The build job under Partner Queue Solution costs 0 credits per started minute. When introducing Partner Queue Solution, active accounts on the Usage-based Plans, including the Free Plan, with a balance of zero or fewer credits, are updated to hold 1 credit. Thus, everybody can use Partner Queues without requesting Travis CI support to grant additional credits. If you run into a negative account balance after that, you must file an additional request.
 
@@ -355,11 +356,12 @@ This scenario is an example of a user with Credits, user licenses counted within
 
 ## VM Instance Sizes and Credit Cost
 
-Usage and Concurrency based plans allow you to choose the instance size the build will run on (for the 'full vm' build job). Larger instance sizes deliver more resources (namely vCPU and RAM) for your build jobs. This can be done by setting a 'vm' property in the .travis.yml config. This property allows you to choose the Virtual machine instance for a build:
+Usage and Concurrency-based plans allow you to choose the instance size the build will run on (for the 'full vm' build job). Larger instance sizes deliver more resources (namely vCPU and RAM) for your build jobs. This can be done by setting a 'vm' property in the .travis.yml config. This property allows you to choose the Virtual machine instance for a build:
 ```yaml
 vm:
   size: [large|x-large|2x-large]
 ```
+{: data-file=".travis.yml"}
 
 Instance sizes do not apply to OSX build jobs. Our [CI Environment Overview page](/user/reference/overview/#vm-instance-size) describes the available VM sizes vs. operating system and CPU architecture.
 
@@ -391,6 +393,7 @@ GPU builds allow you to choose the instance size the build will run on (for the
 vm:
  size: [gpu-medium | gpu-xlarge] #new values in the schema for existing key
 ```
+{: data-file=".travis.yml"}
 
 Instance sizes do not apply to Windows and OSX build jobs.  Visit our [CI Environment Overview page](/user/reference/overview/#gpu-vm-instance-size) for information on the available GPU VM sizes, operating system, and CPU architecture.
 

user/browserstack.md

@@ -96,6 +96,7 @@ driver = Selenium::WebDriver.for(:remote,
   :url => "http://USERNAME:[email protected]/wd/hub",
   :desired_capabilities => caps)
 ```
+{: data-file="example.rb"}
 
 Local identifiers are essential for [matrix builds][travis-matrix-builds]. Since matrix builds in travis can be run on
 the same VM, we need to add the Local Identifier when starting the connection to ensure that the correct local tunnel
@@ -122,6 +123,7 @@ Once the app is uploaded to the BrowserStack servers the resulting app id will b
 ```ruby
 caps['app'] = ENV['BROWSERSTACK_APP_ID']
 ```
+{: data-file="example.rb"}
 
 Check out the BrowserStack Android Sample App [.travis.yml][browserstack-android-app-travis] file.
 

user/build-config-imports.md

@@ -122,7 +122,7 @@ The path is relative to the repository's root.
 For configurations imported from a different repository, the latest version of
 the default branch in the repository will be used by default.
 
-For configurations imported from the same repository the commit you are
+For configurations imported from the same repository, the commit you are
 currently building will be used by default. This is intended to help while you
 are creating and testing the shared configurations.
 
@@ -138,8 +138,8 @@ import:
 
 ## Import private repository configs 
 
-In order to share configurations **from** a private repository this needs to
-be allowed on that repository, by enabling the *Allow importing config files from this repository*
+In order to share configurations **from** a private repository, this needs to
+be allowed on that repository by enabling the *Allow importing config files from this repository*
 setting in `More options > Settings > Config Import`.
 
 > Only private repositories owned by the same organization or user account will
@@ -205,6 +205,7 @@ import:
 - source: other.yml
   mode: deep_merge_prepend
 ```
+{: data-file=".travis.yml"}
 
 ### Deep merge
 
@@ -236,7 +237,7 @@ if required, sections in `one.yml` with content from `.travis.yml`). The results
 merged into the `two.yml` file (again, items in the result of the previous merge win
 over what’s in this one, as the `deep_merge` mode is specified here).
 
-The reasoning behind this is that in many cases when you import something to your
+The reasoning behind this is that, in many cases, when you import something to your
 `.travis.yml` file, you want to be able to overwrite or customize that imported
 configuration with config in your `.travis.yml` file.
 
@@ -245,14 +246,15 @@ configuration with config in your `.travis.yml` file.
 The merge mode `merge` performs a shallow merge.
 
 This means that root level sections (keys) defined in your `.travis.yml` will
-overwrite root level sections (keys) that are also present in the imported
+overwrite root-level sections (keys) that are also present in the imported
 file.
 
 ```yaml
 import:
 - source: one.yml
   mode: merge # shallow merge
 ```
+{: data-file=".travis.yml"}
 
 ## Import precedence
 

user/build-matrix.md

@@ -228,7 +228,7 @@ of Python.
 
 ### Explicitly included jobs inherit the first value in the array
 
-The jobs which are explicitly included inherit the first value of the expansion
+The jobs that are explicitly included inherit the first value of the expansion
 keys defined.
 
 In this example with a 3-job Python build matrix, each job in `jobs.include`
@@ -413,6 +413,7 @@ jobs:
     script: echo "Running job 1"
 
 ```
+{: data-file=".travis.yml"}
 
 This name will appear on the build matrix UI and can be convenient in order to
 quickly identify jobs in a large matrix.
@@ -434,6 +435,7 @@ jobs:
   - <<: *shared_job
   - <<: *shared_job
 ```
+{: data-file=".travis.yml"}
 
 In rare circumstances it can still be desirable to execute multiple jobs with the same config. In such cases, job uniqueness can be achieved by specifying any additional key, e.g., a job name:
 
@@ -447,3 +449,4 @@ jobs:
   - name: Job 2
     <<: *shared_job
 ```
+{: data-file=".travis.yml"}

user/caching.md

@@ -143,6 +143,7 @@ To disable npm caching, use:
 cache:
   npm: false
 ```
+{: data-file=".travis.yml"}
 
 To explicitly cache `npm`, use:
 
@@ -443,7 +444,7 @@ usable in all jobs using it.
 In this case, we advise you to add a public environment variable
 name to each job to create a unique cache entry:
 
-```
+```yaml
 CACHE_NAME=JOB1
 ```
 {: data-file=".travis.yml"}
@@ -481,7 +482,7 @@ tar: /path/to/unreadable/directory: Cannot stat: No such file or directory
 ## How does caching work
 
 Travis CI saves an archive of all the directories listed in the configuration and uploads
-it to a storage provider, using a secure and protected URL, ensuring security and privacy of
+it to a storage provider, using a secure and protected URL, ensuring the security and privacy of
 the uploaded archives.
 
 Note that this makes our cache not network-local, it is still bound to network

user/common-build-problems.md

@@ -44,9 +44,9 @@ are two cores available, bursted.
 
 Depending on the tool in use, this can be caused by a few things:
 
-- Ruby test suite consuming too much memory
-- Tests running in parallel using too many processes or threads (e.g. using the
-  `parallel_test` gem)
+- Ruby test suite consuming too much memory.
+- Tests running in parallel using too many processes or threads (e.g., using the
+  `parallel_test` gem).
 - g++ needing too much memory to compile files, for instance, with a lot of
   templates included.
 
@@ -105,6 +105,7 @@ if defined?(RUBY_ENGINE) && RUBY_ENGINE == "ruby" && RUBY_VERSION >= "1.9"
   end
 end
 ```
+{: data-file="example.rb"}
 
 If your project is using the [Code Climate integration](/user/code-climate/) or
 Simplecov, this issue can also come up with the 0.8 branch of Simplecov. The fix
@@ -460,26 +461,28 @@ There are few ways to work around that.
 ### Timeouts installing dependencies
 
 If you are getting network timeouts when trying to download dependencies, either
-use the built in retry feature of your dependency manager or wrap your install
+use the built-in retry feature of your dependency manager or wrap your install
 commands in the `travis_retry` function.
 
 #### Bundler
 
 Bundler retries three times by default, but if you need to increase that number,
 use the following syntax in your `.travis.yml`
 
-```bash
+```yaml
 bundler_args: --retry 5
 ```
+{: data-file=".travis.yml"}
 
 #### travis_retry
 
 For commands which do not have a built-in retry feature, use the `travis_retry`
-function to retry it up to three times, if the return code is non-zero:
+function to retry it up to three times if the return code is non-zero:
 
-```bash
+```yaml
 install: travis_retry pip install myawesomepackage
 ```
+{: data-file=".travis.yml"}
 
 Most of our internal build commands are wrapped with `travis_retry` to reduce the
 impact of network timeouts.
@@ -642,3 +645,4 @@ env:
   global:
     - NODE_OPTIONS="--dns-result-order=ipv4first"
 ```
+{: data-file=".travis.yml"}

user/coveralls.md

@@ -34,6 +34,7 @@ Add the Coveralls Gem to your `Gemfile`:
 
 gem 'coveralls', require: false
 ```
+{: data-file="Gemfile"}
 
 You might need to update your `Gemfile.lock` as well.
 
@@ -49,6 +50,7 @@ Add Coveralls to the top of your test suite before you `require` any application
 require 'coveralls'
 Coveralls.wear!
 ```
+{: data-file="Gemfile"}
 
 After those three steps, the next time you push a commit, you'll be able to look up your [code coverage statistics](https://coveralls.io)!
 

user/coverity-scan.md

@@ -132,8 +132,8 @@ script: make
 
 to
 
-```bash
+```yaml
 script: if [ ${COVERITY_SCAN_BRANCH} != 1 ]; then make ; fi
 ```
-
+{: data-file=".travis.yml"}
 Be sure to replace `make` with your standard CI build command.

user/customizing-the-build.md

@@ -76,7 +76,7 @@ The *Auto Cancellation Setting* is in the *Settings* tab of each repository, and
 
 ![Auto cancellation setting](/images/autocancellation.png "Auto cancellation setting")
 
-For example, in the following screenshot, we pushed commit `ca31c2b` to the branch `MdA-fix-notice` while builds #226 and #227 were queued. With the auto cancellation feature on, the builds #226 and #227 were automatically cancelled:
+For example, in the following screenshot, we pushed commit `ca31c2b` to the branch `MdA-fix-notice` while builds #226 and #227 were queued. With the auto cancellation feature on, the builds #226 and #227 were automatically canceled:
 
 ![Auto cancellation example](/images/autocancellation-example.png "Auto cancellation example")
 
@@ -101,7 +101,7 @@ git:
 ```
 {: data-file=".travis.yml"}
 
-> Some operations on the repository, such as common automated code review scripts (e.g. Pronto for Ruby), may fail due to the limited git clone depth, not being able to access all the objects in the repository. Removing the depth flag, or running `git fetch --unshallow` might solve the issue.
+> Some operations on the repository, such as common automated code review scripts (e.g., Pronto for Ruby), may fail due to the limited git clone depth, not being able to access all the objects in the repository. Removing the depth flag, or running `git fetch --unshallow` might solve the issue.
 
 ## Git Clone Quiet
 
@@ -190,7 +190,7 @@ Deploy keys are not currently supported by LFS, so you should use a Assembla OAu
 
 ### Linux
 
-[Git LFS](https://git-lfs.github.com/) is supported by default on our Ubuntu Trusty, Xenial and Bionic images.
+[Git LFS](https://git-lfs.github.com/) is supported by default on our Ubuntu Trusty, Xenial, and Bionic images.
 
 ### macOS
 
@@ -260,12 +260,13 @@ You can do this by adding:
 git:
   clone: false
 ```
+{: data-file=".travis.yml"}
 
 > Note that if you use this option, the `TRAVIS_COMMIT_MESSAGE` environment variable will not be defined.
 
 ## Set the symlinks option
 
-In some cases when a repository is used for both Linux and Windows, it may be desirable to set
+In some cases, when a repository is used for both Linux and Windows, it may be desirable to set
 [core.symlinks](https://git-scm.com/docs/git-config#Documentation/git-config.txt-coresymlinks) option.
 
 To do this:
@@ -274,6 +275,7 @@ To do this:
 git:
   symlinks: true
 ```
+{: data-file=".travis.yml"}
 
 ## Build Specific Branches
 

user/database-setup.md

@@ -371,6 +371,7 @@ addons:
     packages:
     - rabbitmq-server 
 ```
+{: data-file=".travis.yml"}
 
 ## Riak