Fix merge conflict

Author: plaindocs

.gitignore

@@ -5,3 +5,4 @@ _site
 bin
 source/tmp/*
 .sass-cache
+.ruby-version

README.md

@@ -22,7 +22,7 @@ In order to run a local Web server that will serve documentation site, run:
 
     ./bin/jekyll serve
 
-and then open [localhost:4000](http://localhost:4000/) in your browser. 
+and then open [localhost:4000](http://localhost:4000/) in your browser.
 
 To regenerate the HTML pages automatically when you make changes to Markdown source files, use
 
@@ -33,4 +33,4 @@ version (1.8 vs. 1.9) used. It is normal.
 
 ## License
 
-Distributed under the MIT license, the same as other Travis CI projects.
+Distributed under the [MIT license](https://opensource.org/licenses/MIT); the same as other Travis CI projects.

_data/deployments.yml

@@ -1,5 +1,6 @@
 anynines: "/user/deployment/anynines"
 Appfog: "/user/deployment/appfog"
+Atlas: "/user/deployment/atlas/"
 AWS CodeDeploy: "/user/deployment/codedeploy"
 AWS OpsWorks: "/user/deployment/opsworks"
 Azure Web Apps: "/user/deployment/azure-web-apps"
@@ -20,7 +21,6 @@ Hackage: "/user/deployment/hackage"
 Heroku: "/user/deployment/heroku"
 Modulus: "/user/deployment/modulus"
 Ninefold: "/user/deployment/ninefold"
-Nodejitsu: "/user/deployment/nodejitsu"
 npm: "/user/deployment/npm"
 OpenShift: "/user/deployment/openshift"
 packagecloud.io: "/user/deployment/packagecloud"

_data/snippets.yml

@@ -0,0 +1,18 @@
+conditional_deploy: |
+  ### Conditional Deploys
+
+  You can deploy only when certain conditions are met.
+  See [Conditional Releases with `on:`](/user/deployment#Conditional-Releases-with-on%3A).
+before_and_after: |
+  ### Running commands before and after deploy
+
+  Sometimes you want to run commands before or after deploying. You can use the `before_deploy` and `after_deploy` stages for this. These will only be triggered if Travis CI is actually deploying.
+
+  ```yaml
+  before_deploy: "echo 'ready?'"
+  deploy:
+    ..
+    after_deploy:
+      - ./after_deploy_1.sh
+      - ./after_deploy_2.sh
+  ```  

assets/javascripts/prism.js

@@ -1,4 +1,4 @@
-/* http://prismjs.com/download.html?themes=prism&languages=markup+css+clike+javascript+ruby */
+/* http://prismjs.com/download.html?themes=prism&languages=markup+css+clike+javascript+ruby+yaml */
 /**
  * prism.js default theme for JavaScript, CSS and HTML
  * Based on dabblet (http://dabblet.com)
@@ -54,10 +54,10 @@ pre[class*="language-"] {
   overflow: auto;
 }
 
-:not(pre) > code[class*="language-"],
-pre[class*="language-"] {
-  // background: #f5f2f0;
-}
+// :not(pre) > code[class*="language-"],
+// pre[class*="language-"] {
+//   background: #f5f2f0;
+// }
 
 /* Inline code */
 :not(pre) > code[class*="language-"] {

assets/stylesheets/prism.scss

@@ -205,13 +205,12 @@ we'll see about adding your custom source to our cache.
 
 ### Fetching and storing caches
 
-* We fetch the repo's cache on every build, including feature branches and pull requests.
-* There is one cache per branch and language version/compiler version/JDK version/Gemfile location/etc.
-* If a branch does not have its own cache yet, it will fetch the master branch cache.
+* Travis CI fetches the cache for every build, including feature branches and pull requests.
+* There is one cache per branch and language version/ compiler version/ JDK version/  Gemfile location/ etc.
+* Pull requests use the cache of the target of the pull request.
+* If a branch does not have its own cache yet, it uses the master branch cache (unless it is a pull request, see above).
 * Only modifications made to the cached directories from normal pushes are stored.
 
-Currently Pull Requests will use the cache of the branch they are supposed to be merged into.
-
 ### `before_cache` phase
 
 When using caches, it may be useful to run command just prior to uploading

user/apt.md

@@ -203,7 +203,7 @@ Please note that the addon only works in 64-bit Linux environments.
 
 ### Environment variables
 
-There is a [list of default environment variables](/user/environment-variables#Default-Environment-Variables) available in each build environment. 
+There is a [list of default environment variables](/user/environment-variables#Default-Environment-Variables) available in each build environment.
 
 ### Libraries
 

user/caching.md

@@ -294,6 +294,6 @@ If you have a command that doesn't produce output for more than 10 minutes, you
 
     install: travis_wait mvn install
 
-`travis_wait` writes a short line to the build log every minutes for 20 minutes, extending the amount of time your command has to finish.
+`travis_wait` writes a short line to the build log every minute for 20 minutes, extending the amount of time your command has to finish.
 
 We recommend careful use of `travis_wait`, as overusing it can extend your build time when there could be a deeper underlying issue. When in doubt, [file a ticket](https://github.com/travis-ci/travis-ci/issues/new) or [email us](mailto:[email protected]) first to see if something could be improved about this particular command first.

user/ci-environment.md

@@ -150,7 +150,7 @@ before_install:
 ```
 
 > Note that this feature is not available for builds that are running on [Container-based workers](/user/ci-environment/#Virtualization-environments).
-> Look into [using the `apt` plug-in](/user/apt/) instead.
+> Look into [using the `apt` plug-in](/user/installing-dependencies/#Installing-Packages-on-Container-Based-Infrastructure) instead.
 
 All virtual machines are snapshotted and returned to their intial state after each build.
 

user/common-build-problems.md

@@ -98,7 +98,7 @@ To use MySQL include the following `services` entry in `.travis.yml`:
 
 Note: MySQL on Travis CI is currently **started on boot** however this may not always be the case.
 
-MySQL binds to 127.0.0.1 and requires authentication. You can connect using the username "travis" or "root" and a blank password.  
+MySQL binds to 127.0.0.1 and requires authentication. You can connect using the username "travis" or "root" and a blank password.
 
 >Note that the "travis" user does not have full MySQL privileges that the "root" user does.
 

user/customizing-the-build.md

@@ -76,7 +76,7 @@ It can be complex, but there can be only one. For example, `$CC = gcc`.
 This example deploys to Nodejistu only from the `staging` branch when the test has run on Node.js version 0.11.
 
     deploy:
-      provider: nodejitsu
+      provider: appfog
       user: ...
       api_key: ...
       on: