Merge branch 'hasse/erl_docgen/datatype_anchors/OTP-13600/ERL-141'

* hasse/erl_docgen/datatype_anchors/OTP-13600/ERL-141:
  kernel: Remove no longer needed anchors in documentation
  stdlib: Remove no longer needed anchors in documentation
  erts: Remove no longer needed anchors in documentation
  erl_docgen: Add anchors to datatypes without name attribute

14 files changed, 25 insertions, 41 deletions

diff --git a/erts/doc/src/erlang.xml b/erts/doc/src/erlang.xml
index 34933d6f48..9287b32fec 100644
--- a/erts/doc/src/erlang.xml
+++ b/erts/doc/src/erlang.xml
@@ -52,7 +52,6 @@
     <datatype>
       <name>ext_binary()</name>
       <desc>
-      <marker id="type-ext_binary"></marker>
         <p>A binary data object, structured according to
            the Erlang external term format.</p>
       </desc>
diff --git a/lib/erl_docgen/priv/xsl/db_html.xsl b/lib/erl_docgen/priv/xsl/db_html.xsl
index a3c71fea15..c2d7d40446 100644
--- a/lib/erl_docgen/priv/xsl/db_html.xsl
+++ b/lib/erl_docgen/priv/xsl/db_html.xsl
@@ -383,9 +383,7 @@
 	</xsl:choose>
       </xsl:when>
       <xsl:otherwise> <!-- <datatype> with <name> -->
-	<span class="bold_code">
-          <xsl:apply-templates/>
-	</span>
+        <xsl:call-template name="name"/>
       </xsl:otherwise>
     </xsl:choose>
   </xsl:template>
@@ -1855,6 +1853,7 @@
     </xsl:choose>
   </xsl:template>
 
+  <!-- Used both in <datatype> and in <func>! -->
   <xsl:template name="name">
 
     <xsl:variable name="tmpstring">
@@ -1911,7 +1910,14 @@
             </xsl:otherwise>
           </xsl:choose>
         </xsl:variable>
-        <a name="{$fname}-{$arity}"><span class="bold_code"><xsl:value-of select="."/></span></a><br/>
+	<xsl:choose>
+	  <xsl:when test="ancestor::datatype">
+            <a name="type-{$fname}"><span class="bold_code"><xsl:value-of select="."/></span></a><br/>
+	  </xsl:when>
+          <xsl:otherwise>
+            <a name="{$fname}-{$arity}"><span class="bold_code"><xsl:value-of select="."/></span></a><br/>
+          </xsl:otherwise>
+	</xsl:choose>
       </xsl:when>
       <xsl:otherwise>
         <span class="bold_code"><xsl:value-of select="."/></span>
diff --git a/lib/kernel/doc/src/application.xml b/lib/kernel/doc/src/application.xml
index 3928078932..8d33aa86e7 100644
--- a/lib/kernel/doc/src/application.xml
+++ b/lib/kernel/doc/src/application.xml
@@ -62,8 +62,7 @@
     </datatype>
     <datatype>
       <name>tuple_of(T)</name>
-      <desc><p><marker id="type-tuple_of"/>
-        A tuple where the elements are of type <c>T</c>.</p></desc>
+      <desc><p>A tuple where the elements are of type <c>T</c>.</p></desc>
     </datatype>
   </datatypes>
   <funcs>
diff --git a/lib/kernel/doc/src/file.xml b/lib/kernel/doc/src/file.xml
index a73038ac58..7d86c3ebcb 100644
--- a/lib/kernel/doc/src/file.xml
+++ b/lib/kernel/doc/src/file.xml
@@ -90,8 +90,7 @@
     <datatype>
       <name>fd()</name>
       <desc>
-        <p><marker id="type-fd"/>
-          A file descriptor representing a file opened in
+        <p>A file descriptor representing a file opened in
 	  <seealso marker="#raw"><c>raw</c></seealso> mode.</p>
       </desc>
     </datatype>
diff --git a/lib/kernel/doc/src/gen_sctp.xml b/lib/kernel/doc/src/gen_sctp.xml
index 57307cd594..737800c6b1 100644
--- a/lib/kernel/doc/src/gen_sctp.xml
+++ b/lib/kernel/doc/src/gen_sctp.xml
@@ -72,8 +72,7 @@
     <datatype>
       <name>assoc_id()</name>
       <desc>
