Fix broken links in the user guide

Signed-off-by: Lukas Jungmann <lukas.jungmann@oracle.com>
diff --git a/jaxb-ri/docs/release-documentation/src/docbook/articles.xml b/jaxb-ri/docs/release-documentation/src/docbook/articles.xml
index a8332c7..d7ae8b6 100644
--- a/jaxb-ri/docs/release-documentation/src/docbook/articles.xml
+++ b/jaxb-ri/docs/release-documentation/src/docbook/articles.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-    Copyright (c) 2012, 2018 Oracle and/or its affiliates. All rights reserved.
+    Copyright (c) 2012, 2020 Oracle and/or its affiliates. All rights reserved.
 
     This program and the accompanying materials are made available under the
     terms of the Eclipse Distribution License v. 1.0, which is available at
@@ -45,11 +45,6 @@
         <itemizedlist>
  
             <listitem>
-                <para><link xlink:href="https://blogs.oracle.com/mgrebac/">Martin
-                Grebac's blog</link></para>
-            </listitem>
-
-            <listitem>
                 <para><link xlink:href="http://lexicore.blogspot.com/">Aleksei
                 Valikov's blog</link></para>
             </listitem>
diff --git a/jaxb-ri/docs/release-documentation/src/docbook/jaxb-ri-extensions-dtd.xml b/jaxb-ri/docs/release-documentation/src/docbook/jaxb-ri-extensions-dtd.xml
index 7b4a0f6..e7f6a8c 100644
--- a/jaxb-ri/docs/release-documentation/src/docbook/jaxb-ri-extensions-dtd.xml
+++ b/jaxb-ri/docs/release-documentation/src/docbook/jaxb-ri-extensions-dtd.xml
@@ -39,7 +39,7 @@
 
         <para>All the other command-line options of the XJC binding compiler
         can be applied. Similarly, the <command>xjc</command> <link
-        xlink:href="http://jakarta.apache.org/ant/">ant</link> task supports
+        xlink:href="http://ant.apache.org/">ant</link> task supports
         DTD. The generated code will be no different from what is generated
         from W3C XML Schema. You'll use the same &binding.spec.name; API to access the
         generated code, and it is portable in the sense that it will run on
diff --git a/jaxb-ri/docs/release-documentation/src/docbook/jaxb-ri-extensions-runtime-properties.xml b/jaxb-ri/docs/release-documentation/src/docbook/jaxb-ri-extensions-runtime-properties.xml
index 6e61444..6a99d7f 100644
--- a/jaxb-ri/docs/release-documentation/src/docbook/jaxb-ri-extensions-runtime-properties.xml
+++ b/jaxb-ri/docs/release-documentation/src/docbook/jaxb-ri-extensions-runtime-properties.xml
@@ -481,9 +481,9 @@
             <para>This experimental JAXB RI 1.0.x property has been adopted as
             a standard in &binding.impl.name;. The &binding.impl.name; will continue to support this
             property, but client code should be using the <link
-            xlink:href="api/jakarta/xml/bind/Marshaller.html#JAXB_FRAGMENT">Marshaller.JAXB_FRAGMENT</link>
+            xlink:href="https://jakarta.ee/specifications/xml-binding/3.0/apidocs/jakarta.xml.bind/jakarta/xml/bind/Marshaller.html#JAXB_FRAGMENT">Marshaller.JAXB_FRAGMENT</link>
             property instead. Please refer to the <link
-            xlink:href="api/jakarta/xml/bind/Marshaller.html#supportedProps">Marshaller
+            xlink:href="https://jakarta.ee/specifications/xml-binding/3.0/apidocs/jakarta.xml.bind/jakarta/xml/bind/Marshaller.html#supportedProps">Marshaller
             javadoc</link> for a complete description of the behavior.</para>
 
             <para>In &binding.impl.name;, calling:</para>
