Fix broken links

A multitude of broken links were found when a bug was fixed
in the link checker.

24 files changed, 56 insertions, 55 deletions

diff --git a/erts/doc/src/alt_disco.xml b/erts/doc/src/alt_disco.xml
index d04221b9b3..148d6f549e 100644
--- a/erts/doc/src/alt_disco.xml
+++ b/erts/doc/src/alt_disco.xml
@@ -63,7 +63,7 @@
     <seealso marker="kernel:erl_epmd">EPMD module</seealso>. However, instead of
     communicating with EPMD you can connect to any service to find out
     connection details of other nodes. A discovery module is enabled
-    by setting <seealso marker="erts:erl#epmd_module">-epmd_module</seealso>
+    by setting <seealso marker="erts:erl">-epmd_module</seealso>
     when starting erlang. The discovery module must implement the following
     callbacks:</p>
 
diff --git a/erts/doc/src/communication.xml b/erts/doc/src/communication.xml
index 7e18a73aa8..251b52dc65 100644
--- a/erts/doc/src/communication.xml
+++ b/erts/doc/src/communication.xml
@@ -64,7 +64,7 @@
     a synchronous communication operation consists of two asynchronous
     signals; one request signal and one reply signal. An example of
     such a synchronous communication is a call to
-    <seealso marker="erlang:process_info/2">
+    <seealso marker="erlang#process_info/2">
     <c>erlang:process_info/2</c></seealso>
     when the first argument is not <c>self()</c>. The caller sends
     an asynchronous signal requesting information, and then
diff --git a/erts/doc/src/crash_dump.xml b/erts/doc/src/crash_dump.xml
index a9aeb1888c..33d0903622 100644
--- a/erts/doc/src/crash_dump.xml
+++ b/erts/doc/src/crash_dump.xml
@@ -290,7 +290,7 @@ Slogan: &lt;reason&gt;</pre>
     <title>Memory Information</title>
     <p>Under the tag <em>=memory</em> is shown information similar
       to what can be obtainted on a living node with
-      <seealso marker="erts:erlang#erlang:memory/0">
+      <seealso marker="erts:erlang#memory/0">
       <c>erlang:memory()</c></seealso>.</p>
   </section>
 
diff --git a/erts/doc/src/erl_driver.xml b/erts/doc/src/erl_driver.xml
index 58678f2393..3e2d3bb447 100644
--- a/erts/doc/src/erl_driver.xml
+++ b/erts/doc/src/erl_driver.xml
@@ -230,7 +230,7 @@
       <item>
         <p>With these functions, the driver sends data back to the emulator.
           The data is received as messages by the port owner process, see
-          <seealso marker="erlang:open_port/2">
+          <seealso marker="erlang#open_port/2">
           <c>erlang:open_port/2</c></seealso>. The vector function and the
           function taking a driver binary are faster, as they avoid
           copying the data buffer. There is also a fast way of sending
@@ -1154,27 +1154,27 @@ r = driver_async(myPort, &myKey, myData, myFunc);    ]]></code>
         <taglist>
           <tag><seealso marker="driver_entry#start">
             <c>start</c></seealso></tag>
-          <item>Called from <seealso marker="erlang:open_port/2">
+          <item>Called from <seealso marker="erlang#open_port/2">
             <c>erlang:open_port/2</c></seealso>.</item>
           <tag><seealso marker="driver_entry#output">
             <c>output</c></seealso></tag>
-          <item>Called from <seealso marker="erlang:send/2">
+          <item>Called from <seealso marker="erlang#send/2">
             <c>erlang:send/2</c></seealso> and
-            <seealso marker="erlang:port_command/2">
+            <seealso marker="erlang#port_command/2">
             <c>erlang:port_command/2</c></seealso>.</item>
           <tag><seealso marker="driver_entry#outputv">
             <c>outputv</c></seealso></tag>
-          <item>Called from <seealso marker="erlang:send/2">
+          <item>Called from <seealso marker="erlang#send/2">
             <c>erlang:send/2</c></seealso> and
