Skip to content

Commit

Permalink
Merge pull request #196 from gzurowski/fix-docs
Browse files Browse the repository at this point in the history
Fix naming of version_major and version_minor parameters
  • Loading branch information
hunner committed Oct 19, 2016
2 parents 06c3f9f + 2fe6ff2 commit b1f910d
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 11 deletions.
14 changes: 7 additions & 7 deletions README.markdown
Original file line number Diff line number Diff line change
Expand Up @@ -58,13 +58,13 @@ java::oracle { 'jdk8' :
}
~~~

To install a specific release of a Java version, e.g. 8u101-b13, provide both parameters `major_version` and `minor_version` as follows:
To install a specific release of a Java version, e.g. 8u101-b13, provide both parameters `version_major` and `version_minor` as follows:

~~~
java::oracle { 'jdk8' :
ensure => 'present',
major_version => '8u101',
minor_version => 'b13',
version_major => '8u101',
version_minor => 'b13',
java_se => 'jdk',
}
~~~
Expand Down Expand Up @@ -118,11 +118,11 @@ The following parameters are available in `java::oracle`:
#####`version`
Version of Java Standard Edition (SE) to install. 6, 7 or 8.

#####`major_version`
Major version of the Java Standard Edition (SE) to install. Must be used together with `minor_version`. For example, '8u101'.
#####`version_major`
Major version of the Java Standard Edition (SE) to install. Must be used together with `version_minor`. For example, '8u101'.

#####`minor_version`
Minor version (or build version) of the Java Standard Edition (SE) to install. Must be used together with `major_version`. For example, 'b13'.
#####`version_minor`
Minor version (or build version) of the Java Standard Edition (SE) to install. Must be used together with `version_major`. For example, 'b13'.

#####`java_se`
Type of Java SE to install, jdk or jre.
Expand Down
8 changes: 4 additions & 4 deletions manifests/oracle.pp
Original file line number Diff line number Diff line change
Expand Up @@ -17,13 +17,13 @@
# Version of Java to install, e.g. '7' or '8'. Default values for major and minor
# versions will be used.
#
# [*major_version*]
# [*version_major*]
# Major version which should be installed, e.g. '8u101'. Must be used together with
# minor_version.
# version_minor.
#
# [*minor_version*]
# [*version_minor*]
# Minor version which should be installed, e.g. 'b12'. Must be used together with
# major_version.
# version_major.
#
# [*java_se*]
# Type of Java Standard Edition to install, jdk or jre.
Expand Down

0 comments on commit b1f910d

Please sign in to comment.