changeset 1626:3b454f1fb441 jdk8u72-b11

Merge
author asaha
date Mon, 30 Nov 2015 10:40:20 -0800
parents 52d589aa3223 4d09473111de
children c73bf1495c5d
files .hgtags
diffstat 2 files changed, 3 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/.hgtags	Mon Nov 23 22:24:41 2015 -0800
+++ b/.hgtags	Mon Nov 30 10:40:20 2015 -0800
@@ -506,6 +506,7 @@
 0ed543b92df44dfcfbfd074b9d6461a50e5f198f jdk8u71-b08
 4231747bc5013bbead0cefa37ae4d2a390f2d446 jdk8u71-b09
 5b9d5e755832e86824826fda37c8e6ee4ed064f5 jdk8u71-b10
+4ad71baca90cbe089c121457a80f6693aa80b4e6 jdk8u71-b11
 31a6e29ec33a9a3c6ac13ce66d3b96196700841c jdk8u72-b00
 d0afaafe3790d446d24ca35ddf61380457362b39 jdk8u72-b01
 2ffdd22b85317d3ba5ab28e34bcd288a5f18d998 jdk8u72-b02
--- a/make/Javadoc.gmk	Mon Nov 23 22:24:41 2015 -0800
+++ b/make/Javadoc.gmk	Mon Nov 30 10:40:20 2015 -0800
@@ -258,6 +258,8 @@
 with conceptual overviews, definitions of terms, workarounds, \
 and working code examples.<br>\
 $(call CopyrightLine,$(COPYRIGHT_URL),$(FIRST_COPYRIGHT_YEAR),)\
+Use is subject to <a href="http://download.oracle.com/otndocs/jcp/java_se-8-mrel-spec/license.html">license terms</a>. \
+Also see the <a target="_blank" href="http://www.oracle.com/technetwork/java/redist-137594.html">documentation redistribution policy</a>.\
 </font>
 
 # Common javadoc options used by all