doc: clarify Java requirements

JMRI · Jul 11, 2020 · c030aa8 · c030aa8
1 parent 0958904
commit c030aa8
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 8 deletions.
diff --git a/help/en/html/setup/index.shtml b/help/en/html/setup/index.shtml
@@ -58,7 +58,7 @@
 
           <ul>
             <li><a href=
-            "https://jmri.org/install/Raspbian.shtml">RasPi</a></li>
+            "https://jmri.org/install/Raspbian.shtml">Raspberry Pi</a></li>
           </ul>
         </li>
       </ul>
@@ -67,15 +67,25 @@
 
       <ul>
         <li>Version 2.12 can run on any computer system that will
-        run Java 1.5 or later.</li>
+        run Java 1.5 through Java 8 (also known as Java 1.8).</li>
 
-        <li>Version 2.14.1 requires Java 1.5 (or 1.6 if you wish
-        for drag &amp; drop)</li>
+        <li>Version 2.14.1 requires Java 1.5 (or Java 1.6 to support
+        for drag &amp; drop) through Java 8.</li>
 
-        <li>Version 3.10.1 requires Java 1.7 or later.</li>
+        <li>Version 3.10.1 requires Java 1.7 through Java 8.</li>
 
-        <li>Version 4.2 requires Java 1.8.</li>
-      </ul><a name="startprog" id="startprog"></a>
+        <li>Version 4.2 requires Java 8.</li>
+      </ul>
+
+      As of JMRI 4.20, JMRI is only fully supported when running on the
+      two most recent Java Long Term Support (LTS) releases (8 or 11 as of July 2020)
+      and will receive "best-effort" support on the latest Java release (14 as of July 2020).
+      The JMRI project recommends Java from <a href="https://adoptopenjdk.net">AdoptOpenJDK</a>
+      or the operating system vendor unless using Windows 8 or older, in which case
+      Java from <a href="https://java.com">Oracle</a> is recommended. See the
+      operating system-specific installation guidance for further details.
+
+      <a name="startprog" id="startprog"></a>
 
       <h2>Starting the program</h2>
 

diff --git a/help/en/parts/SidebarInstall.shtml b/help/en/parts/SidebarInstall.shtml
@@ -7,7 +7,7 @@
             <li><a href="/install/WindowsNew.shtml">Windows</a>
             <li><a href="/install/MacOSX.shtml">Mac OS X</a>
             <li><a href="/install/Linux.shtml">Linux (multiple vers)</a>
-            <li><a href="/install/Raspbian.shtml">Raspbian on RaspberryPi</a>
+            <li><a href="/install/Raspbian.shtml">Raspberry Pi OS on Raspberry Pi</a>
             <li><i><a href="/install/Debug.shtml">Debugging an installation</a></i>
 		    </ul>
 		</dd>