Merge branch 'gh-pages' of github.com:travis-ci/docs-travis-ci-com into gh-pages

Author: BanzaiMan

user/deployment.md

@@ -98,7 +98,7 @@ This example deploys to GitHub Releases when a tag is set and the Ruby version i
 
     deploy:
       provider: releases
-      api-key: "GITHUB OAUTH TOKEN"
+      api_key: "GITHUB OAUTH TOKEN"
       file: "FILE TO UPLOAD"
       skip_cleanup: true
       on:

user/deployment/cloudfiles.md

@@ -1,7 +1,7 @@
 ---
 title: Rackspace Cloud Files Deployment
 layout: en
-permalink: /user/deployment/cloudfiles/
+permalink: /user/deployment/cloudfiles/
 ---
 
 Travis CI can automatically upload your build to [Rackspace Cloud Files](https://www.rackspace.com/cloud/files/) after a successful build.
@@ -11,7 +11,7 @@ For a minimal configuration, all you need to do is add the following to your `.t
     deploy:
       provider: cloudfiles
       username: "RACKSPACE USERNAME"
-      api-key: "RACKSPACE API KEY"
+      api_key: "RACKSPACE API KEY"
       region: "CLOUDFILE REGION"
       container: "CLOUDFILES CONTAINER NAME"
 
@@ -20,7 +20,7 @@ This example is almost certainly not ideal, as you probably want to upload your
     deploy:
       provider: cloudfiles
       username: "RACKSPACE USERNAME"
-      api-key: "RACKSPACE API KEY"
+      api_key: "RACKSPACE API KEY"
       region: "CLOUDFILE REGION"
       container: "CLOUDFILES CONTAINER NAME"
       skip_cleanup: true
@@ -47,7 +47,7 @@ You can tell Travis CI only to deploy on tags, like this:
 	deploy:
       provider: cloudfiles
       username: "RACKSPACE USERNAME"
-      api-key: "RACKSPACE API KEY"
+      api_key: "RACKSPACE API KEY"
       region: "CLOUDFILE REGION"
       container: "CLOUDFILES CONTAINER NAME"
       skip_cleanup: true
@@ -62,7 +62,7 @@ Often, you don't want to upload your entire project to Cloud Files. You can tell
 	deploy:
       provider: cloudfiles
       username: "RACKSPACE USERNAME"
-      api-key: "RACKSPACE API KEY"
+      api_key: "RACKSPACE API KEY"
       region: "CLOUDFILE REGION"
       container: "CLOUDFILES CONTAINER NAME"
       skip_cleanup: true
@@ -74,13 +74,13 @@ If you want to upload to multiple containers, you can do this:
     deploy:
       - provider: cloudfiles
         username: "RACKSPACE USERNAME"
-        api-key: "RACKSPACE API KEY"
+        api_key: "RACKSPACE API KEY"
         region: "CLOUDFILE REGION"
         container: "CLOUDFILES CONTAINER NAME"
         skip_cleanup: true
       - provider: cloudfiles
         username: "RACKSPACE USERNAME"
-        api-key: "RACKSPACE API KEY"
+        api_key: "RACKSPACE API KEY"
         region: "CLOUDFILE REGION"
         container: "CLOUDFILES CONTAINER NAME"
         skip_cleanup: true
@@ -92,7 +92,7 @@ You can explicitly specify the branch to release from with the **on** option:
     deploy:
       provider: cloudfiles
       username: "RACKSPACE USERNAME"
-      api-key: "RACKSPACE API KEY"
+      api_key: "RACKSPACE API KEY"
       region: "CLOUDFILE REGION"
       container: "CLOUDFILES CONTAINER NAME"
       skip_cleanup: true
@@ -104,7 +104,7 @@ Alternatively, you can also configure Travis CI to release from all branches:
     deploy:
       provider: cloudfiles
       username: "RACKSPACE USERNAME"
-      api-key: "RACKSPACE API KEY"
+      api_key: "RACKSPACE API KEY"
       region: "CLOUDFILE REGION"
       container: "CLOUDFILES CONTAINER NAME"
       skip_cleanup: true

user/deployment/releases.md

@@ -62,7 +62,7 @@ You can upload multiple files using yml array notation. This example uploads two
 
     deploy:
       provider: releases
-      api-key: "GITHUB OAUTH TOKEN"
+      api_key: "GITHUB OAUTH TOKEN"
       file:
         - "FILE 1"
         - "FILE 2"

user/languages/php.md

@@ -187,9 +187,9 @@ Please note that these extensions are not enabled by default with the exception
 
 For PHP versions up to 5.6, these extensions are available.
 
-* [apc.so](http://php.net/apc)
+* [apc.so](http://php.net/apc) (not available for 5.5 or 5.6)
 * [memcache.so](http://php.net/memcache) or [memcached.so](http://php.net/memcached)
-* [mongo.so](http://php.net/mongo) or [mongodb.so](https://php.net/mongodb)
+* [mongo.so](http://php.net/mongo)
 * [amqp.so](http://php.net/amqp)
 * [zmq.so](http://zeromq.org/bindings:php)
 * [xdebug.so](http://xdebug.org)

user/multi-os.md

@@ -109,7 +109,7 @@ matrix:
 
 ### Python example (unsupported languages)
 
-For example, this `.travis.yml` uses the `matrix.include` key to include four specific entries in the build matrix. It also takes advantage of `language: generic` to test Python in OS X. Custom requirements are installed in `./.travis./install.sh` below.
+For example, this `.travis.yml` uses the `matrix.include` key to include four specific entries in the build matrix. It also takes advantage of `language: generic` to test Python in OS X. Custom requirements are installed in `./.travis/install.sh` below.
 
 ```yaml
 
@@ -158,4 +158,4 @@ else
 fi
 ```
 
-Travis CI then tests the four expanded builds using `make test` automatically.  
+Travis CI then tests the four expanded builds using `make test` automatically.

user/notifications.md

@@ -187,7 +187,8 @@ You can interpolate the following variables:
 * *commit_subject*: first line of the commit message
 * *result*: result of build
 * *message*: travis message to the build
-* *duration*: duration of the build
+* *duration*: total duration of all builds in the matrix
+* *elapsed_time*: time between build start and finish
 * *compare_url*: commit change view URL
 * *build_url*: URL of the build detail