changeset 817:3ece65f23ed2

Merge
author lana
date Fri, 11 Oct 2013 00:06:56 -0700
parents 82a36c5c4eaf 7c0e2fd8be4d
children 7deff16cf438 d35943431696
files
diffstat 2 files changed, 2 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/common/makefiles/javadoc/CORE_PKGS.gmk	Thu Oct 10 10:08:45 2013 -0700
+++ b/common/makefiles/javadoc/CORE_PKGS.gmk	Fri Oct 11 00:06:56 2013 -0700
@@ -41,7 +41,6 @@
   org.w3c.dom.stylesheets  \
   org.w3c.dom.traversal    \
   org.w3c.dom.ranges       \
-  org.w3c.dom.views        \
   org.omg.stub.javax.management.remote.rmi
 
 #
@@ -295,6 +294,7 @@
   org.w3c.dom.events                             \
   org.w3c.dom.bootstrap                          \
   org.w3c.dom.ls                                 \
+  org.w3c.dom.views                              \
   org.xml.sax                                    \
   org.xml.sax.ext                                \
   org.xml.sax.helpers
--- a/common/makefiles/javadoc/Javadoc.gmk	Thu Oct 10 10:08:45 2013 -0700
+++ b/common/makefiles/javadoc/Javadoc.gmk	Fri Oct 11 00:06:56 2013 -0700
@@ -116,8 +116,7 @@
 # Url to devdocs page
 #   Was: http://java.sun.com/javase/6/webnotes/devdocs-vs-specs.html
 DEV_DOCS_URL-7 = http://download.oracle.com/javase/7/docs/index.html
-# This isn't added in old build yet.
-#DEV_DOCS_URL-8 = http://download.oracle.com/javase/7/docs/index.html
+DEV_DOCS_URL-8 = http://download.oracle.com/javase/8/docs/index.html
 DEV_DOCS_URL = $(DEV_DOCS_URL-$(JDK_MINOR_VERSION))
 DOCS_BASE_URL = http://download.oracle.com/javase/7/docs