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, 7 insertions, 13 deletions

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>.