From 102106be0cdbdf59deb2beeacd809d4783aa4a20 Mon Sep 17 00:00:00 2001
From: Ryan Weaver <weaverryan+github@gmail.com>
Date: Wed, 3 Jun 2020 10:52:46 -0400
Subject: [PATCH 1/4] Adding details about Encore dev-server and https

---
 frontend/encore/dev-server.rst | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/frontend/encore/dev-server.rst b/frontend/encore/dev-server.rst
index 5da7d778cd7..56ddb7a94a9 100644
--- a/frontend/encore/dev-server.rst
+++ b/frontend/encore/dev-server.rst
@@ -17,6 +17,24 @@ Twig shortcuts (or are :ref:`processing your assets through entrypoints.json <lo
 in some other way), you're done: the paths in your templates will automatically point
 to the dev server.
 
+Enabling https & the Symfony Web Server
+---------------------------------------
+
+If you're using the `Symfony web server`_ locally with https, you'll need to also
+tell the dev-server to use https. To do this, you can reuse the Symfony web
+server SSL certificate:
+
+.. code-block:: terminal
+
+    # Unix-based systems
+    $ yarn dev-server --https --pfx=$HOME/.symfony/certs/default.p12
+
+    # Windows
+    $ encore dev-server --https --pfx=%UserProfile%\.symfony\certs\default.p12
+
+dev-server Options
+------------------
+
 The ``dev-server`` command supports all the options defined by `webpack-dev-server`_.
 You can set these options via command line options:
 

From 3e1253e76f90c86c96daed3890bf61f351875bb0 Mon Sep 17 00:00:00 2001
From: Ryan Weaver <weaverryan+github@gmail.com>
Date: Wed, 3 Jun 2020 10:54:17 -0400
Subject: [PATCH 2/4] fixing link

---
 frontend/encore/dev-server.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontend/encore/dev-server.rst b/frontend/encore/dev-server.rst
index 56ddb7a94a9..402ff6a2a51 100644
--- a/frontend/encore/dev-server.rst
+++ b/frontend/encore/dev-server.rst
@@ -20,7 +20,7 @@ to the dev server.
 Enabling https & the Symfony Web Server
 ---------------------------------------
 
-If you're using the `Symfony web server`_ locally with https, you'll need to also
+If you're using the :doc:`Symfony web server </setup/symfony_server>` locally with https, you'll need to also
 tell the dev-server to use https. To do this, you can reuse the Symfony web
 server SSL certificate:
 

From 49d472320fb024442342f7f2cf88891a1fc10bc3 Mon Sep 17 00:00:00 2001
From: Ryan Weaver <weaverryan+github@gmail.com>
Date: Wed, 3 Jun 2020 11:06:42 -0400
Subject: [PATCH 3/4] correcting my https :)

---
 frontend/encore/dev-server.rst | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/frontend/encore/dev-server.rst b/frontend/encore/dev-server.rst
index 402ff6a2a51..fa81d9e4bac 100644
--- a/frontend/encore/dev-server.rst
+++ b/frontend/encore/dev-server.rst
@@ -17,11 +17,11 @@ Twig shortcuts (or are :ref:`processing your assets through entrypoints.json <lo
 in some other way), you're done: the paths in your templates will automatically point
 to the dev server.
 
-Enabling https & the Symfony Web Server
+Enabling HTTPS & the Symfony Web Server
 ---------------------------------------
 
-If you're using the :doc:`Symfony web server </setup/symfony_server>` locally with https, you'll need to also
-tell the dev-server to use https. To do this, you can reuse the Symfony web
+If you're using the :doc:`Symfony web server </setup/symfony_server>` locally with HTTPS,
+you'll need to also tell the dev-server to use HTTPS. To do this, you can reuse the Symfony web
 server SSL certificate:
 
 .. code-block:: terminal

From ba86548756afd5858bd035cd53f1fb9681ea22a8 Mon Sep 17 00:00:00 2001
From: Ryan Weaver <weaverryan+github@gmail.com>
Date: Wed, 3 Jun 2020 15:02:33 -0400
Subject: [PATCH 4/4] Update frontend/encore/dev-server.rst

Co-authored-by: Tugdual Saunier <tucksaun@users.noreply.github.com>
---
 frontend/encore/dev-server.rst | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/frontend/encore/dev-server.rst b/frontend/encore/dev-server.rst
index fa81d9e4bac..9af0b5d69ad 100644
--- a/frontend/encore/dev-server.rst
+++ b/frontend/encore/dev-server.rst
@@ -17,8 +17,8 @@ Twig shortcuts (or are :ref:`processing your assets through entrypoints.json <lo
 in some other way), you're done: the paths in your templates will automatically point
 to the dev server.
 
-Enabling HTTPS & the Symfony Web Server
----------------------------------------
+Enabling HTTPS using the Symfony Web Server
+-------------------------------------------
 
 If you're using the :doc:`Symfony web server </setup/symfony_server>` locally with HTTPS,
 you'll need to also tell the dev-server to use HTTPS. To do this, you can reuse the Symfony web