Merge branch 'master' into renaming-deis-hephy

Author: Pezi777

_data/deployments.yml

@@ -37,3 +37,4 @@ Script: "/user/deployment/script/"
 Snap Store: "/user/deployment/snaps/"
 Surge.sh: "/user/deployment/surge/"
 TestFairy: "/user/deployment/testfairy/"
+Transifex: "/user/deployment/transifex/"

_includes/sidebar.html

@@ -79,10 +79,7 @@ <h3>Deployments and Uploads</h3>
       <h3>CI Environment Reference</h3>
       <ul>
       <li class="is-overview"><a href="/user/reference/overview/">Overview</a></li>
-      <li><a href="/user/reference/precise/">Precise CI Environment Reference</a></li>
-      <li><a href="/user/reference/trusty/">Trusty CI Environment</a><li>
-      <li><a href="/user/reference/xenial/">Xenial CI Environment</a><li>
-      <li><a href="/user/reference/bionic/">Bionic CI Environment</a><li>  
+      <li><a href="/user/reference/linux/">Ubuntu Linux CI Environment References</a></li>
       <li><a href="/user/reference/osx/">macOS CI Environment Reference</a></li>
       <li><a href="/user/reference/windows/">Windows CI Environment Reference</a></li>
       <li><a href="/user/multi-os/">Building on Multiple Operating Systems</a></li>

user/deployment/transifex.md

