From e038a13474ff4a8865d58309f48e17acac7e8349 Mon Sep 17 00:00:00 2001 From: jbondpdx Date: Thu, 9 Jun 2016 09:59:13 -0700 Subject: [PATCH] minor edit on new text --- README.markdown | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/README.markdown b/README.markdown index 3895fff..9662aea 100644 --- a/README.markdown +++ b/README.markdown @@ -26,7 +26,7 @@ To install the correct Java package on your system, include the `java` class: `i ##Usage -The java module installs the correct jdk or jre package on a wide variety of systems. By default, the module will install the jdk package, but you can set different installation parameters as needed. For example, to install jre instead of jdk, you would set the distribution parameter: +The java module installs the correct jdk or jre package on a wide variety of systems. By default, the module installs the jdk package, but you can set different installation parameters as needed. For example, to install jre instead of jdk, you would set the distribution parameter: ~~~ class { 'java': @@ -34,7 +34,7 @@ class { 'java': } ~~~ -Example installing the latest patch version of java 8 on Centos +To install the latest patch version of Java 8 on CentOS ~~~ class { 'java' : @@ -89,7 +89,7 @@ Valid options: Run command `update-java-alternatives -l` for a list of available Valid option: String. Default: OS and distribution dependent defaults on *deb systems, undef on others. #####`package` -Specifies the name of the Java package. This is configurable in case you want to install a non-standard Java package. If not set, the module will install the appropriate package for the `distribution` parameter and target platform. If you set `package`, the `distribution` parameter will do nothing. +Specifies the name of the Java package. This is configurable in case you want to install a non-standard Java package. If not set, the module installs the appropriate package for the `distribution` parameter and target platform. If you set `package`, the `distribution` parameter does nothing. Valid option: String. Default: undef. #####`version` @@ -134,7 +134,7 @@ This module cannot guarantee installation of Java versions that are not availabl This module only manages a singular installation of Java, meaning it is not possible to manage e.g. OpenJDK 7, Oracle Java 7 and Oracle Java 8 in parallel on the same system. -Oracle Java packages are not included in Debian 7 and Ubuntu 12.04/14.04 repositories. To install Java on those systems, you'll need to package Oracle JDK/JRE, and then the module will be able to install the package. For more information on how to package Oracle JDK/JRE, see the [Debian wiki](http://wiki.debian.org/JavaPackage). +Oracle Java packages are not included in Debian 7 and Ubuntu 12.04/14.04 repositories. To install Java on those systems, you'll need to package Oracle JDK/JRE, and then the module can install the package. For more information on how to package Oracle JDK/JRE, see the [Debian wiki](http://wiki.debian.org/JavaPackage). This module is officially [supported](https://forge.puppetlabs.com/supported) for the following Java versions and platforms: @@ -157,13 +157,13 @@ Sun Java is supported on: Oracle Java is supported on: * CentOS 6 -### A note to OpenBSD +### A note about OpenBSD OpenBSD packages install Java JRE/JDK in a unique directory structure, not linking the binaries to a standard directory. Because of that, the path to this location is hardcoded in the java_version fact. Whenever a Java upgrade to a newer version/path will be done on OpenBSD, it has to be adapted there. -### A note to FreeBSD +### A note about FreeBSD By default on FreeBSD Puppet < 4.0, you will see an error as `pkgng` is not the default provider. To fix this, you can install the [zleslie/pkgng module](https://forge.puppetlabs.com/zleslie/pkgng) and set it as the default package provider like so: ```puppet