Skip to content

Commit e97e638

Browse files
authored
Merge branch 'master' into ph-trusty-to-xenial
2 parents f2e6685 + 7631d5d commit e97e638

File tree

4 files changed

+7
-6
lines changed

4 files changed

+7
-6
lines changed

user/gui-and-headless-browsers.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -195,7 +195,8 @@ Headless mode can be enabled using the `MOZ_HEADLESS`
195195

196196
```yaml
197197
env:
198-
- MOZ_HEADLESS=1
198+
global:
199+
- MOZ_HEADLESS=1
199200
addons:
200201
firefox: latest
201202
```

user/languages/dart.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ This guide covers build environment and configuration topics specific to
3434
Travis CI support for Dart is contributed by the community and may be removed
3535
or altered at any time. If you run into any problems, please report them in the
3636
[Travis CI issue tracker](https://github.com/travis-ci/travis-ci/issues/new?labels=community:dart)
37-
and cc [@nex3](https://github.com/nex3) and [@a14n](https://github.com/a14n).
37+
and cc [@athomas](https://github.com/athomas) and [@a14n](https://github.com/a14n).
3838
3939
## Choosing Dart versions to test against
4040

user/languages/java.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -195,8 +195,8 @@ details.
195195

196196
The list of available JVMs for different dists are at
197197

198-
* [JDKs installed for **Bionic**](/user/reference/bionic/#jvm-clojure-groovy-java-scala-images)
199-
* [JDKs installed for **Xenial**](/user/reference/xenial/#jvm-clojure-groovy-java-scala-images)
198+
* [JDKs installed for **Bionic**](/user/reference/bionic/#jvm-clojure-groovy-java-scala-support)
199+
* [JDKs installed for **Xenial**](/user/reference/xenial/#jvm-clojure-groovy-java-scala-support)
200200
* [JDKs installed for **Trusty**](/user/reference/trusty/#jvm-clojure-groovy-java-scala-images)
201201
* [JDKs installed for **Precise**](/user/reference/precise/#jvm-clojure-groovy-java-scala-vm-images)
202202

user/reference/linux.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@ This page gives an overview of the different Ubuntu Linux distributions you can
1111
You can choose one of the following distributions:
1212

1313
* [Ubuntu Bionic 18.04](/user/reference/bionic/)
14-
* [Ubuntu Xenial 16.04](/user/reference/xenial/)
15-
* [Ubuntu Trusty 14.04](/user/reference/trusty/) **default**
14+
* [Ubuntu Xenial 16.04](/user/reference/xenial/) **default**
15+
* [Ubuntu Trusty 14.04](/user/reference/trusty/)
1616
* [Ubuntu Precise 12.04](/user/reference/precise/)
1717

1818
Travis CI also supports the [Windows Build Environment](/user/reference/windows/) and [macOS Build Environment](/user/reference/osx/).

0 commit comments

Comments
 (0)