Merge branch '2.1.x'

Closes gh-17383
This commit is contained in:
Andy Wilkinson 2019-07-01 15:57:41 +01:00
commit cca005f756
1 changed files with 1 additions and 1 deletions

View File

@ -3325,7 +3325,7 @@ Common server settings include:
* Network settings: Listen port for incoming HTTP requests (`server.port`), interface
address to bind to `server.address`, and so on.
* Session settings: Whether the session is persistent (`server.servlet.session.persistence`),
* Session settings: Whether the session is persistent (`server.servlet.session.persistent`),
session timeout (`server.servlet.session.timeout`), location of session data
(`server.servlet.session.store-dir`), and session-cookie configuration
(`server.servlet.session.cookie.*`).