From 184c298917034b206e566b243e62bb5b5d2cd3d8 Mon Sep 17 00:00:00 2001
From: ThamiSadouk <35571728+ThamiSadouk@users.noreply.github.com>
Date: Wed, 15 Aug 2018 10:11:18 +0200
Subject: [PATCH 1/2] Update setup.rst

IMO we don't need to download the web server bundle except if we have the skeleton version.
---
 setup.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setup.rst b/setup.rst
index 240697f6f6e..a0af6b342e4 100644
--- a/setup.rst
+++ b/setup.rst
@@ -41,7 +41,7 @@ On production, you should use a web server like Nginx or Apache
 (see :doc:`configuring a web server to run Symfony </setup/web_server_configuration>`).
 But for development, it's even easier to use the :doc:`Symfony PHP web server <setup/built_in_web_server>`.
 
-First, move into your new project and install the server:
+If you have downloaded the skeleton version, move into your new project and install the server:
 
 .. code-block:: terminal
 

From 722f5f8bd5fa24b2de8f95c44c88930a1e30d62b Mon Sep 17 00:00:00 2001
From: Ryan Weaver <weaverryan+github@gmail.com>
Date: Sat, 18 Aug 2018 14:33:02 -0400
Subject: [PATCH 2/2] Clarifying when you need to or don't need to install the
 server bundle

---
 setup.rst | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/setup.rst b/setup.rst
index a0af6b342e4..2c0f95828c1 100644
--- a/setup.rst
+++ b/setup.rst
@@ -34,6 +34,10 @@ In other words, your new app is ready!
 
         $ composer create-project symfony/skeleton my-project
 
+        # optional: install the web server bundle (explained next)
+        $ cd my-project
+        $ composer require symfony/web-server-bundle --dev
+
 Running your Symfony Application
 --------------------------------
 
@@ -41,17 +45,11 @@ On production, you should use a web server like Nginx or Apache
 (see :doc:`configuring a web server to run Symfony </setup/web_server_configuration>`).
 But for development, it's even easier to use the :doc:`Symfony PHP web server <setup/built_in_web_server>`.
 
-If you have downloaded the skeleton version, move into your new project and install the server:
+Move into your new project and start the server:
 
 .. code-block:: terminal
 
     $ cd my-project
-    $ composer require symfony/web-server-bundle --dev
-
-To start the server, run:
-
-.. code-block:: terminal
-
     $ php bin/console server:run
 
 Open your browser and navigate to ``http://localhost:8000/``. If everything is working,