Merge branch '1.3'

* 1.3:
  bumped version to 1.3.1-DEV
  prepared the 1.3.0 release
  prepared the 1.2.5 release
  updated CHANGELOG
  fixed changelog
  update fastcgi_pass socket location

Conflicts:
	doc/changelog.rst
	src/Silex/Application.php

doc/changelog.rst

@@ -18,7 +18,12 @@ Changelog
 * ``monolog.exception.logger_filter`` option added to Monolog service provider
 * [BC BREAK] ``$app['request']`` service removed, use ``$app['request_stack']`` instead
 
-1.3.0 (2015-XX-XX)
+1.3.1 (2015-XX-XX)
+------------------
+
+* n/a
+
+1.3.0 (2015-06-05)
 ------------------
 
 * added a `$app['user']` to get the current user (security provider)
@@ -26,10 +31,15 @@ Changelog
 * added support for the OPTIONS HTTP method
 * added caching for the Translator provider
 * deprecated `$app['exception_handler']->disable()` in favor of `unset($app['exception_handler'])`
-* made Silex compatible with Symfony 2.7 (and keep compatibility with Symfony 2.3, 2.5, and 2.6)
+* made Silex compatible with Symfony 2.7 an 2.8 (and keep compatibility with Symfony 2.3, 2.5, and 2.6)
 * removed deprecated TwigCoreExtension class (register the new HttpFragmentServiceProvider instead)
 * bumped minimum version of PHP to 5.3.9
 
+1.2.5 (2015-06-04)
+------------------
+
+* no code changes (last version of the 1.2 branch)
+
 1.2.4 (2015-04-11)
 ------------------
 

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