diff --git a/jaxb-ri/docs/release-documentation/src/docbook/overview.xml b/jaxb-ri/docs/release-documentation/src/docbook/overview.xml
index 8ee91cd..6361677 100644
--- a/jaxb-ri/docs/release-documentation/src/docbook/overview.xml
+++ b/jaxb-ri/docs/release-documentation/src/docbook/overview.xml
@@ -87,7 +87,7 @@
 
             <listitem>
                 <para><link
-                xlink:href="api/">Javadoc
+                xlink:href="https://jakarta.ee/specifications/xml-binding/3.0/apidocs/">Javadoc
                 API documentation (jakarta.xml.bind.*)</link></para>
             </listitem>
 
@@ -98,8 +98,7 @@
 
             <listitem>
                 <para>&binding.spec.name; FAQs [<xref linkend="faq"
-                xrefstyle="select:title" />, <link
-                xlink:href="http://java.sun.com/xml/jaxb/faq.html">java.sun.com</link>]</para>
+                xrefstyle="select:title" />]</para>
             </listitem>
         </itemizedlist>
     </section>
diff --git a/jaxb-ri/docs/release-documentation/src/docbook/tools-schemagen-ant-task.xml b/jaxb-ri/docs/release-documentation/src/docbook/tools-schemagen-ant-task.xml
index 7b6a38b..8fb6b97 100644
--- a/jaxb-ri/docs/release-documentation/src/docbook/tools-schemagen-ant-task.xml
+++ b/jaxb-ri/docs/release-documentation/src/docbook/tools-schemagen-ant-task.xml
@@ -30,7 +30,7 @@
         <para>The <literal>jaxb-jxc.jar</literal> file contains the
         <literal>SchemaGenTask.class</literal> file, which allows the schema
         generator to be invoked from the <link
-        xlink:href="http://jakarta.apache.org/ant">Ant</link> build tool. To
+        xlink:href="http://ant.apache.org">Ant</link> build tool. To
         use <literal>SchemaGenTask</literal>, include the following statement
         in your <literal>build.xml</literal> file:</para>
 
@@ -72,7 +72,7 @@
 
             <para><literal>schemagen</literal> supports most of the attributes
             defined by <link
-            xlink:href="http://ant.apache.org/manual/CoreTasks/javac.html">the
+            xlink:href="http://ant.apache.org/manual/Tasks/javac.html">the
             javac task</link>, plus the following parameter attributes.</para>
 
             <informaltable frame="all">
@@ -129,7 +129,7 @@
 
             <para><literal>xjc</literal> supports all the nested elements
             defined by <link
-            xlink:href="http://ant.apache.org/manual/CoreTasks/javac.html">the
+            xlink:href="http://ant.apache.org/manual/Tasks/javac.html">the
             javac task</link>, the following nested element parameters.</para>
 
             <section xml:id="section-1989087498722346">
diff --git a/jaxb-ri/docs/release-documentation/src/docbook/tools-xjc-ant-task.xml b/jaxb-ri/docs/release-documentation/src/docbook/tools-xjc-ant-task.xml
index 96f2f8b..bed08dc 100644
--- a/jaxb-ri/docs/release-documentation/src/docbook/tools-xjc-ant-task.xml
+++ b/jaxb-ri/docs/release-documentation/src/docbook/tools-xjc-ant-task.xml
@@ -30,7 +30,7 @@
         <para>The <literal>jaxb-xjc.jar</literal> file contains the
         <literal>XJCTask.class</literal> file, which allows the XJC binding
         compiler to be invoked from the <link
-        xlink:href="http://jakarta.apache.org/ant">Ant</link> build tool. To
+        xlink:href="http://ant.apache.org/">Ant</link> build tool. To
         use <literal>XJCTask</literal>, include the following statement in
         your <literal>build.xml</literal> file:</para>
 
@@ -267,7 +267,7 @@
                 customization), use nested
                 <literal>&lt;classpath&gt;</literal> elements. For the syntax,
                 see <link
-                xlink:href="http://jakarta.apache.org/ant/manual/using.html#path">"path-like
+                xlink:href="http://ant.apache.org//manual/using.html#path">"path-like
                 structure"</link> .</para>
             </section>
 
