Merge branch 'master' of github.com:travis-ci/travis-ci.github.com

jmazzi · Jul 10, 2012 · cbc6d76 · cbc6d76
2 parents ba2bdd3 + 72bcf69
commit cbc6d76
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/docs/user/browser-extensions.md b/docs/user/browser-extensions.md
@@ -14,4 +14,4 @@ permalink: browser-extensions/
 
 ### Opera
 
-[Travis CI Build Status Extension for Opera](https://addons.opera.com/en/extensions/details/travisgithub/) displays the build status icon next to the project name on GitHub project/user pages and provides button for monitoring build status of user-defined projects.
+[Travis CI Build Status Extension for Opera](https://addons.opera.com/en/extensions/details/travisgithub/) displays the build status icon next to the project name on GitHub project/user pages and provides button for monitoring build status of user-defined projects. It also shows build status of pull requests tested by the Travis Bot.
diff --git a/docs/user/languages/php.md b/docs/user/languages/php.md
@@ -85,9 +85,10 @@ To see real world examples, see:
 
 ### Installing PEAR packages
 
-If your dependencies include PEAR packages, the Travis PHP environment has the [Pyrus command](http://pear2.php.net/) available:
+If your dependencies include PEAR packages, the Travis PHP environment has the [Pyrus](http://pear2.php.net/) and [pear](http://pear.php.net/) commands available:
 
     pyrus install http://phptal.org/latest.tar.gz
+    pear install pear/PHP_CodeSniffer
 
 After install you should refresh your path
 
@@ -109,7 +110,12 @@ You can also install [Composer](http://packagist.org/) packages into the Travis
 
 ### Installing PHP extensions
 
-It is possible to install custom PHP extensions into the Travis environment, but they have to be built against the PHP version being tested. Here is for example how the `memcache` extension can be installed:
+It is possible to install custom PHP extensions into the Travis environment using [PECL](http://pecl.php.net/), but they have to be built against the PHP version being tested. Here is for example how the `memcache` extension can be installed:
+
+    pecl install memcache
+    echo "extension=memcache.so" >> `php --ini | grep "Loaded Configuration" | sed -e "s|.*:\s*||"`
+
+It is also possible to do the installation "manually". This is how the `memcache` extension can be installed this way:
 
     wget http://pecl.php.net/get/memcache-2.2.6.tgz
     tar -xzf memcache-2.2.6.tgz