diff options
author | Lukas Larsson <[email protected]> | 2016-08-09 10:08:30 +0200 |
---|---|---|
committer | Lukas Larsson <[email protected]> | 2016-08-09 10:08:30 +0200 |
commit | 1db9e32445dc368c6073e3b412567d81a2b5eeb2 (patch) | |
tree | 3df47a3d3c741d76198f85c55c410f5958fea1d1 /lib/inets/doc/src/mod_esi.xml | |
parent | e23bc1c5705c07735cb87183f6e7409b40613d74 (diff) | |
parent | 020d38d4c9062f255b52eeb35542152c7cff1598 (diff) | |
download | otp-1db9e32445dc368c6073e3b412567d81a2b5eeb2.tar.gz otp-1db9e32445dc368c6073e3b412567d81a2b5eeb2.tar.bz2 otp-1db9e32445dc368c6073e3b412567d81a2b5eeb2.zip |
Merge branch 'maint-19' into maint
Conflicts:
lib/ssl/src/ssl.appup.src
Diffstat (limited to 'lib/inets/doc/src/mod_esi.xml')
-rw-r--r-- | lib/inets/doc/src/mod_esi.xml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/inets/doc/src/mod_esi.xml b/lib/inets/doc/src/mod_esi.xml index 8279fdc824..006fca1bdf 100644 --- a/lib/inets/doc/src/mod_esi.xml +++ b/lib/inets/doc/src/mod_esi.xml @@ -61,7 +61,7 @@ <tag><c>{server_port, integer()}</c></tag> <item><p>Servers port number.</p></item> - <tag><c>{request_method, "GET | "PUT" | "DELETE | "POST" | "PATCH"}</c></tag> + <tag><c>{request_method, "GET | "PUT" | "DELETE" | "POST" | "PATCH"}</c></tag> <item><p>HTTP request method.</p></item> <tag><c>{remote_adress, inet:ip_address()} </c></tag> |