aboutsummaryrefslogtreecommitdiffstats
path: root/lib/inets
diff options
context:
space:
mode:
authorFredrik Gustafsson <[email protected]>2013-08-08 09:28:00 +0200
committerFredrik Gustafsson <[email protected]>2013-08-08 09:28:00 +0200
commit4ba61d6fd151172768c62f254ca46371014f2061 (patch)
tree7340433dae3976aaf143bcdf00654acedd4d343f /lib/inets
parent3021fca734f71f8bae966ab67f1400d37f8927bc (diff)
parentfb9f6a8e40daa7b2377bd4459dc142793f96a80b (diff)
downloadotp-4ba61d6fd151172768c62f254ca46371014f2061.tar.gz
otp-4ba61d6fd151172768c62f254ca46371014f2061.tar.bz2
otp-4ba61d6fd151172768c62f254ca46371014f2061.zip
Merge branch 'tomaon/fix-typo-httpd-doc/OTP-11226' into maint
* tomaon/fix-typo-httpd-doc/OTP-11226: fix: typo, inets/doc/src/httpd
Diffstat (limited to 'lib/inets')
-rw-r--r--lib/inets/doc/src/httpd.xml6
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/inets/doc/src/httpd.xml b/lib/inets/doc/src/httpd.xml
index 3c132d34fa..4210aea3ec 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