-            <seealso marker="erlang:port_command/2">
+            <seealso marker="erlang#port_command/2">
             <c>erlang:port_command/2</c></seealso>.</item>
           <tag><seealso marker="driver_entry#control">
             <c>control</c></seealso></tag>
-          <item>Called from <seealso marker="erlang:port_control/3">
+          <item>Called from <seealso marker="erlang#port_control/3">
             <c>erlang:port_control/3</c></seealso>.</item>
           <tag><seealso marker="driver_entry#call">
             <c>call</c></seealso></tag>
-          <item>Called from <seealso marker="erlang:port_call/3">
+          <item>Called from <seealso marker="erlang#port_call/3">
             <c>erlang:port_call/3</c></seealso>.</item>
         </taglist>
         <p>Notice that this function is <em>not</em> thread-safe, not
@@ -2305,7 +2305,7 @@ r = driver_async(myPort, &myKey, myData, myFunc);    ]]></code>
           <c>*value_size</c> has been set to the buffer size needed.</p>
         <warning>
           <p>This function reads the emulated environment used by
-            <seealso marker="os:getenv/1"><c>os:getenv/1</c></seealso> and not
+            <seealso marker="kernel:os#getenv/1"><c>os:getenv/1</c></seealso> and not
             the environment used by libc's <c>getenv(3)</c> or similar. Drivers
             that <em>require</em> that these are in sync will need to do so
             themselves, but keep in mind that they are segregated for a reason;
