From b7461ce2e43bda44a1ba5355f78288c85da773bc Mon Sep 17 00:00:00 2001
From: Stefan Bodewig <bodewig@apache.org>
Date: Tue, 3 Jul 2018 18:28:55 +0200
Subject: [PATCH] update links and "included in Java" info for JAF

---
 manual/Tasks/mimemail.html | 9 ++++++---
 manual/install.html        | 6 +++---
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/manual/Tasks/mimemail.html b/manual/Tasks/mimemail.html
index ba066a6b6..c86d61464 100644
--- a/manual/Tasks/mimemail.html
+++ b/manual/Tasks/mimemail.html
@@ -31,9 +31,12 @@
 
 <h3>Description</h3>
 <p>Sends SMTP mail with MIME attachments.
-<a href="http://www.oracle.com/technetwork/java/index-138643.html">JavaMail</a>
-and <a href="http://www.oracle.com/technetwork/java/javase/jaf-135115.html">Java
-Activation Framework</a> are required for this task.</p>
+<a href="https://javaee.github.io/javamail/">JavaMail</a>
+and <a href="https://github.com/javaee/activation">Java
+Activation Framework</a> are required for this task. The Java
+Activation Framework is part of the standard class library for Java6
+to Java9 but must be provided as an external library for Java10 and
+later again.</p>
 <p>Multiple files can be attached using <a href="../Types/fileset.html">FileSets.</a></p>
 <h3>Parameters</h3>
 <table border="1" cellpadding="2" cellspacing="0">
diff --git a/manual/install.html b/manual/install.html
index ccaeb3e04..2d232f0a4 100644
--- a/manual/install.html
+++ b/manual/install.html
@@ -928,11 +928,11 @@ these tasks available. Please refer to the <a href="#optionalTasks"> Installing
   </tr>
   <tr>
     <td>activation.jar<br/>
-    (included in Java 6 and later runtime)</td>
+    (included in Java 6 to Java9 no longer included in Java10 and later)</td>
     <td><a href="Tasks/mail.html">mail</a> task with MIME encoding,
     and <i>deprecated</i> <a href="Tasks/mimemail.html">mimemail</a> task</td>
-    <td><a href="http://www.oracle.com/technetwork/java/javase/jaf-135115.html"
-        target="_top">http://www.oracle.com/technetwork/java/javase/jaf-135115.html</a></td>
+    <td><a href="https://github.com/javaee/activation"
+        target="_top">https://github.com/javaee/activation</a></td>
   </tr>
   <tr>
     <td>jdepend.jar</td>