Merge branch 'master' of https://github.com/mitsuhiko/flask

2011-06-02 23:29:31 +02:00 · 2011-06-02 23:29:31 +02:00 · 0baa4800d6
commit 0baa4800d6
parent 8017febac4 c7ff139481
1 changed files with 3 additions and 2 deletions
--- a/docs/config.rst
+++ b/docs/config.rst
@ -65,8 +65,9 @@ The following configuration values are used internally by Flask:
                                :class:`datetime.timedelta` object.
 ``USE_X_SENDFILE``              enable/disable x-sendfile
 ``LOGGER_NAME``                 the name of the logger
-``SERVER_NAME``                 the name of the server.  Required for
-                                subdomain support (e.g.: ``'localhost'``)
+``SERVER_NAME``                 the name and port number of the server.
+                                Required for subdomain support (e.g.:
+                                ``'localhost:5000'``)
 ``MAX_CONTENT_LENGTH``          If set to a value in bytes, Flask will
                                reject incoming requests with a
                                content length greater than this by