Merge branch '2.1.x'

This commit is contained in:
David Lord 2022-06-11 14:16:51 -07:00
commit dcd1a1e0b6
No known key found for this signature in database
GPG key ID: 7A1C87E3F5BC42A8
11 changed files with 287 additions and 171 deletions

View file

@ -602,7 +602,8 @@ def send_from_directory(
If the final path does not point to an existing regular file,
raises a 404 :exc:`~werkzeug.exceptions.NotFound` error.
:param directory: The directory that ``path`` must be located under.
:param directory: The directory that ``path`` must be located under,
relative to the current application's root path.
:param path: The path to the file to send, relative to
``directory``.
:param kwargs: Arguments to pass to :func:`send_file`.