Merge branch '1.2' into 1.3

* 1.2:
  updated intro docs

Conflicts:
	doc/intro.rst

doc/usage.rst

@@ -22,6 +22,12 @@ If you want more flexibility, use Composer_ instead:
 
     composer require silex/silex:~1.3
 
+Web Server
+----------
+
+All examples in the documentation relies on a well-configured web server; read
+the :doc:`webserver documentation<web_servers>` to check yours.
+
 Bootstrap
 ---------