diff options
| author | Hasan Ramezani <hasan.r67@gmail.com> | 2020-03-26 22:22:15 +0100 |
|---|---|---|
| committer | Mariusz Felisiak <felisiak.mariusz@gmail.com> | 2020-03-27 07:02:09 +0100 |
| commit | a6cc8b80cbf149c028f127e01893c2b3973b8878 (patch) | |
| tree | 4a9119ecb11e04b5dd922ae13900b183005544cf | |
| parent | f4ee1ba74d214004f111992578c6fe15200f9362 (diff) | |
[3.0.x] Fixed #31400 -- Doc'd the expected type of CONN_MAX_AGE database option.
Backport of bec4dea844332390aecd72f22afc6673a3f5f5fc from master
| -rw-r--r-- | docs/ref/databases.txt | 2 | ||||
| -rw-r--r-- | docs/ref/settings.txt | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/docs/ref/databases.txt b/docs/ref/databases.txt index de1088dd39..dae1c03077 100644 --- a/docs/ref/databases.txt +++ b/docs/ref/databases.txt @@ -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 diff --git a/docs/ref/settings.txt b/docs/ref/settings.txt index 72587618e6..4dd71091eb 100644 --- a/docs/ref/settings.txt +++ b/docs/ref/settings.txt @@ -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 |