Merge branch '1.9.x'

manual/Tasks/mimemail.html

@@ -31,10 +31,13 @@
 
 <h3>Description</h3>
 <p>Sends SMTP mail with MIME
-attachments.  <a href="https://www.oracle.com/technetwork/java/index-138643.html"
+attachments.  <a href="https://javaee.github.io/javamail/"
 target="_top">JavaMail</a>
-and <a href="https://www.oracle.com/technetwork/java/javase/jaf-135115.html" target="_top">Java
-Activation Framework</a> are required for this task.</p>
+and <a href="https://github.com/javaee/activation" target="_top">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 class="attr">

manual/install.html

@@ -897,10 +897,11 @@ these tasks available. Please refer to the <a href="#optionalTasks">Installing A
     <td><a href="https://javaee.github.io/javamail/" target="_top">https://javaee.github.io/javamail/</a></td>
   </tr>
   <tr>
-    <td>activation.jar<br/>(included in Java 6 and later runtime)</td>
+    <td>activation.jar<br/>
+    (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 <em><u>deprecated</u></em> <a href="Tasks/mimemail.html">mimemail</a> task</td>
-    <td><a href="https://www.oracle.com/technetwork/java/javase/jaf-135115.html"
+    <td><a href="https://github.com/javaee/activation"
            target="_top">https://www.oracle.com/technetwork/java/javase/jaf-135115.html</a></td>
   </tr>
   <tr>