diff --git a/jaxb-ri/docs/release-documentation/src/docbook/tools-xjc.xml b/jaxb-ri/docs/release-documentation/src/docbook/tools-xjc.xml
index cf9c497..501da79 100644
--- a/jaxb-ri/docs/release-documentation/src/docbook/tools-xjc.xml
+++ b/jaxb-ri/docs/release-documentation/src/docbook/tools-xjc.xml
@@ -281,7 +281,7 @@
                         <para>Specify catalog files to resolve external entity
                         references. Supports TR9401, XCatalog, and OASIS XML
                         Catalog format. Please read the <link
-                        xlink:href="catalog.html">XML Entity and URI
+                        xlink:href="http://xml.apache.org/commons/components/resolver/resolver-article.html">XML Entity and URI
                         Resolvers</link> document or the
                         <literal>catalog-resolver</literal> sample
                         application.</para>
diff --git a/jaxb-ri/docs/release-documentation/src/docbook/users-guide-compiling-xml-schema-dealing-with-errors.xml b/jaxb-ri/docs/release-documentation/src/docbook/users-guide-compiling-xml-schema-dealing-with-errors.xml
index d216319..2e21fde 100644
--- a/jaxb-ri/docs/release-documentation/src/docbook/users-guide-compiling-xml-schema-dealing-with-errors.xml
+++ b/jaxb-ri/docs/release-documentation/src/docbook/users-guide-compiling-xml-schema-dealing-with-errors.xml
@@ -174,7 +174,7 @@
 
             <para>External &binding.spec.name; customizations are specified by using XPath
             (or using <link
-            xlink:href="customization-of-schema-compilation-using-scd-for-customizations">SCD</link>.)
+            linkend="customization-of-schema-compilation-using-scd-for-customizations">SCD</link>.)
             This works by writing an XPath expression that matches a
             particular element in the schema document. For example, given the
             following schema and binding file:</para>
diff --git a/jaxb-ri/docs/release-documentation/src/docbook/users-guide-deployment-which-jaxb-ri-is-included-in-which-jdk.xml b/jaxb-ri/docs/release-documentation/src/docbook/users-guide-deployment-which-jaxb-ri-is-included-in-which-jdk.xml
index 29214c4..23c3781 100644
--- a/jaxb-ri/docs/release-documentation/src/docbook/users-guide-deployment-which-jaxb-ri-is-included-in-which-jdk.xml
+++ b/jaxb-ri/docs/release-documentation/src/docbook/users-guide-deployment-which-jaxb-ri-is-included-in-which-jdk.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-    Copyright (c) 2012, 2018 Oracle and/or its affiliates. All rights reserved.
+    Copyright (c) 2012, 2020 Oracle and/or its affiliates. All rights reserved.
 
     This program and the accompanying materials are made available under the
     terms of the Eclipse Distribution License v. 1.0, which is available at
@@ -39,7 +39,7 @@
                     </entry>
 
                     <entry>
-                        <link xlink:href="/2.0.3/">JAXB RI 2.0.3</link>
+                        JAXB RI 2.0.3
                     </entry>
                 </row>
 
@@ -49,7 +49,7 @@
                     </entry>
 
                     <entry>
-                        <link xlink:href="/2.1.3/">JAXB RI 2.1.3</link>
+                        JAXB RI 2.1.3
                     </entry>
                 </row>
 
@@ -59,7 +59,7 @@
                     </entry>
 
                     <entry>
-                        <link xlink:href="/2.1.10/">JAXB RI 2.1.10</link>
+                        JAXB RI 2.1.10
                     </entry>
                 </row>
 
@@ -69,7 +69,7 @@
                     </entry>
 
                     <entry>
-                        <link xlink:href="/2.2.4-1/">JAXB RI 2.2.4-1</link>
+                        JAXB RI 2.2.4-1
                     </entry>
                 </row>
                 <row>