Skip to content

Commit

Permalink
[3.0.x] Fixed #31400 -- Doc'd the expected type of CONN_MAX_AGE datab…
Browse files Browse the repository at this point in the history
…ase option.

Backport of bec4dea from master
  • Loading branch information
hramezani authored and felixxm committed Mar 27, 2020
1 parent f4ee1ba commit a6cc8b8
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion docs/ref/databases.txt
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ connection. It can be set independently for each database.

The default value is ``0``, preserving the historical behavior of closing the
database connection at the end of each request. To enable persistent
connections, set :setting:`CONN_MAX_AGE` to a positive number of seconds. For
connections, set :setting:`CONN_MAX_AGE` to a positive integer of seconds. For
unlimited persistent connections, set it to ``None``.

Connection management
Expand Down
6 changes: 3 additions & 3 deletions docs/ref/settings.txt
Original file line number Diff line number Diff line change
Expand Up @@ -588,9 +588,9 @@ file. When specifying the path, always use forward slashes, even on Windows

Default: ``0``

The lifetime of a database connection, in seconds. Use ``0`` to close database
connections at the end of each request — Django's historical behavior — and
``None`` for unlimited persistent connections.
The lifetime of a database connection, as an integer of seconds. Use ``0`` to
close database connections at the end of each request — Django's historical
behavior — and ``None`` for unlimited persistent connections.

.. setting:: OPTIONS

Expand Down

0 comments on commit a6cc8b8

Please sign in to comment.