Merge branch '2.x'

README.md

@@ -19,20 +19,14 @@ Version 3 allows [serving files directly from the filesystem](static/README.md)
 
 Post to the [Google Group](http://groups.google.com/group/minify).
 
-### Wordpress User?
-
-Consider instead using a dedicated WordPress plugin for more deep integration and simpler installation. E.g.:
-- [BWP Minify](http://wordpress.org/extend/plugins/bwp-minify/)
-- [W3 Total Cache](http://wordpress.org/extend/plugins/w3-total-cache/)
-
-Unfortunately we can't support the WordPress plugins here.
-
 ## Installation
 
 See the [install guide](https://github.com/mrclay/minify/blob/master/docs/Install.wiki.md).
 
 ## Configuration & Usage
 
+(Using 2.x? [Here are the 2.x docs](https://github.com/mrclay/minify/tree/2.x/docs).)
+
 See the [user guide](https://github.com/mrclay/minify/blob/master/docs/UserGuide.wiki.md).
 
 Minify also comes with a [URI Builder application](https://github.com/mrclay/minify/blob/master/docs/BuilderApp.wiki.md) that can help you write URLs

server-info.php

@@ -23,7 +23,10 @@ function assertTrue($test, $message) {
 header('Content-Type: text/plain');
 
 $file = __FILE__;
+$tmp = sys_get_temp_dir();
+
 echo <<<EOD
+Cache directory : $tmp
 __FILE__        : $file
 SCRIPT_FILENAME : {$_SERVER['SCRIPT_FILENAME']}
 DOCUMENT_ROOT   : {$_SERVER['DOCUMENT_ROOT']}