-        <p><marker id="type-assoc_id"/>
-          An opaque term returned in, for example, <c>#sctp_paddr_change{}</c>,
+        <p>An opaque term returned in, for example, <c>#sctp_paddr_change{}</c>,
           which identifies an association for an SCTP socket. The term
           is opaque except for the special value <c>0</c>, which has a
           meaning such as "the whole endpoint" or "all future associations".</p>
@@ -88,12 +87,11 @@
     </datatype>
     <datatype>
       <name name="option_name"/>
-      <desc><marker id="type-sctp_socket"></marker></desc>
     </datatype>
     <datatype>
       <name>sctp_socket()</name>
       <desc>
-        <p><marker id="type-sctp_socket"/>Socket identifier returned from
+        <p>Socket identifier returned from
           <seealso marker="#open/0"><c>open/*</c></seealso>.</p>
         <marker id="exports"></marker>
       </desc>
diff --git a/lib/kernel/doc/src/gen_tcp.xml b/lib/kernel/doc/src/gen_tcp.xml
index 919178195f..8bd94892ad 100644
--- a/lib/kernel/doc/src/gen_tcp.xml
+++ b/lib/kernel/doc/src/gen_tcp.xml
@@ -79,8 +79,7 @@ do_recv(Sock, Bs) ->
     </datatype>
     <datatype>
       <name>socket()</name>
-      <desc><p><marker id="type-socket"/>
-	As returned by
+      <desc><p>As returned by
         <seealso marker="#accept/1"><c>accept/1,2</c></seealso> and
         <seealso marker="#connect/3"><c>connect/3,4</c></seealso>.</p>
         <marker id="connect"></marker>
diff --git a/lib/kernel/doc/src/gen_udp.xml b/lib/kernel/doc/src/gen_udp.xml
index 906883ed34..3db291600d 100644
--- a/lib/kernel/doc/src/gen_udp.xml
+++ b/lib/kernel/doc/src/gen_udp.xml
@@ -45,7 +45,6 @@
     <datatype>
       <name>socket()</name>
       <desc>
-        <marker id="type-socket"/>
         <p>As returned by
           <seealso marker="#open/1"><c>open/1,2</c></seealso>.</p>
       </desc>
diff --git a/lib/kernel/doc/src/inet.xml b/lib/kernel/doc/src/inet.xml
index cfff393b8c..bca04aa244 100644
--- a/lib/kernel/doc/src/inet.xml
+++ b/lib/kernel/doc/src/inet.xml
@@ -4,7 +4,7 @@
 <erlref>
   <header>
     <copyright>
-      <year>1997</year><year>2015</year>
+      <year>1997</year><year>2016</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
@@ -128,7 +128,7 @@ fe80::204:acff:fe17:bf38
     <datatype>
       <name>socket()</name>
       <desc>
-        <p><marker id="type-socket"></marker>See
+        <p>See
           <seealso marker="gen_tcp#type-socket"><c>gen_tcp:type-socket</c></seealso>
           and
           <seealso marker="gen_udp#type-socket"><c>gen_udp:type-socket</c></seealso>.
diff --git a/lib/stdlib/doc/src/digraph.xml b/lib/stdlib/doc/src/digraph.xml
index 16dd789caf..1bb8eef247 100644
--- a/lib/stdlib/doc/src/digraph.xml
+++ b/lib/stdlib/doc/src/digraph.xml
@@ -104,14 +104,12 @@
     </datatype>
     <datatype>
       <name>edge()</name>
-      <desc><p><marker id="type-edge"/></p></desc>
     </datatype>
     <datatype>
       <name name="label"/>
     </datatype>
     <datatype>
       <name>vertex()</name>
-      <desc><p><marker id="type-vertex"/></p></desc>
     </datatype>
   </datatypes>
   <funcs>
diff --git a/lib/stdlib/doc/src/digraph_utils.xml b/lib/stdlib/doc/src/digraph_utils.xml
index 9bddee546f..e481711c50 100644
--- a/lib/stdlib/doc/src/digraph_utils.xml
+++ b/lib/stdlib/doc/src/digraph_utils.xml
@@ -120,13 +120,6 @@
       considering all edges undirected.</p>
   </description>
 
-  <datatypes>
-    <datatype>
-      <name>digraph()</name>
-      <desc><p><marker id="type-digraph"/>
-        A digraph as returned by <c>digraph:new/0,1</c>.</p></desc>
-    </datatype>
-  </datatypes>
   <funcs>
     <func>
       <name name="arborescence_root" arity="1"/>
diff --git a/lib/stdlib/doc/src/erl_anno.xml b/lib/stdlib/doc/src/erl_anno.xml
index ddc8b8c765..9f775943c1 100644
--- a/lib/stdlib/doc/src/erl_anno.xml
+++ b/lib/stdlib/doc/src/erl_anno.xml
@@ -5,7 +5,7 @@
   <header>
     <copyright>
       <year>2015</year>
-      <year>2015</year>
+      <year>2016</year>
       <holder>Ericsson AB, All Rights Reserved</holder>
     </copyright>
     <legalnotice>
@@ -103,7 +103,7 @@
   <datatypes>
     <datatype>
       <name>anno()</name>
-      <desc><p><marker id="type-anno"/>A collection of annotations.</p>
+      <desc><p>A collection of annotations.</p>
       </desc>
     </datatype>
     <datatype>
diff --git a/lib/stdlib/doc/src/erl_parse.xml b/lib/stdlib/doc/src/erl_parse.xml
index 13be488c33..32fce16d68 100644
--- a/lib/stdlib/doc/src/erl_parse.xml
+++ b/lib/stdlib/doc/src/erl_parse.xml
@@ -45,26 +45,22 @@
   <datatypes>
     <datatype>
       <name>abstract_clause()</name>
-      <desc><p><marker id="type-abstract_clause"/>
-        Abstract form of an Erlang clause.</p>
+      <desc><p>Abstract form of an Erlang clause.</p>
       </desc>
     </datatype>
     <datatype>
       <name>abstract_expr()</name>
-      <desc><p><marker id="type-abstract_expr"/>
-        Abstract form of an Erlang expression.</p>
+      <desc><p>Abstract form of an Erlang expression.</p>
       </desc>
     </datatype>
     <datatype>
       <name>abstract_form()</name>
-      <desc><p><marker id="type-abstract_form"/>
-        Abstract form of an Erlang form.</p>
+      <desc><p>Abstract form of an Erlang form.</p>
       </desc>
     </datatype>
     <datatype>
       <name>abstract_type()</name>
-      <desc><p><marker id="type-abstract_type"/>
-        Abstract form of an Erlang type.</p>
+      <desc><p>Abstract form of an Erlang type.</p>
       </desc>
     </datatype>
     <datatype>
diff --git a/lib/stdlib/doc/src/ets.xml b/lib/stdlib/doc/src/ets.xml
index b32638f04d..ad7591e214 100644
--- a/lib/stdlib/doc/src/ets.xml
+++ b/lib/stdlib/doc/src/ets.xml
@@ -135,8 +135,7 @@
     <datatype>
       <name>continuation()</name>
       <desc>
-        <p><marker id="type-continuation"/>
-          Opaque continuation used by <seealso marker="#select/1">
+        <p>Opaque continuation used by <seealso marker="#select/1">
           <c>select/1,3</c></seealso>, <seealso marker="#select_reverse/1">
           <c>select_reverse/1,3</c></seealso>, <seealso
           marker="#match/1">
diff --git a/lib/stdlib/doc/src/sofs.xml b/lib/stdlib/doc/src/sofs.xml
index cf0855bc85..1e5be367bd 100644
--- a/lib/stdlib/doc/src/sofs.xml
+++ b/lib/stdlib/doc/src/sofs.xml
@@ -399,8 +399,7 @@ fun(S) -> sofs:partition(1, S) end
     <datatype>
       <!-- Parameterized opaque types are NYI: -->
       <name>tuple_of(T)</name>
-      <desc><p><marker id="type-tuple_of"/>
-        A tuple where the elements are of type <c>T</c>.</p></desc>
+      <desc><p>A tuple where the elements are of type <c>T</c>.</p></desc>
     </datatype>
   </datatypes>
   <funcs>