Fixed the references to "Oracle Microsystems" and other brand inconsistencies

Signed-off-by: Cédric Pineau <cedric.pineau@gmail.com>

diff --git a/lib/j2sdk-doc.sh b/lib/j2sdk-doc.sh
index 98bb9cfde5c7269257bafc7eff530e5ecb305a0e..4b3075725186256e4e0bd322f560552607f279b5 100644 (file)
--- a/lib/j2sdk-doc.sh
+++ b/lib/j2sdk-doc.sh
@@ -13,7 +13,7 @@ Description: $j2se_title
  Java(TM) platform.
  .
  This package provides the official API documentation published
- by Sun Microsystems.
+ by Oracle.
  .
  This package has been automatically created with java-package ($version).
 EOF

diff --git a/lib/oracle-j2re.sh b/lib/oracle-j2re.sh
index 4ee450ea7d8d99a2c738944e554921ff5e3b73aa..4e5d340c8ece25f572db922cb4ed2ca211f02b73 100644 (file)
--- a/lib/oracle-j2re.sh
+++ b/lib/oracle-j2re.sh
@@ -43,14 +43,14 @@ oracle_j2re_detect() {
 Detected product:
     Java(TM) Runtime Environment (JRE)
     Standard Edition, Version $j2se_version
-    Oracle Microsystems(TM), Inc.
+    Oracle(TM)
 EOF
        if read_yn "Is this correct [Y/n]: "; then
            j2se_found=true
            j2se_release="${j2se_version:0:3}"
            j2se_required_space=$(( $j2se_expected_min_size * 2 + 20 ))
            j2se_vendor="oracle"
-           j2se_title="Java(TM) JRE, Standard Edition, Oracle Microsystems(TM)"
+           j2se_title="Java(TM) JRE, Standard Edition, Oracle(TM)"
 
            j2se_install=oracle_j2re_install
            j2se_remove=oracle_j2re_remove

diff --git a/lib/oracle-j2sdk-doc.sh b/lib/oracle-j2sdk-doc.sh
index 8ac8d1717f78b6c98cb54486b37d61b69542398f..5b1487f81d4228c38b2c5453f65315928a08aac5 100644 (file)
--- a/lib/oracle-j2sdk-doc.sh
+++ b/lib/oracle-j2sdk-doc.sh
@@ -19,7 +19,7 @@ oracle_j2sdk_doc_detect() {
 Detected product:
     Java(TM) Development Kit (JDK) Documentation
     Standard Edition, Version $j2se_version
-    Oracle(TM), Inc.
+    Oracle(TM)
 EOF
        if read_yn "Is this correct [Y/n]: "; then
            j2se_found=true

diff --git a/lib/oracle-j2sdk.sh b/lib/oracle-j2sdk.sh
index 18b272f85e91b62d820694a7845af5bc565cf732..c81334d1b33d3e5958a81b425bbdcfc46c37f2b5 100644 (file)
--- a/lib/oracle-j2sdk.sh
+++ b/lib/oracle-j2sdk.sh
@@ -43,7 +43,7 @@ oracle_j2sdk_detect() {
 Detected product:
     Java(TM) Development Kit (JDK)
     Standard Edition, Version $j2se_version
-    Oracle(TM), Inc.
+    Oracle(TM)
 EOF
        if read_yn "Is this correct [Y/n]: "; then
            j2se_found=true