@@ -0,0 +1,65 @@
+---
+title: Transifex Deployment
+layout: en
+
+---
+
+Travis CI supports uploading to [Transifex](https://www.transifex.com/).
+
+A minimal configuration is:
+
+```yaml
+deploy:
+  provider: transifex
+  controller: transifex.transifexapps.com
+  username: "Transifex User Name"
+  password: "Transifex Password"
+  app: App_name
+  cli_version: vX.Y.Z  # e.g. v2.7.0 being the latest at this time
+```
+{: data-file=".travis.yml"}
+
+It is recommended that you encrypt your password.
+Assuming you have the Travis CI command line client installed, you can do it like this:
+
+```bash
+$ travis encrypt "YOUR TRANSIFEX PASSWORD" --add deploy.password
+```
+
+You will be prompted to enter your api key on the command line.
+
+You can also have the `travis` tool set up everything for you:
+
+```bash
+$ travis setup transifex
+```
+
+Keep in mind that the above command has to run in your project directory, so it can modify the `.travis.yml` for you.
+
+### Conditional Releases
+
+You can deploy only when certain conditions are met.
+See [Conditional Releases with `on:`](/user/deployment#conditional-releases-with-on).
+
+### Note on `.gitignore`
+
+As this deployment strategy relies on `git`, be mindful that the deployment will
+honor `.gitignore`.
+
+If your `.gitignore` file matches something that your build creates, use
+[`before_deploy`](#running-commands-before-and-after-deploy) to change
+its content.
+
+### Running Commands Before and After Deploy
+
+Sometimes you want to run commands before or after triggering a deployment. You can use the `before_deploy` and `after_deploy` stages for this. These will only be triggered if Travis CI is actually pushing a release.
+
+```yaml
+    before_deploy: "echo 'ready?'"
+    deploy:
+      ..
+    after_deploy:
+      - ./after_deploy_1.sh
+      - ./after_deploy_2.sh
+```
+{: data-file=".travis.yml"}

user/for-beginners.md

@@ -7,10 +7,10 @@ layout: en
 
 
 Welcome to Travis CI! This page provides some contexts and terminologies used
-throughout the platform and documentation, which might be helpful if you are new
+throughout the platform and documentation, which might be helpful, if you are new
 here or new to Continuous Integration (CI).
 
-## What is Continuous Integration (CI)?
+## What Is Continuous Integration (CI)?
 
 Continuous Integration is the practice of merging in small code changes
 frequently - rather than merging in a large change at the end of a development
@@ -22,19 +22,19 @@ process by automatically building and testing code changes, providing immediate
 feedback on the success of the change. Travis CI can also automate other parts
 of your development process by managing deployments and notifications.  
 
-## CI builds and automation: building, testing, deploying
+## CI Builds and Automation: Building, Testing, Deploying
 
-When you run a build, Travis CI clones your GitHub repository into a brand new
+When you run a build, Travis CI clones your GitHub repository into a brand-new
 virtual environment, and carries out a series of tasks to build and test your
-code. If one or more of those tasks fails, the build is considered
+code. If one or more of those tasks fail, the build is considered
 [*broken*](#breaking-the-build). If none of the tasks fail, the build is
-considered [*passed*](#breaking-the-build), and Travis CI can deploy your code
-to a web server, or application host.
+considered [*passed*](#breaking-the-build) and Travis CI can deploy your code
+to a web server or application host.
 
 CI builds can also automate other parts of your delivery workflow. This means
 you can have jobs depend on each other with [Build Stages](/user/build-stages/),
-setup [notifications](/user/notifications/), prepare
-[deployments](/user/deployment/) after builds, and many other tasks.
+set up [notifications](/user/notifications/), prepare
+[deployments](/user/deployment/) after builds and many other tasks.
 
 ## Builds, Jobs, Stages and Phases
 
@@ -45,17 +45,17 @@ In the Travis CI documentation, some common words have specific meanings:
   which comes before the optional `deploy` phase.
 * *job* - an automated process that clones your repository into a virtual
   environment and then carries out a series of *phases* such as compiling your
-  code, running tests, etc. A job fails if the return code of the `script` *phase*
-  is non zero.
+  code, running tests, etc. A job fails, if the return code of the `script` *phase*
+  is non-zero.
 * *build* - a group of *jobs*. For example, a build might have two *jobs*, each
   of which tests a project with a different version of a programming language.
   A *build* finishes when all of its jobs are finished.
-* *stage* - a group of *jobs* that run in parallel as part of sequential build
+* *stage* - a group of *jobs* that run in parallel as part of a sequential build
   process composed of multiple [stages](/user/build-stages/).
 
 ## Breaking the Build
 
-The build is considered *broken* when one or more of its jobs completes with a
+The build is considered *broken*, when one or more of its jobs complete with a
 state that is not *passed*:
 
  * *errored* - a command in the `before_install`, `install`, or `before_script`
@@ -67,15 +67,16 @@ state that is not *passed*:
 Our [Common Builds Problems](/user/common-build-problems/) page is a good place
 to start troubleshooting why your build is broken.
 
-## Infrastructure and environment notes
+## Infrastructure and Environment Notes
 
 Travis CI offers a few different infrastructure environments, so you can select
 the setup that suits your project best:
 
-* *Ubuntu Linux* - these Linux Ubuntu environments run inside full virtual machines, provide plenty of computational resources, and support the use of `sudo`, `setuid`, and `setgid`.
-* *macOS* - uses one of several versions of the macOS operating system. This environment is useful for building projects that require the macOS software, such as projects written in Swift. It is not a requirement to use the macOS environment if you develop on a macOS machine.
+* *Ubuntu Linux* - these Linux Ubuntu environments run inside full virtual machines, provide plenty of computational resources, and support the use of `sudo`, `setuid`, and `setgid`. Check out more information on the [Ubuntu Linux Build Environment](/user/reference/linux/).
+* *macOS* - uses one of several versions of the macOS operating system. This environment is useful for building projects that require the macOS software, such as projects written in Swift. It is not a requirement to use the macOS environment, if you develop on a macOS machine. Here you can find more details on the [macOS Build Environment](/user/reference/osx/).
+* *Windows* - currently Windows Server version 1803 is supported. If you want to know more about it, see the [Windows Build Environment](/user/reference/windows/).
 
-More details are on our environments are available in our [CI Environment](/user/ci-environment/) documentation.
+More details on our build environments are available in our [CI Environment](/user/ci-environment/) documentation.
 
 Now that you've read the basics, head over to our [Tutorial](/user/tutorial/) for details on setting up your first
 build!

user/reference/linux.md

@@ -0,0 +1,18 @@
+---
+title: The Ubuntu Linux Build Environments
+layout: en
+ 
+---
+
+### Overview
+
+This page gives an overview of the different Ubuntu Linux distributions you can use as your CI environment.
+
+You can choose one of the following distributions:
+
+* [Ubuntu Bionic 18.04](/user/reference/bionic/)
+* [Ubuntu Xenial 16.04](/user/reference/xenial/)
+* [Ubuntu Trusty 14.04](/user/reference/trusty/) **default**
+* [Ubuntu Precise 12.04](/user/reference/precise/)
+
+Travis CI also supports the [Windows Build Environment](/user/reference/windows/) and [macOS Build Environment](/user/reference/osx/).