Merge jdk8u40-b22

Fri, 16 Jan 2015 13:50:15 -0800

author
asaha
date
Fri, 16 Jan 2015 13:50:15 -0800
changeset 1267
b6d03a810a61
parent 1266
97620c5cb56f
parent 1216
d8a715bb7aad
child 1268
5dd2ad6c7911
child 1293
07d4aadfb948
child 1359
16f78e229a52

Merge

     1.1 --- a/make/Javadoc.gmk	Thu Jan 15 11:19:15 2015 -0800
     1.2 +++ b/make/Javadoc.gmk	Fri Jan 16 13:50:15 2015 -0800
     1.3 @@ -114,10 +114,10 @@
     1.4  
     1.5  # Url to devdocs page
     1.6  # Was: http://java.sun.com/javase/6/webnotes/devdocs-vs-specs.html
     1.7 -DEV_DOCS_URL-7 = http://download.oracle.com/javase/7/docs/index.html
     1.8 -DEV_DOCS_URL-8 = http://download.oracle.com/javase/8/docs/index.html
     1.9 +DEV_DOCS_URL-7 = https://docs.oracle.com/javase/7/docs/index.html
    1.10 +DEV_DOCS_URL-8 = https://docs.oracle.com/javase/8/docs/index.html
    1.11  DEV_DOCS_URL = $(DEV_DOCS_URL-$(JDK_MINOR_VERSION))
    1.12 -DOCS_BASE_URL = http://download.oracle.com/javase/7/docs
    1.13 +DOCS_BASE_URL = https://docs.oracle.com/javase/7/docs
    1.14  
    1.15  # Common Java trademark line
    1.16  JAVA_TRADEMARK_LINE = Java is a trademark or registered trademark of \

mercurial