diff options
author | Ingela Anderton Andin <[email protected]> | 2019-01-09 10:02:37 +0100 |
---|---|---|
committer | Ingela Anderton Andin <[email protected]> | 2019-01-09 10:02:37 +0100 |
commit | 648a86aa9c2df78501242d68c72fd5769f5d66c9 (patch) | |
tree | 03b63daff6fb796ba739e6512c8e6237f591a869 | |
parent | 9009934d56625249503210298e102d8e5744f546 (diff) | |
parent | d6d8777d0f02f73d55407a354b1df094288ddf35 (diff) | |
download | otp-648a86aa9c2df78501242d68c72fd5769f5d66c9.tar.gz otp-648a86aa9c2df78501242d68c72fd5769f5d66c9.tar.bz2 otp-648a86aa9c2df78501242d68c72fd5769f5d66c9.zip |
Merge branch 'maint'
-rw-r--r-- | lib/inets/doc/src/httpd_util.xml | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/lib/inets/doc/src/httpd_util.xml b/lib/inets/doc/src/httpd_util.xml index 29971ba8ae..e0f947f860 100644 --- a/lib/inets/doc/src/httpd_util.xml +++ b/lib/inets/doc/src/httpd_util.xml @@ -45,8 +45,7 @@ <fsummary>Converts the date to the Erlang date format.</fsummary> <type> <v>DateString = string()</v> - <v>ErlDate = {{Year,Month,Date},{Hour,Min,Sec}}</v> - <v>Year = Month = Date = Hour = Min = Sec = integer()</v> + <v>ErlDate = calendar:datetime() </v> </type> <desc> <p><c>convert_request_date/1</c> converts <c>DateString</c> to @@ -281,10 +280,10 @@ <func> <name since="">rfc1123_date() -> RFC1123Date</name> - <name since="">rfc1123_date({{YYYY,MM,DD},{Hour,Min,Sec}}) -> RFC1123Date</name> + <name since="">rfc1123_date(Date) -> RFC1123Date</name> <fsummary>Returns the current date in RFC 1123 format.</fsummary> <type> - <v>YYYY = MM = DD = Hour = Min = Sec = integer()</v> + <v> Date = calendar:datetime()</v> <v>RFC1123Date = string()</v> </type> <desc> |