aboutsummaryrefslogtreecommitdiffstats
path: root/lib/stdlib/doc/src/specs.xml
diff options
context:
space:
mode:
authorBjörn-Egil Dahlberg <[email protected]>2014-03-06 16:42:39 +0100
committerBjörn-Egil Dahlberg <[email protected]>2014-03-06 16:42:39 +0100
commit544fb141916d8676bc763318074e4d0783414af1 (patch)
tree480af3d2106cfa68565d7cf0aec90a3ea3e713de /lib/stdlib/doc/src/specs.xml
parent35e8ea1c100248acc037205b0d551f6ee0b9f773 (diff)
parent378683a454796acd1777a6efff30c11043a0e268 (diff)
downloadotp-544fb141916d8676bc763318074e4d0783414af1.tar.gz
otp-544fb141916d8676bc763318074e4d0783414af1.tar.bz2
otp-544fb141916d8676bc763318074e4d0783414af1.zip
Merge branch 'egil/maps/doc-module-api'
* egil/maps/doc-module-api: erl_docgen: Generate map() instead of #{} for maps type stdlib: Document Maps module stdlib: Fix maps:from_list/1 spec.
Diffstat (limited to 'lib/stdlib/doc/src/specs.xml')
-rw-r--r--lib/stdlib/doc/src/specs.xml1
1 files changed, 1 insertions, 0 deletions
diff --git a/lib/stdlib/doc/src/specs.xml b/lib/stdlib/doc/src/specs.xml
index 213ce7563f..60a04ed5e7 100644
--- a/lib/stdlib/doc/src/specs.xml
+++ b/lib/stdlib/doc/src/specs.xml
@@ -34,6 +34,7 @@
<xi:include href="../specs/specs_lib.xml"/>
<xi:include href="../specs/specs_lists.xml"/>
<xi:include href="../specs/specs_log_mf_h.xml"/>
+ <xi:include href="../specs/specs_maps.xml"/>
<xi:include href="../specs/specs_math.xml"/>
<xi:include href="../specs/specs_ms_transform.xml"/>
<xi:include href="../specs/specs_orddict.xml"/>