@@ -2656,7 +2656,7 @@ erl_drv_output_term(driver_mk_port(drvport), spec, sizeof(spec) / sizeof(spec[0]
         </note>
         <warning>
           <p>This function modifies the emulated environment used by
-            <seealso marker="os:putenv/2"><c>os:putenv/2</c></seealso> and not
+            <seealso marker="kernel:os#putenv/2"><c>os:putenv/2</c></seealso> and not
             the environment used by libc's <c>putenv(3)</c> or similar. Drivers
             that <em>require</em> that these are in sync will need to do so
             themselves, but keep in mind that they are segregated for a reason;
@@ -2849,7 +2849,7 @@ erl_drv_output_term(driver_mk_port(drvport), spec, sizeof(spec) / sizeof(spec[0]
       <desc>
         <marker id="erl_drv_set_os_pid"></marker>
         <p>Sets the <c>os_pid</c> seen when doing
-          <seealso marker="erlang:port_info/2">
+          <seealso marker="erlang#port_info/2">
           <c>erlang:port_info/2</c></seealso> on this port.</p>
         <p><c>port</c> is the port handle of the port (driver instance) to set
           the pid on. <c>pid</c>is the pid to set.</p>
@@ -3204,7 +3204,7 @@ erl_drv_output_term(driver_mk_port(drvport), spec, sizeof(spec) / sizeof(spec[0]
           <c>control</c></seealso> driver entry
           function will return data to the port owner process.
           (The <c>control</c> function is called from
-          <seealso marker="erlang:port_control/3">
+          <seealso marker="erlang#port_control/3">
           <c>erlang:port_control/3</c></seealso>.)</p>
         <p>Currently there are only two meaningful values for
           <c>flags</c>: <c>0</c> means that data is returned in a list,
diff --git a/erts/doc/src/erl_ext_dist.xml b/erts/doc/src/erl_ext_dist.xml
index 4721747097..6b7a6db943 100644
--- a/erts/doc/src/erl_ext_dist.xml
+++ b/erts/doc/src/erl_ext_dist.xml
@@ -399,7 +399,7 @@
       <tcaption>REFERENCE_EXT</tcaption></table>
       <p>
         Encodes a reference object (an object generated with
-        <seealso marker="erlang:make_ref/0">erlang:make_ref/0</seealso>).
+        <seealso marker="erlang#make_ref/0">erlang:make_ref/0</seealso>).
         The <c>Node</c> term is an encoded atom, that is,
         <seealso marker="#ATOM_UTF8_EXT"><c>ATOM_UTF8_EXT</c></seealso>, 
         <seealso marker="#SMALL_ATOM_UTF8_EXT"><c>SMALL_ATOM_UTF8_EXT</c></seealso>, or
@@ -437,7 +437,7 @@
 	<tcaption>PORT_EXT</tcaption></table>
 	<p>
 	  Encodes a port object (obtained from
-          <seealso marker="erlang:open_port/2">
+          <seealso marker="erlang#open_port/2">
           <c>erlang:open_port/2</c></seealso>).
 	  The <c>ID</c> is a node-specific identifier for a local port.
 	  Port operations are not allowed across node boundaries.
@@ -467,7 +467,7 @@
 	<tcaption>PID_EXT</tcaption></table>
 	<p>
 	  Encodes a process identifier object (obtained from
-          <seealso marker="erlang:spawn/3"><c>erlang:spawn/3</c></seealso> or
+          <seealso marker="erlang#spawn/3"><c>erlang:spawn/3</c></seealso> or
 	  friends). The <c>ID</c> and <c>Creation</c> fields works just like in
 	  <seealso marker="#REFERENCE_EXT"><c>REFERENCE_EXT</c></seealso>, while
 	  the <c>Serial</c> field is used to improve safety.	  
diff --git a/erts/doc/src/erl_nif.xml b/erts/doc/src/erl_nif.xml
index cf1994887a..c0be715678 100644
--- a/erts/doc/src/erl_nif.xml
+++ b/erts/doc/src/erl_nif.xml
@@ -546,8 +546,8 @@ int writeiovec(ErlNifEnv *env, ERL_NIF_TERM term, ERL_NIF_TERM *tail,
             <p>Many operations communicating with a process executing a
               dirty NIF can, however, complete while it executes the
               dirty NIF. For example, retrieving information about it through
-              <seealso marker="erlang:process_info/1">
-              <c>erlang:process_info</c></seealso>, setting its group leader,
+              <seealso marker="erlang#process_info/1">
+              <c>process_info</c></seealso>, setting its group leader,
               register/unregister its name, and so on.</p>
             <p>Termination of a process executing a dirty NIF can only be
               completed up to a certain point while it executes the dirty NIF.
diff --git a/erts/doc/src/erlang.xml b/erts/doc/src/erlang.xml
index 0d94f83493..2b444ccf01 100644
--- a/erts/doc/src/erlang.xml
+++ b/erts/doc/src/erlang.xml
@@ -126,7 +126,7 @@
               instance.</p>
             <p>One can get an approximation of the <c>native</c>
               time unit by calling
-              <seealso marker="erlang:convert_time_unit/3">
+              <seealso marker="#convert_time_unit/3">
               <c>erlang:convert_time_unit(1, second, native)</c></seealso>.
               The result equals the number
               of whole <c>native</c> time units per second. If
@@ -4663,6 +4663,7 @@ RealSystem = system + MissedSystem</code>
       <name name="port_info" arity="2" clause_i="6" since="OTP R16B"/>
       <fsummary>Information about the memory size of a port.</fsummary>
       <desc>
+        <marker id="port_info_memory"/>
         <p><c><anno>Bytes</anno></c> is the total number of
           bytes allocated for this port by the runtime system. The
           port itself can have allocated memory that is not
@@ -5387,6 +5388,7 @@ RealSystem = system + MissedSystem</code>
           </item>
           <tag><c>{memory, <anno>Size</anno>}</c></tag>
           <item>
+            <marker id="process_info_memory"/>
             <p><c><anno>Size</anno></c> is the size in bytes of the process.
               This includes call stack, heap, and internal structures.</p>
           </item>
@@ -6676,7 +6678,7 @@ lists:map(
           <tag><c>async</c></tag>
           <item>Async threads are used by various linked-in drivers (mainly the
             file drivers) do offload non-CPU intensive work. See
-            <seealso marker="erts:erl#+async_thread_pool_size">erl +A</seealso> for more details.</item>
+            <seealso marker="erts:erl#async_thread_pool_size">erl +A</seealso> for more details.</item>
           <tag><c>aux</c></tag>
           <item>Takes care of any work that is not
             specifically assigned to a scheduler.</item>
diff --git a/erts/doc/src/notes.xml b/erts/doc/src/notes.xml
index 7c5a8aefad..13cd4129ac 100644
--- a/erts/doc/src/notes.xml
+++ b/erts/doc/src/notes.xml
@@ -8363,8 +8363,7 @@
 	    Erlang/OTP has been ported to the realtime operating
 	    system OSE. The port supports both smp and non-smp
 	    emulator. For details around the port and how to started
-	    see the User's Guide in the <seealso
-	    marker="ose:ose_intro">ose</seealso> application. </p>
+	    see the User's Guide in the <em>ose</em> application.</p>
           <p>
 	    Note that not all parts of Erlang/OTP has been ported. </p>
           <p>
@@ -9470,9 +9469,9 @@
 	    <c>fix_alloc</c> allocator, a different strategy for
 	    management of fix blocks will be used.</item> <item>The
 	    information returned from <seealso
-	    marker="erlang:system_info_allocator_tuple"><c>erlang:system_info({allocator,
+	    marker="erlang#system_info_allocator_tuple"><c>erlang:system_info({allocator,
 	    A})</c></seealso>, and <seealso
-	    marker="erlang:system_info_allocator_sizes"><c>erlang:system_info({allocator_sizes,
+	    marker="erlang#system_info_allocator_sizes"><c>erlang:system_info({allocator_sizes,
 	    A})</c></seealso> will be slightly different when this
 	    feature has been enabled. An <c>mbcs_pool</c> tuple will
 	    be present giving information about abandoned carriers,
@@ -10281,8 +10280,7 @@
 	    information about signal ordering guarantees, see the
 	    chapter on <seealso
 	    marker="erts:communication">communication</seealso> in
-	    the ERTS user's guide. The <seealso
-	    marker="erts:erl#+n">+n</seealso> command line flag of
+	    the ERTS user's guide. The <c>+n</c> command line flag of
 	    <seealso marker="erts:erl">erl(1)</seealso> can be
 	    helpful when trying to find signaling order bugs in
 	    Erlang code that have been exposed by these
diff --git a/lib/common_test/doc/src/ct_master.xml b/lib/common_test/doc/src/ct_master.xml
index 2ab421fe9e..f003b7de11 100644
--- a/lib/common_test/doc/src/ct_master.xml
+++ b/lib/common_test/doc/src/ct_master.xml
@@ -210,7 +210,7 @@
       </type>
       <desc><marker id="run_test-2"/>
         <p>Tests are spawned on <c>Node</c> using
-          <seealso marker="ct:run_test-1"><c>ct:run_test/1</c></seealso></p>
+          <seealso marker="ct#run_test-1"><c>ct:run_test/1</c></seealso></p>
       </desc>
     </func>
   </funcs>
diff --git a/lib/common_test/doc/src/event_handler_chapter.xml b/lib/common_test/doc/src/event_handler_chapter.xml
index bd9ed21cb4..182abba7ca 100644
--- a/lib/common_test/doc/src/event_handler_chapter.xml
+++ b/lib/common_test/doc/src/event_handler_chapter.xml
@@ -378,7 +378,7 @@
 
     <note><p>To ensure that printouts to <c>stdout</c> (or printouts made with
     <seealso marker="ct#log-2"><c>ct:log/2,3</c></seealso> or 
-    <seealso marker="ct:pal-2"><c>ct:pal,2,3</c></seealso>) get written to the test case log
+    <seealso marker="ct#pal-2"><c>ct:pal,2,3</c></seealso>) get written to the test case log
     file, and not to the <c>Common Test</c> framework log, you can synchronize
     with the <c>Common Test</c> server by matching on evvents <c>tc_start</c> and <c>tc_done</c>.
     In the period between these events, all I/O is directed to the
diff --git a/lib/erl_docgen/src/docgen_xmerl_xml_cb.erl b/lib/erl_docgen/src/docgen_xmerl_xml_cb.erl
index 59d4dccfb7..9d69143c3c 100644
--- a/lib/erl_docgen/src/docgen_xmerl_xml_cb.erl
+++ b/lib/erl_docgen/src/docgen_xmerl_xml_cb.erl
@@ -87,6 +87,7 @@ convert_tag(underline, Attrs)  -> {em, Attrs};
 convert_tag(Tag, Attrs)        -> {Tag, Attrs}.
 
 is_url("http:"++_) -> true;
+is_url("https:"++_) -> true;
 is_url("../"++_) -> true;
 is_url(FileRef) ->
     case filename:extension(FileRef) of
diff --git a/lib/jinterface/doc/src/jinterface_users_guide.xml b/lib/jinterface/doc/src/jinterface_users_guide.xml
index 56f88124bf..504c77f339 100644
--- a/lib/jinterface/doc/src/jinterface_users_guide.xml
+++ b/lib/jinterface/doc/src/jinterface_users_guide.xml
@@ -366,20 +366,20 @@ OtpNode node = new OtpNode("gurka");    </code>
       <seealso marker="java/com/ericsson/otp/erlang/OtpEpmd">OtpEpmd</seealso> class.
       Nodes wishing to contact other nodes must first request information 
       from Epmd before a connection can be set up, however this is done automatically 
-      by <seealso marker="java/com/ericsson/otp/erlang/OtpSelf#connect(com.ericsson.otp.erlang.OtpPeer)">OtpSelf.connect()</seealso> when necessary. </p>
-    <p>When you use <seealso marker="java/com/ericsson/otp/erlang/OtpSelf#connect(com.ericsson.otp.erlang.OtpPeer)">OtpSelf.connect()</seealso> to connect to an Erlang node, 
+      by <seealso marker="java/com/ericsson/otp/erlang/OtpSelf#connect-com.ericsson.otp.erlang.OtpPeer-">OtpSelf.connect()</seealso> when necessary. </p>
+    <p>When you use <seealso marker="java/com/ericsson/otp/erlang/OtpSelf#connect-com.ericsson.otp.erlang.OtpPeer-">OtpSelf.connect()</seealso> to connect to an Erlang node, 
       a connection is first made to epmd and, if the node is known, a
       connection is then made to the Erlang node.</p>
     <p>Java nodes can also register themselves with epmd if they want other
       nodes in the system to be able to find and connect to them.
-      This is done by call to method <seealso marker="java/com/ericsson/otp/erlang/OtpEpmd#publishPort(com.ericsson.otp.erlang.OtpLocalNode)">OtpEpmd.publishPort()</seealso>.</p>
+      This is done by call to method <seealso marker="java/com/ericsson/otp/erlang/OtpEpmd#publishPort-com.ericsson.otp.erlang.OtpLocalNode-">OtpEpmd.publishPort()</seealso>.</p>
     <p>Be aware that on some systems (such as VxWorks), a failed node will
       not be detected by this mechanism since the operating system does not
       automatically close descriptors that were left open when the node
       failed. If a node has failed in this way, epmd will prevent you from
       registering a new node with the old name, since it thinks that the old
       name is still in use. In this case, you must unregister the name
-      explicitly, by using <seealso marker="java/com/ericsson/otp/erlang/OtpEpmd#unPublishPort(com.ericsson.otp.erlang.OtpLocalNode)">OtpEpmd.unPublishPort()</seealso></p>
+      explicitly, by using <seealso marker="java/com/ericsson/otp/erlang/OtpEpmd#unPublishPort-com.ericsson.otp.erlang.OtpLocalNode-">OtpEpmd.unPublishPort()</seealso></p>
     <p>This will cause epmd to close the connection from the far end. Note
       that if the name was in fact still in use by a node, the results of
       this operation are unpredictable. Also, doing this does not cause the
diff --git a/lib/kernel/doc/src/application.xml b/lib/kernel/doc/src/application.xml
index 83a83ebad2..f4ec2c610f 100644
--- a/lib/kernel/doc/src/application.xml
+++ b/lib/kernel/doc/src/application.xml
@@ -582,7 +582,7 @@ Nodes = [cp1@cave, {cp2@cave, cp3@cave}]</code>
           the primary application) for the primary application and all
           included applications, for which the start phase is defined.</p>
         <p>For a description of <c>StartType</c>, see
-	<seealso marker="Module:start/2"><c>Module:start/2</c></seealso>.</p>
+	<seealso marker="#Module:start/2"><c>Module:start/2</c></seealso>.</p>
       </desc>
     </func>
     <func>
diff --git a/lib/kernel/doc/src/auth.xml b/lib/kernel/doc/src/auth.xml
index a57da18de9..c735d02fed 100644
--- a/lib/kernel/doc/src/auth.xml
+++ b/lib/kernel/doc/src/auth.xml
@@ -46,7 +46,7 @@
       <fsummary>Magic cookie for local node (deprecated).</fsummary>
       <desc>
         <p>Use
-          <seealso marker="erts:erlang#erlang:get_cookie/0"><c>erlang:get_cookie()</c></seealso>
+          <seealso marker="erts:erlang#get_cookie/0"><c>erlang:get_cookie()</c></seealso>
           in ERTS instead.</p>
       </desc>
     </func>
@@ -58,7 +58,7 @@
       </type_desc>
       <desc>
         <p>Use
-          <seealso marker="erts:erlang#erlang:set_cookie/2"><c>erlang:set_cookie(node(), <anno>Cookie</anno>)</c>
+          <seealso marker="erts:erlang#set_cookie/2"><c>erlang:set_cookie(node(), <anno>Cookie</anno>)</c>
 	  in ERTS</seealso> instead.</p>
       </desc>
     </func>
@@ -94,7 +94,7 @@
         <p>Sets the magic cookie of <c><anno>Node</anno></c> to
 	<c><anno>Cookie</anno></c> and verifies the status of the authorization.
           Equivalent to calling
-          <seealso marker="erts:erlang#erlang:set_cookie/2"><c>erlang:set_cookie(<anno>Node</anno>, <anno>Cookie</anno>)</c></seealso>, followed by
+          <seealso marker="erts:erlang#set_cookie/2"><c>erlang:set_cookie(<anno>Node</anno>, <anno>Cookie</anno>)</c></seealso>, followed by
           <seealso marker="#is_auth/1"><c>auth:is_auth(<anno>Node</anno>)</c></seealso>.</p>
       </desc>
     </func>
diff --git a/lib/kernel/doc/src/erl_ddll.xml b/lib/kernel/doc/src/erl_ddll.xml
index f2d5e1b397..52d5bcd079 100644
--- a/lib/kernel/doc/src/erl_ddll.xml
+++ b/lib/kernel/doc/src/erl_ddll.xml
@@ -200,7 +200,7 @@
       <fsummary>Remove a monitor for a driver.</fsummary>
       <desc>
         <p>Removes a driver monitor in much the same way as 
-          <seealso marker="erts:erlang#erlang:demonitor/1"><c>erlang:demonitor/1</c></seealso>
+          <seealso marker="erts:erlang#demonitor/1"><c>erlang:demonitor/1</c></seealso>
 	  in ERTS
 	  does with process monitors. For details about how to create
 	  driver monitors, see
@@ -430,7 +430,7 @@
       <desc>
         <p>Creates a driver monitor and works in many
           ways as
-	  <seealso marker="erts:erlang#erlang:monitor/2"><c>erlang:monitor/2</c></seealso>
+	  <seealso marker="erts:erlang#monitor/2"><c>erlang:monitor/2</c></seealso>
 	  in ERTS,
           does for processes. When a driver changes state, the monitor
           results in a monitor message that is sent to the calling
diff --git a/lib/kernel/doc/src/gen_sctp.xml b/lib/kernel/doc/src/gen_sctp.xml
index f70d6c24db..61ac1485c1 100644
--- a/lib/kernel/doc/src/gen_sctp.xml
+++ b/lib/kernel/doc/src/gen_sctp.xml
@@ -253,7 +253,7 @@ connect(Socket, Ip, Port>,
       <desc>
         <p>Assigns a new controlling process <c><anno>Pid</anno></c> to
           <c><anno>Socket</anno></c>. Same implementation as
-          <seealso marker="gen_udp:controlling_process/2"><c>gen_udp:controlling_process/2</c></seealso>.
+          <seealso marker="gen_udp#controlling_process/2"><c>gen_udp:controlling_process/2</c></seealso>.
         </p>
       </desc>
     </func>
diff --git a/lib/kernel/doc/src/logger_chapter.xml b/lib/kernel/doc/src/logger_chapter.xml
index 8458ffa042..1aa4b7a3a2 100644
--- a/lib/kernel/doc/src/logger_chapter.xml
+++ b/lib/kernel/doc/src/logger_chapter.xml
@@ -718,7 +718,7 @@ logger:debug(#{got => connection_request, id => Id, state => State},
 	    </seealso></pre>
 	    <p>For all other values of <c>HandlerId</c>, this entry
 	      adds a new handler, equivalent to calling</p>
-	    <pre><seealso marker="logger:add_handler/3">
+	    <pre><seealso marker="logger#add_handler/3">
 		logger:add_handler(HandlerId, Module, HandlerConfig)
 	    </seealso></pre>
 	    <p>Multiple entries of this type are allowed.</p></item>
diff --git a/lib/public_key/doc/src/public_key.xml b/lib/public_key/doc/src/public_key.xml
index fb81ea68a4..8db5620686 100644
--- a/lib/public_key/doc/src/public_key.xml
+++ b/lib/public_key/doc/src/public_key.xml
@@ -813,7 +813,8 @@ fun(#'DistributionPoint'{}, #'CertificateList'{},
       <p>The <c>{OtherRefId,term()}</c> is defined by the user and is passed to the <c>match_fun</c>, if defined.
       If the term in <c>OtherRefId</c> is a binary, it will be converted to a string.
       </p>
-      <p>The <c>ip</c> Reference ID takes an <seealso marker="inet:inet#type-ip_address">inet:ip_address()</seealso>
+      <p>The <c>ip</c> Reference ID takes an
+      <seealso marker="kernel:inet#type-ip_address">inet:ip_address()</seealso>
       or an ip address in string format (E.g "10.0.1.1" or "1234::5678:9012") as second element.
       </p>
       <p>The options are:</p>
diff --git a/lib/stdlib/doc/src/dets.xml b/lib/stdlib/doc/src/dets.xml
index 8e4e002000..8b9502a3b1 100644
--- a/lib/stdlib/doc/src/dets.xml
+++ b/lib/stdlib/doc/src/dets.xml
@@ -1090,8 +1090,8 @@ ok
           </item>
           <item>
             <p><c>select</c> - The table is traversed by calling
-              <seealso marker="dets:select/3"><c>dets:select/3</c></seealso> and
-              <seealso marker="dets:select/1"><c>dets:select/1</c></seealso>.
+              <seealso marker="dets#select/3"><c>dets:select/3</c></seealso> and
+              <seealso marker="dets#select/1"><c>dets:select/1</c></seealso>.
               Option <c>n_objects</c> determines the number of objects
               returned (the third argument of <c>select/3</c>). The
               match specification (the second argument of
diff --git a/lib/stdlib/doc/src/digraph_utils.xml b/lib/stdlib/doc/src/digraph_utils.xml
index 13b0aaad9e..a23b02c6c1 100644
--- a/lib/stdlib/doc/src/digraph_utils.xml
+++ b/lib/stdlib/doc/src/digraph_utils.xml
@@ -371,7 +371,7 @@
           the default, the type of <c><anno>Digraph</anno></c> is used
           for the subgraph as well. Otherwise the option value of <c>type</c>
           is used as argument to
-          <seealso marker="digraph:new/1"><c>digraph:new/1</c></seealso>.</p>
+        <seealso marker="digraph#new/1"><c>digraph:new/1</c></seealso>.</p>
         <p>If the value of option <c>keep_labels</c> is <c>true</c>,
           which is the default,
           the <seealso marker="#label">labels</seealso> of vertices and edges
diff --git a/lib/stdlib/doc/src/proc_lib.xml b/lib/stdlib/doc/src/proc_lib.xml
index aeb9f48735..bb983903a9 100644
--- a/lib/stdlib/doc/src/proc_lib.xml
+++ b/lib/stdlib/doc/src/proc_lib.xml
@@ -166,7 +166,7 @@
       <fsummary>Hibernate a process until a message is sent to it.</fsummary>
       <desc>
         <p>This function does the same as (and does call) the
-          <seealso marker="erts:erlang#erlang:hibernate/3">
+          <seealso marker="erts:erlang#hibernate/3">
           <c>hibernate/3</c></seealso> BIF,
           but ensures that exception handling and logging continues to
           work as expected when the process wakes up.</p>
diff --git a/lib/stdlib/doc/src/slave.xml b/lib/stdlib/doc/src/slave.xml
index 778c5f66e5..f9e42ad47d 100644
--- a/lib/stdlib/doc/src/slave.xml
+++ b/lib/stdlib/doc/src/slave.xml
@@ -51,7 +51,7 @@
 
     <p>An alternative to the <c>ssh</c> program can be specified on
       the command line to
-      <seealso marker="erts:erl#erl"><c>erl(1)</c></seealso> as follows:</p>
+      <seealso marker="erts:erl"><c>erl(1)</c></seealso> as follows:</p>
 
     <pre>
 -rsh Program</pre>
@@ -140,7 +140,7 @@ rpc:call(N, slave, pseudo, [node(), [pxw_server]]).</code>
         <p>Argument <c><anno>Args</anno></c> is used to set <c>erl</c>
           command-line arguments. If provided, it is passed to the new
           node and can be used for a variety of purposes; see
-          <seealso marker="erts:erl#erl"><c>erl(1)</c></seealso>.</p>
+          <seealso marker="erts:erl"><c>erl(1)</c></seealso>.</p>
         <p>As an example, suppose that you want to start a slave node at
           host <c>H</c> with node name <c>Name@H</c> and
           want the slave node to have the following properties:</p>
diff --git a/system/doc/efficiency_guide/commoncaveats.xml b/system/doc/efficiency_guide/commoncaveats.xml
index 367da09ba3..7b2128d888 100644
--- a/system/doc/efficiency_guide/commoncaveats.xml
+++ b/system/doc/efficiency_guide/commoncaveats.xml
@@ -36,10 +36,9 @@
      <title>Timer Module</title>
 
      <p>Creating timers using <seealso
-     marker="erts:erlang#erlang:send_after/3">erlang:send_after/3</seealso>
+     marker="erts:erlang#send_after/3">erlang:send_after/3</seealso>
      and
-     <seealso marker="erts:erlang#erlang:start_timer/3">erlang:start_timer/3</seealso>
-,
+     <seealso marker="erts:erlang#start_timer/3">erlang:start_timer/3</seealso>,
      is much more efficient than using the timers provided by the
      <seealso marker="stdlib:timer">timer</seealso> module in STDLIB.
      The <c>timer</c> module uses a separate process to manage the timers.
diff --git a/system/doc/tutorial/overview.xml b/system/doc/tutorial/overview.xml
index 255c22f2c1..bd652b1e4b 100644
--- a/system/doc/tutorial/overview.xml
+++ b/system/doc/tutorial/overview.xml
@@ -245,13 +245,13 @@ Term = binary_to_term(Binary)</pre>
   </section>
 
   <section>
-    <title>IC</title>
+    <title>IC and CORBA</title>
     <p>IC (Erlang IDL Compiler) is an interface generator that, given
       an IDL interface specification, automatically generates stub
       code in Erlang, C, or Java. See the IC User's Guide and IC
       Reference Manual.</p>
-    <p>For details, see the <seealso marker="ic:ic">ic</seealso>
-      manual page in IC.</p>
+      <p>For details, see the
+      <url href="https://github.com/erlang/corba">corba repository</url>.</p>
   </section>
 
   <section>