diff options
| author | asaha <none@none> | 2015-11-30 10:40:20 -0800 |
|---|---|---|
| committer | asaha <none@none> | 2015-11-30 10:40:20 -0800 |
| commit | 7e537cea9a91ec76800bbb6355795829a07c1503 (patch) | |
| tree | a90cec4c75e2978d60ffb99baa1344d10e29fd0e | |
| parent | f709339dc055abf5719993351ec873d1ff344f7d (diff) | |
| parent | 61ffd59b249398e1fb4a03f6165698ffea71f9f4 (diff) | |
| download | jdk8u-7e537cea9a91ec76800bbb6355795829a07c1503.tar.gz | |
Merge
| -rw-r--r-- | .hgtags | 1 | ||||
| -rw-r--r-- | make/Javadoc.gmk | 2 |
2 files changed, 3 insertions, 0 deletions
@@ -506,6 +506,7 @@ c70fdd779a6775bc5f90d60ff1feca2c90e3c2b7 jdk8u71-b05 0ed543b92df44dfcfbfd074b9d6461a50e5f198f jdk8u71-b08 4231747bc5013bbead0cefa37ae4d2a390f2d446 jdk8u71-b09 5b9d5e755832e86824826fda37c8e6ee4ed064f5 jdk8u71-b10 +4ad71baca90cbe089c121457a80f6693aa80b4e6 jdk8u71-b11 31a6e29ec33a9a3c6ac13ce66d3b96196700841c jdk8u72-b00 d0afaafe3790d446d24ca35ddf61380457362b39 jdk8u72-b01 2ffdd22b85317d3ba5ab28e34bcd288a5f18d998 jdk8u72-b02 diff --git a/make/Javadoc.gmk b/make/Javadoc.gmk index b84a4c3..296d6b4 100644 --- a/make/Javadoc.gmk +++ b/make/Javadoc.gmk @@ -258,6 +258,8 @@ That documentation contains more detailed, developer-targeted descriptions, \ 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 |