diff options
author | Lukas Larsson <[email protected]> | 2016-08-09 10:10:30 +0200 |
---|---|---|
committer | Lukas Larsson <[email protected]> | 2016-08-09 10:10:30 +0200 |
commit | 3dc416bb89e577c83e16c306fd4821da03681ab9 (patch) | |
tree | e21e65d8519c359a8d1f89b261cfa68a3420f241 /lib/inets/doc | |
parent | 4e4081d091756e86c2d0dce3ccee4aa6fedbf531 (diff) | |
parent | 1db9e32445dc368c6073e3b412567d81a2b5eeb2 (diff) | |
download | otp-3dc416bb89e577c83e16c306fd4821da03681ab9.tar.gz otp-3dc416bb89e577c83e16c306fd4821da03681ab9.tar.bz2 otp-3dc416bb89e577c83e16c306fd4821da03681ab9.zip |
Merge branch 'maint'
Conflicts:
OTP_VERSION
Diffstat (limited to 'lib/inets/doc')
-rw-r--r-- | lib/inets/doc/src/mod_esi.xml | 2 | ||||
-rw-r--r-- | lib/inets/doc/src/notes.xml | 17 |
2 files changed, 17 insertions, 2 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> diff --git a/lib/inets/doc/src/notes.xml b/lib/inets/doc/src/notes.xml index 2f071f049f..caa5a083a3 100644 --- a/lib/inets/doc/src/notes.xml +++ b/lib/inets/doc/src/notes.xml @@ -33,7 +33,22 @@ <file>notes.xml</file> </header> - <section><title>Inets 6.3.1</title> + <section><title>Inets 6.3.2</title> + + <section><title>Improvements and New Features</title> + <list> + <item> + <p> + PUT and DELETE support has been added to mod_esi</p> + <p> + Own Id: OTP-13688 Aux Id: seq13149 </p> + </item> + </list> + </section> + +</section> + +<section><title>Inets 6.3.1</title> <section><title>Fixed Bugs and Malfunctions</title> <list> |