diff options
| author | Fredrik Gustafsson <[email protected]> | 2013-08-08 09:28:10 +0200 |
|---|---|---|
| committer | Fredrik Gustafsson <[email protected]> | 2013-08-08 09:28:10 +0200 |
| commit | e08d6790ebae6a74952f910355e19125408dcc74 (patch) | |
| tree | 78e38f3f94c5ea357a2daf913b894dfe10e1a031 | |
| parent | 4c88eb1dcc10b6404bcc354aa3db09e7140246b3 (diff) | |
| parent | 4ba61d6fd151172768c62f254ca46371014f2061 (diff) | |
| download | otp-e08d6790ebae6a74952f910355e19125408dcc74.tar.gz otp-e08d6790ebae6a74952f910355e19125408dcc74.tar.bz2 otp-e08d6790ebae6a74952f910355e19125408dcc74.zip | |
Merge branch 'maint'
| -rw-r--r-- | lib/inets/doc/src/httpd.xml | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/inets/doc/src/httpd.xml b/lib/inets/doc/src/httpd.xml index ae0ee17530..3830b2e5ab 100644 --- a/lib/inets/doc/src/httpd.xml +++ b/lib/inets/doc/src/httpd.xml @@ -251,14 +251,14 @@ </item> <marker id="prop_max_uri"></marker> - <tag>{max_uri, integer()}</tag> + <tag>{max_uri_size, integer()}</tag> <item> <p>Limits the size of the HTTP request URI. By default there is no limit. </p> </item> <marker id="prop_max_keep_alive_req"></marker> - <tag>{max_keep_alive_requests, integer()}</tag> + <tag>{max_keep_alive_request, integer()}</tag> <item> <p>The number of request that a client can do on one connection. When the server has responded to the number of @@ -632,7 +632,7 @@ bytes </item> <marker id="prop_edlog"></marker> - <tag>{error_disk_log, internal | external}</tag> + <tag>{error_disk_log, path()}</tag> <item> <p>Defines the filename of the (disk_log(3)) error log file to be used to log server errors. If the filename does not begin |