Merge branch '1.3'

* 1.3: Minor typo in web_servers.rst bumped version to 1.3.3-DEV prepared the 1.3.2 release updated CHANGELOG
silexphp · Sep 1, 2015 · 2183542 · 2183542
2 parents 24a1c52 + 647ccdf
commit 2183542
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/doc/changelog.rst b/doc/changelog.rst
@@ -24,11 +24,16 @@ Changelog
 * ``monolog.exception.logger_filter`` option added to Monolog service provider
 * [BC BREAK] ``$app['request']`` service removed, use ``$app['request_stack']`` instead
 
-1.3.2 (2015-XX-XX)
+1.3.3 (2015-XX-XX)
 ------------------
 
 * n/a
 
+1.3.2 (2015-08-24)
+------------------
+
+* no changes
+
 1.3.1 (2015-08-04)
 ------------------
 

diff --git a/doc/web_servers.rst b/doc/web_servers.rst
@@ -25,7 +25,7 @@ following ``.htaccess`` file:
     relative from the webroot.
 
 Alternatively, if you use Apache 2.2.16 or higher, you can use the
-`FallbackResource directive`_ so make your .htaccess even easier:
+`FallbackResource directive`_ to make your .htaccess even easier:
 
 .. code-block:: apache