Merge branch '4.4' into 5.3

* 4.4:
  Local development Docker improvements
  Contributing guidelines: make version reference older than current maintained version
  Deleting npm from yarn code block

Author: javiereguiluz

.dockerignore

@@ -0,0 +1,8 @@
+/.git
+/_build/doctrees
+/_build/spelling
+/_build/html
+/_build/logs.txt
+/_build/vendor
+/_build/output
+*.pyc

Dockerfile

@@ -1,16 +1,20 @@
-FROM  python:2-stretch as builder
+FROM python:2-alpine as builder
 
 WORKDIR /www
 
 COPY ./_build/.requirements.txt _build/
 
-RUN pip install  pip==9.0.1 wheel==0.29.0 \
+RUN apk add \
+    git \
+    make
+
+RUN pip install pip==9.0.1 wheel==0.29.0 \
     && pip install -r _build/.requirements.txt
 
 COPY . /www
 
 RUN make -C _build html
 
-FROM  nginx:latest
+FROM nginx:alpine
 
 COPY --from=builder /www/_build/html /usr/share/nginx/html

contributing/documentation/overview.rst

@@ -121,7 +121,7 @@ branch of the ``upstream`` remote, which is the original Symfony Docs repository
 Fixes should always be based on the **oldest maintained branch** which contains
 the error. Nowadays this is the ``4.4`` branch. If you are instead documenting a
 new feature, switch to the first Symfony version that included it, e.g.
-``upstream/3.1``.
+``upstream/5.4``.
 
 **Step 5.** Now make your changes in the documentation. Add, tweak, reword and
 even remove any content and do your best to comply with the

frontend/encore/simple-example.rst

@@ -68,9 +68,6 @@ To build the assets, run the following if you use the Yarn package manager:
     # on deploy, create a production build
     $ yarn encore production
 
-    # if you use the npm package manager
-    $ npm install react react-dom prop-types --save
-
 If you use the npm package manager, run the following commands instead:
 
 .. code-block:: terminal