From 265dffd03fa43ddae747c8117baeb1049713b6a7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Kr=C3=A1tk=C3=BD?= Date: Mon, 1 Jan 2018 17:22:37 +0100 Subject: [PATCH] Updated, fixed 'Installing Java'. --- en-US/modules/proc_installing-openjdk.adoc | 21 +++++++++++------- .../modules/proc_installing-oracle-java.adoc | 22 ++++++++----------- 2 files changed, 22 insertions(+), 21 deletions(-) diff --git a/en-US/modules/proc_installing-openjdk.adoc b/en-US/modules/proc_installing-openjdk.adoc index 8d2d476..7439275 100644 --- a/en-US/modules/proc_installing-openjdk.adoc +++ b/en-US/modules/proc_installing-openjdk.adoc @@ -14,23 +14,28 @@ $ dnf search openjdk ==== Various flavors of OpenJDK are available. For information about these options, search the link:http://openjdk.java.net/[OpenJDK web site]. ==== ++ . Run the following command to install OpenJDK: + ---- -$ dnf install +# dnf install ---- + For example: + ---- -$ dnf install java-1.8.0-openjdk.x86_64 +# dnf install java-1.8.0-openjdk.x86_64 ---- + +// tag::java-alternatives[] [NOTE] ==== -If you have installed other versions of Java, you might need to switch the active version of java: ----- -sudo alternatives --config java ----- -A list of installed java versions is displayed. Choose the version you require. -==== +If you have installed other versions of Java, you might need to switch the active version of Java: +---- +# alternatives --config java +---- + +A list of installed Java versions is displayed. Choose the version you require. +==== +// end::java-alternatives[] diff --git a/en-US/modules/proc_installing-oracle-java.adoc b/en-US/modules/proc_installing-oracle-java.adoc index fe7344a..ee3b5cf 100644 --- a/en-US/modules/proc_installing-oracle-java.adoc +++ b/en-US/modules/proc_installing-oracle-java.adoc @@ -1,22 +1,18 @@ -[id='installing-oracle-java'] +[id='installing-oracle-java-se'] = Installing Oracle Java SE To install Oracle Java SE: . Navigate to link:http://www.oracle.com/technetwork/java/javase/downloads[Oracle Java SE downloads page]. -. Choose the version of Java you wish to use. Typically, you would navigate to the link:http://www.oracle.com/technetwork/java/javase/downloads/jdk8-downloads-2133151.html -[version 8 page]. -. Accept the license agreement and download the appropriate rpm file for your systems architecture. For example, if you run 64 bit Fedora, choose the `jdk-8u151-linux-x64.rpm` file. + +. Choose the version of Java you wish to use. Typically, you would navigate to the link:http://www.oracle.com/technetwork/java/javase/downloads/jdk8-downloads-2133151.html[version 8 page]. + +. Accept the license agreement and download the appropriate rpm file for your systems architecture. For example, if you run 64-bit Fedora, choose the `jdk-8u151-linux-x64.rpm` file. + . Enter the following command to install Oracle Java SE: + ---- -$ rpm -i jdk-8u151-linux-x64.rpm +# dnf install jdk-8u151-linux-x64.rpm ---- -[NOTE] -==== -If you have installed other versions of Java, you might need to switch the active version of java: ----- -sudo alternatives --config java ----- -A list of installed java versions is displayed. Choose the version you require. -==== \ No newline at end of file + +include::proc_installing-openjdk.adoc[tags=java-alternatives]