Merge branch '1.2' into 1.3

* 1.2:
  update fastcgi_pass socket location

doc/web_servers.rst

@@ -61,7 +61,11 @@ resources to ``index.php``:
         }
 
         location @site {
-            fastcgi_pass   unix:/var/run/php-fpm/www.sock;
+            # the ubuntu default
+            fastcgi_pass   unix:/var/run/php5-fpm.sock;
+            # for running on centos
+            #fastcgi_pass   unix:/var/run/php-fpm/www.sock;
+            
             include fastcgi_params;
             fastcgi_param  SCRIPT_FILENAME $document_root/index.php;
             #uncomment when running via https