aboutsummaryrefslogtreecommitdiffstats
path: root/lib/edoc/priv/edoc.dtd
diff options
context:
space:
mode:
authorHans Bolinder <[email protected]>2016-06-09 10:10:04 +0200
committerHans Bolinder <[email protected]>2016-06-09 10:10:04 +0200
commit6c6cdb99b2f80630816089ad5f75d8a81266b5cc (patch)
tree3676db6a83474555078212cb3d70f11497734e7e /lib/edoc/priv/edoc.dtd
parent6fe86a5858d2894887ea4c0f343c2c38283cf556 (diff)
parent5e7542d6f7cd1964839f6214915c7f9b7d7f8866 (diff)
downloadotp-6c6cdb99b2f80630816089ad5f75d8a81266b5cc.tar.gz
otp-6c6cdb99b2f80630816089ad5f75d8a81266b5cc.tar.bz2
otp-6c6cdb99b2f80630816089ad5f75d8a81266b5cc.zip
Merge branch 'hasse/edoc/fix_maps_type/PR-1014'
* hasse/edoc/fix_maps_type/PR-1014: edoc: Fix new Maps syntax
Diffstat (limited to 'lib/edoc/priv/edoc.dtd')
-rw-r--r--lib/edoc/priv/edoc.dtd6
1 files changed, 5 insertions, 1 deletions
diff --git a/lib/edoc/priv/edoc.dtd b/lib/edoc/priv/edoc.dtd
index 4278a9e643..89058f5d85 100644
--- a/lib/edoc/priv/edoc.dtd
+++ b/lib/edoc/priv/edoc.dtd
@@ -103,7 +103,7 @@
<!ATTLIST type name CDATA #IMPLIED>
<!ELEMENT union (typevar | atom | integer | float | nil | list | tuple |
- fun | record | abstype)+>
+ fun | record | map | abstype)+>
<!ELEMENT typevar EMPTY>
<!ATTLIST typevar name CDATA #REQUIRED>
@@ -129,6 +129,10 @@
<!ELEMENT field (atom, type)>
+<!ELEMENT map (map_field)*>
+
+<!ELEMENT map_field (type, type)>
+
<!ELEMENT abstype (erlangName, type*)>
<!ATTLIST abstype
href CDATA #IMPLIED>