Tweak EFSL replacements on advice from platform-dev list

jakartaee · May 12, 2020 · 74d0405 · 74d0405
1 parent 9776982
commit 74d0405
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 11 deletions.
diff --git a/api/src/main/javadoc/doc-files/EFSL.html b/api/src/main/javadoc/doc-files/EFSL.html
@@ -19,9 +19,8 @@ <h1>Eclipse Foundation Specification License - v1.0</h1>
   <li> link or URL to the original Eclipse Foundation document.</li>
   <li>All existing copyright notices, or if one does not exist, a notice
       (hypertext is preferred, but a textual representation is permitted)
-      of the form: &quot;Copyright &copy; [$date-of-document]
-      Eclipse Foundation, Inc.
-      https://www.eclipse.org/legal/efsl.php&quot;
+      of the form: &quot;Copyright &copy; [$date-of-document] Eclipse
+      Foundation, Inc. https://www.eclipse.org/legal/efsl.php&quot;
   </li>
 </ul>
 
@@ -42,9 +41,10 @@ <h1>Eclipse Foundation Specification License - v1.0</h1>
 
 <p>The notice is:</p>
 
-<p>&quot;Copyright &copy; [$date-of-document] Eclipse Foundation. This software or
-  document includes material copied from or derived from [title and URI
-  of the Eclipse Foundation specification document].&quot;</p>
+<p>&quot;Copyright &copy; 2018, 2020 Eclipse Foundation. This software or
+  document includes material copied from or derived from
+  Jakarta ® Expression Language
+  https://jakarta.ee/specifications/expression-language/4.0/&quot;</p>
 
 <h2>Disclaimers</h2>
 

diff --git a/spec/src/main/asciidoc/license-efsl.adoc b/spec/src/main/asciidoc/license-efsl.adoc
@@ -14,7 +14,7 @@ endif::[]
 Release: {revdate}
 ....
 
-Copyright (c) {revyear} Eclipse Foundation.
+Copyright (c) 2018, {revyear} Eclipse Foundation.
 
 === Eclipse Foundation Specification License
 
@@ -32,7 +32,7 @@ document, or portions thereof, that you use:
 * link or URL to the original Eclipse Foundation document.
 * All existing copyright notices, or if one does not exist, a notice
   (hypertext is preferred, but a textual representation is permitted)
-  of the form: "Copyright (c) {revyear} Eclipse Foundation, Inc.
+  of the form: "Copyright © [$date-of-document] Eclipse Foundation, Inc.
   https://www.eclipse.org/legal/efsl.php[https://www.eclipse.org/legal/efsl.php]"
 
 Inclusion of the full text of this NOTICE must be provided. We
@@ -52,9 +52,10 @@ specification is expressly prohibited.
 
 The notice is:
 
-"Copyright (c) {revyear} Eclipse Foundation. This software or document
-includes material copied from or derived from {doctitle} {revnumber}
-{revremark} [URI of the Eclipse Foundation specification document]."
+"Copyright © 2018, 2020 Eclipse Foundation. This software or document
+includes material copied from or derived from
+Jakarta ® Expression Language
+https://jakarta.ee/specifications/expression-language/4.0/[https://jakarta.ee/specifications/expression-language/4.0/]"
 
 ==== Disclaimers