From 45e4dc3f85c11bb4cc43b2a094295665a6c73f73 Mon Sep 17 00:00:00 2001
From: Ankur Sinha (Ankur Sinha Gmail) <sanjay.ankur@gmail.com>
Date: Apr 15 2019 13:18:05 +0000
Subject: Installing java: post merge tweaks


- Remove "ureviewed" header.
- Move introduction to main document.
- Add text saying OpenJDK is preferred.

---

diff --git a/modules/ROOT/pages/_partials/con_about-java.adoc b/modules/ROOT/pages/_partials/con_about-java.adoc
deleted file mode 100644
index 89564ee..0000000
--- a/modules/ROOT/pages/_partials/con_about-java.adoc
+++ /dev/null
@@ -1,10 +0,0 @@
-[id='about-java']
-= About Java
-
-Java is a popular programming language that allows you run programs on many platforms, including Fedora. If you want to create Java programs, you need to install a JDK (Java Development Kit). If you want to run a Java program, you can do that on a JVM (Java Virtual Machine), which is provided with the JRE (Java Runtime Environment). If in doubt, install the JDK because this is sometimes required even if the intention is not to write Java programs. 
-
-Many flavors of Java exist and also many versions of each flavor. If you want to just run a specific application, check the documentation of that software to see what versions of Java are supported or have been tested. Most Java applications run on one of the following:
-
-* OpenJDK -- an open-source implementation of the Java Platform, Standard Edition
-* Oracle Java SE -- a free JDK from Oracle
-
diff --git a/modules/ROOT/pages/installing-java.adoc b/modules/ROOT/pages/installing-java.adoc
index 3d50563..f1c59f1 100644
--- a/modules/ROOT/pages/installing-java.adoc
+++ b/modules/ROOT/pages/installing-java.adoc
@@ -3,11 +3,19 @@ ifdef::context[:parent-context: {context}]
 [id="assembly_installing-java"]
 = Installing Java
 
-include::{partialsdir}/unreviewed-message.adoc[]
+Java is a popular programming language that allows you run programs on many platforms, including Fedora.
+If you want to create Java programs, you need to install a JDK (Java Development Kit).
+If you want to run a Java program, you can do that on a JVM (Java Virtual Machine), which is provided with the JRE (Java Runtime Environment).
+If in doubt, install the JDK because this is sometimes required even if the intention is not to write Java programs.
 
-Java provides a platform for creating and running applications. You can install various versions of Java to suit your requirements.
+Many flavors of Java exist and also many versions of each flavor.
+If you want to just run a specific application, check the documentation of that software to see what versions of Java are supported or have been tested.
+Most Java applications run on one of the following:
 
-include::{partialsdir}/con_about-java.adoc[leveloffset=+1]
+* OpenJDK -- an open-source implementation of the Java Platform, Standard Edition.
+  This version is preferred, and included in Fedora.
+* Oracle Java SE -- a free JDK from Oracle.
+  This version is not open-source and we recommend that it only be used if OpenJDK is not sufficient.
 
 include::{partialsdir}/proc_installing-openjdk.adoc[leveloffset=+1]
 
@@ -36,5 +44,6 @@ To develop Java applications, consider the following open-source IDEs:
 * link:https://netbeans.org/[NetBeans]
 * link:https://eclipse.org/[Eclipse]
 * link:https://www.jetbrains.com/idea/[IntelliJ IDEA]
+
 ifdef::parent-context[:context: {parent-context}]
 ifndef::parent-context[:!context:]