Merge branch '2.7' into 2.8

symfony · Aug 19, 2015 · ed71759 · ed71759
2 parents 3bdfec4 + 3c3615c
commit ed71759
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 16 deletions.
diff --git a/best_practices/web-assets.rst b/best_practices/web-assets.rst
@@ -30,7 +30,7 @@ much more concise:
 
     Keep in mind that ``web/`` is a public directory and that anything stored
     here will be publicly accessible, including all the original asset files
-    (e.g. Sass, LESS and CoffeScript files).
+    (e.g. Sass, LESS and CoffeeScript files).
 
 Using Assetic
 -------------

diff --git a/book/installation.rst b/book/installation.rst
@@ -98,9 +98,6 @@ optional second argument of the ``new`` command:
     $ symfony new my_project_name 2.3.26
     $ symfony new my_project_name 2.6.5
 
-    # use the most recent LTS (Long Term Support) version
-    $ symfony new my_project_name lts
-
 If you want your project to be based on the latest :ref:`Symfony LTS version <releases-lts>`,
 pass ``lts`` as the second argument of the ``new`` command:
 
@@ -169,9 +166,8 @@ browsing the project directory and executing this command:
     $ cd my_project_name/
     $ php app/console server:run
 
-Then, open your browser and access the ``http://localhost:8000/app/example``
-URL to see the
-Welcome page of Symfony:
+Then, open your browser and access the ``http://localhost:8000/`` URL to see the
+Welcome Page of Symfony:
 
 .. image:: /images/quick_tour/welcome.png
    :align: center
@@ -410,11 +406,6 @@ need in your new application.
 Be sure to also check out the :doc:`Cookbook </cookbook/index>`, which contains
 a wide variety of articles about solving specific problems with Symfony.
 
-.. note::
-
-    If you want to remove the sample code from your distribution, take a look
-    at this cookbook article: ":doc:`/cookbook/bundles/remove`"
-
 .. _`explained in this post`: http://fabien.potencier.org/article/73/signing-project-releases
 .. _`Composer`: https://getcomposer.org/
 .. _`Composer download page`: https://getcomposer.org/download/

diff --git a/book/page_creation.rst b/book/page_creation.rst
@@ -43,7 +43,7 @@ a method inside of it that will be executed when someone goes to ``/lucky/number
     use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route;
     use Symfony\Component\HttpFoundation\Response;
 
-    class LuckyController
+    class LuckyController extends Controller
     {
         /**
          * @Route("/lucky/number")

diff --git a/cookbook/deployment/platformsh.rst b/cookbook/deployment/platformsh.rst
@@ -37,9 +37,11 @@ Platform.sh how to deploy your application (read more about
 
     # The name of this app. Must be unique within a project.
     name: myphpproject
-
-    # The toolstack used to build the application.
-    toolstack: "php:symfony"
+    
+    # The type of the application to build.
+    type: php:5.6
+    build:
+      flavor: symfony
 
     # The relationships of the application with services or other applications.
     # The left-hand side is the name of the relationship as it will be exposed

diff --git a/images/quick_tour/welcome.png b/images/quick_tour/welcome.png