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

6 files changed, 8 insertions, 23 deletions

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>