Merge branch '3.2'

* 3.2:
  Fix deprecated swiftmailer parameter
  Update sample sqlite path according to symfony 3 directory structure

Author: fabpot

app/config/config.yml

@@ -51,7 +51,7 @@ doctrine:
         charset:  UTF8
         # if using pdo_sqlite as your database driver:
         #   1. add the path in parameters.yml
-        #     e.g. database_path: "%kernel.root_dir%/data/data.db3"
+        #     e.g. database_path: "%kernel.root_dir%/../var/data/data.sqlite"
         #   2. Uncomment database_path in parameters.yml.dist
         #   3. Uncomment next line:
         #path:     "%database_path%"

app/config/config_dev.yml

@@ -31,4 +31,4 @@ monolog:
         #    level:  info
 
 #swiftmailer:
-#    delivery_address: me@example.com
+#    delivery_addresses: ['me@example.com']

composer.json

@@ -16,7 +16,7 @@
         "doctrine/orm": "^2.5",
         "doctrine/doctrine-bundle": "^1.6",
         "doctrine/doctrine-cache-bundle": "^1.2",
-        "symfony/swiftmailer-bundle": "^2.3",
+        "symfony/swiftmailer-bundle": "^2.3.10",
         "symfony/monolog-bundle": "^3.0",
         "symfony/polyfill-apcu": "^1.0",
         "sensio/distribution-bundle": "^5.0",