# HG changeset patch
# User lana
# Date 1381269293 25200
# Node ID c226531f83c11a8ef9d7c51d20e641588e3be522
# Parent  6367d3fbd987786173200ea7fce7c1f421f37e95# Parent  7a8b7863c491577adf85236c0993accd2899cc87
Merge

diff -r 6367d3fbd987 -r c226531f83c1 common/makefiles/javadoc/CORE_PKGS.gmk
--- a/common/makefiles/javadoc/CORE_PKGS.gmk	Wed Oct 02 13:26:25 2013 -0700
+++ b/common/makefiles/javadoc/CORE_PKGS.gmk	Tue Oct 08 14:54:53 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
diff -r 6367d3fbd987 -r c226531f83c1 common/makefiles/javadoc/Javadoc.gmk
--- a/common/makefiles/javadoc/Javadoc.gmk	Wed Oct 02 13:26:25 2013 -0700
+++ b/common/makefiles/javadoc/Javadoc.gmk	Tue Oct 08 14:54:53 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