From 2a6774809aff9664125da78eb0760a7096d70ac9 Mon Sep 17 00:00:00 2001
From: Jeannette Hung <jeannette.hung@oracle.com>
Date: Tue, 14 Mar 2017 15:52:41 -0700
Subject: [PATCH] 8174977: Update license files with consistent license/notice
 names

Reviewed-by: alanb, mchung
---
 jdk/src/java.desktop/share/legal/colorimaging.md            | 6 ++++--
 jdk/src/java.desktop/share/legal/jpeg.md                    | 2 +-
 jdk/src/java.desktop/share/legal/libpng.md                  | 4 ++--
 jdk/src/java.desktop/share/legal/mesa3d.md                  | 2 +-
 jdk/src/java.desktop/unix/legal/fontconfig.md               | 4 ++--
 jdk/src/java.smartcardio/unix/legal/pcsclite.md             | 2 +-
 jdk/src/java.xml.crypto/share/legal/santuario.md            | 2 +-
 .../jdk.crypto.cryptoki/share/legal/pkcs11cryptotoken.md    | 2 +-
 jdk/src/jdk.crypto.ec/share/legal/ecc.md                    | 6 +++---
 9 files changed, 16 insertions(+), 14 deletions(-)

diff --git a/jdk/src/java.desktop/share/legal/colorimaging.md b/jdk/src/java.desktop/share/legal/colorimaging.md
index e5a011b4823..12ceea85a42 100644
--- a/jdk/src/java.desktop/share/legal/colorimaging.md
+++ b/jdk/src/java.desktop/share/legal/colorimaging.md
@@ -1,5 +1,7 @@
 ## Eastman Kodak Company: Kodak Color Management System (kcms) and portions of color management and imaging software
 
-### Notice
-
+### Eastman Kodak Notice
+<pre>
 Portions Copyright Eastman Kodak Company 1991-2003
+</pre>
+
diff --git a/jdk/src/java.desktop/share/legal/jpeg.md b/jdk/src/java.desktop/share/legal/jpeg.md
index 681d9f5bf8a..91f27bd838a 100644
--- a/jdk/src/java.desktop/share/legal/jpeg.md
+++ b/jdk/src/java.desktop/share/legal/jpeg.md
@@ -1,4 +1,4 @@
-## JPEG rb6
+## JPEG release 6b
 
 ### JPEG License
 <pre>
diff --git a/jdk/src/java.desktop/share/legal/libpng.md b/jdk/src/java.desktop/share/legal/libpng.md
index cd9f613d29f..5619bd1c8bb 100644
--- a/jdk/src/java.desktop/share/legal/libpng.md
+++ b/jdk/src/java.desktop/share/legal/libpng.md
@@ -1,6 +1,6 @@
-## Libpng v 1.6.23
+## libpng v1.6.23
 
-### Libpng License
+### libpng License
 <pre>
 
 This copy of the libpng notices is provided for your convenience.  In case of
diff --git a/jdk/src/java.desktop/share/legal/mesa3d.md b/jdk/src/java.desktop/share/legal/mesa3d.md
index 50c2114af6a..3d2168e3247 100644
--- a/jdk/src/java.desktop/share/legal/mesa3d.md
+++ b/jdk/src/java.desktop/share/legal/mesa3d.md
@@ -1,6 +1,6 @@
 ## Mesa 3-D Graphics Library v4.1
 
-### Mesa 3-D Graphics Library License
+### Mesa License
 <pre>
 
 Mesa 3-D graphics library
diff --git a/jdk/src/java.desktop/unix/legal/fontconfig.md b/jdk/src/java.desktop/unix/legal/fontconfig.md
index abdebf351e7..50f353d86cd 100644
--- a/jdk/src/java.desktop/unix/legal/fontconfig.md
+++ b/jdk/src/java.desktop/unix/legal/fontconfig.md
@@ -1,6 +1,6 @@
-## FontConfig v2.5
+## Fontconfig v2.5
 
-### FontConfig License
+### Fontconfig License
 <pre>
 
 Copyright 2001,2003 Keith Packard
diff --git a/jdk/src/java.smartcardio/unix/legal/pcsclite.md b/jdk/src/java.smartcardio/unix/legal/pcsclite.md
index f90e9cc517d..380062df18a 100644
--- a/jdk/src/java.smartcardio/unix/legal/pcsclite.md
+++ b/jdk/src/java.smartcardio/unix/legal/pcsclite.md
@@ -1,6 +1,6 @@
 ## PC/SC Lite for Suse Linux v1.1.1
 
-### PC/SC Lite for Suse Linux License
+### PC/SC Lite License
 <pre>
 
 Copyright (c) 1999-2004 David Corcoran <corcoran@linuxnet.com>
diff --git a/jdk/src/java.xml.crypto/share/legal/santuario.md b/jdk/src/java.xml.crypto/share/legal/santuario.md
index 0d8be1b527f..4bd7321ff7f 100644
--- a/jdk/src/java.xml.crypto/share/legal/santuario.md
+++ b/jdk/src/java.xml.crypto/share/legal/santuario.md
@@ -1,6 +1,6 @@
 ## Apache Santuario v1.5.4
 
-### Notice
+### Apache Santuario Notice
 <pre>
 
   Apache Santuario - XML Security for Java
diff --git a/jdk/src/jdk.crypto.cryptoki/share/legal/pkcs11cryptotoken.md b/jdk/src/jdk.crypto.cryptoki/share/legal/pkcs11cryptotoken.md
index 6f7e3fb92ec..9f786fa3f50 100644
--- a/jdk/src/jdk.crypto.cryptoki/share/legal/pkcs11cryptotoken.md
+++ b/jdk/src/jdk.crypto.cryptoki/share/legal/pkcs11cryptotoken.md
@@ -1,4 +1,4 @@
-## PKCS #11 Cryptographic Token Interface, v2.20 amendment 3 Header Files
+## PKCS #11 Cryptographic Token Interface v2.20 Amendment 3 Header Files
 
 ### PKCS #11 Cryptographic Token Interface License
 <pre>
diff --git a/jdk/src/jdk.crypto.ec/share/legal/ecc.md b/jdk/src/jdk.crypto.ec/share/legal/ecc.md
index 6d4fc59a453..2ce66e448b1 100644
--- a/jdk/src/jdk.crypto.ec/share/legal/ecc.md
+++ b/jdk/src/jdk.crypto.ec/share/legal/ecc.md
@@ -1,6 +1,6 @@
-## Mozilla Elliptic Curve Cryptography
+## Mozilla Elliptic Curve Cryptography (ECC)
 
-### Notice
+### Mozilla ECC Notice
 <pre>
 
 This notice is provided with respect to Elliptic Curve Cryptography,
@@ -21,7 +21,7 @@ Elliptic Curve Cryptography library:
 
 </pre>
 
-### LGPL 2.1 License
+### LGPL 2.1
 <pre>
 
                   GNU LESSER GENERAL PUBLIC LICENSE