Merge jdk8u20-b15

Wed, 14 May 2014 10:59:39 -0700

author
lana
date
Wed, 14 May 2014 10:59:39 -0700
changeset 1041
12a1fd80b05a
parent 1038
e16ec7a7aa93
parent 1040
25ae2149b923
child 1042
4095a7a49a9e
child 1066
f044e9413347

Merge

     1.1 --- a/make/Javadoc.gmk	Tue May 13 23:17:33 2014 -0700
     1.2 +++ b/make/Javadoc.gmk	Wed May 14 10:59:39 2014 -0700
     1.3 @@ -103,10 +103,7 @@
     1.4  DOCSDIR_URL = {@docroot}/$(GET2DOCSDIR)
     1.5  
     1.6  # Url to copyright html file
     1.7 -COPYRIGHT_URL-7 = $(DOCSDIR_URL)/legal/cpyr.html
     1.8 -# This isn't added in old build yet.
     1.9 -#COPYRIGHT_URL-8 = $(DOCSDIR_URL)/legal/cpyr.html
    1.10 -COPYRIGHT_URL = $(COPYRIGHT_URL-$(JDK_MINOR_VERSION))
    1.11 +COPYRIGHT_URL = $(DOCSDIR_URL)/legal/cpyr.html
    1.12  
    1.13  # Url to bug filing site
    1.14  BUG_SUBMIT_URL = http://bugreport.sun.com/bugreport/

mercurial