Merge branch '2.2.x'

CHANGES.rst

@@ -11,11 +11,9 @@ Unreleased
 Version 2.2.3
 -------------
 
-Unreleased
+Released 2023-02-15
 
--   Autoescaping is now enabled by default for ``.svg`` files. Inside
-    templates this behavior can be changed with the ``autoescape`` tag.
-    :issue:`4831`
+-   Autoescape is enabled by default for ``.svg`` template files. :issue:`4831`
 -   Fix the type of ``template_folder`` to accept ``pathlib.Path``. :issue:`4892`
 -   Add ``--debug`` option to the ``flask run`` command. :issue:`4777`
 

docs/cli.rst

@@ -103,6 +103,14 @@ the ``--debug`` option.
       * Debugger is active!
       * Debugger PIN: 223-456-919
 
+The ``--debug`` option can also be passed to the top level ``flask`` command to enable
+debug mode for any command. The following two ``run`` calls are equivalent.
+
+.. code-block:: console
+
+    $ flask --app hello --debug run
+    $ flask --app hello run --debug
+
 
 Watch and Ignore Files with the Reloader
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

docs/config.rst

@@ -47,17 +47,17 @@ Debug Mode
 
 The :data:`DEBUG` config value is special because it may behave inconsistently if
 changed after the app has begun setting up. In order to set debug mode reliably, use the
-``--debug`` option on the ``flask run`` command. ``flask run`` will use the interactive
-debugger and reloader by default in debug mode.
+``--debug`` option on the ``flask`` or ``flask run`` command. ``flask run`` will use the
+interactive debugger and reloader by default in debug mode.
 
 .. code-block:: text
 
     $ flask --app hello run --debug
 
 Using the option is recommended. While it is possible to set :data:`DEBUG` in your
-config or code, this is strongly discouraged. It can't be read early by the ``flask run``
-command, and some systems or extensions may have already configured themselves based on
-a previous value.
+config or code, this is strongly discouraged. It can't be read early by the
+``flask run`` command, and some systems or extensions may have already configured
+themselves based on a previous value.
 
 
 Builtin Configuration Values

examples/celery/README.md

@@ -19,7 +19,7 @@ In a separate terminal, activate the virtualenv and run the Flask development se
 
 ```shell
 $ . ./.venv/bin/activate
-$ flask -A task_app --debug run
+$ flask -A task_app run --debug
 ```
 
 Go to http://localhost:5000/ and use the forms to submit tasks. You can see the polling