# HG changeset patch
# User asaha
# Date 1421349555 28800
# Node ID 97620c5cb56f282cf82e48c7126d77992b41255a
# Parent  5aaea2cafbe23eacaaab64cbc7616eacf10fca31# Parent  335b33942fad9235dd3b8d694aeee037df7d03c7
Merge

diff -r 5aaea2cafbe2 -r 97620c5cb56f .hgtags
--- a/.hgtags	Fri Jan 02 14:09:32 2015 -0800
+++ b/.hgtags	Thu Jan 15 11:19:15 2015 -0800
@@ -371,3 +371,4 @@
 83d1d42c3df409c87ef7cb0126343a009857ca71 jdk8u40-b18
 ae4980d195b64eec58884b233d7efd312205bac8 jdk8u40-b19
 b31a07adaef50dacba20e376cff6f1096e745092 jdk8u40-b20
+765a17e75fd622f7b892381e23c9b2c531d416f0 jdk8u40-b21
diff -r 5aaea2cafbe2 -r 97620c5cb56f make/Javadoc.gmk
--- a/make/Javadoc.gmk	Fri Jan 02 14:09:32 2015 -0800
+++ b/make/Javadoc.gmk	Thu Jan 15 11:19:15 2015 -0800
@@ -1116,14 +1116,15 @@
 NASHORNAPI_HEADER := <strong>Nashorn API</strong>
 NASHORNAPI_BOTTOM := $(call CommonBottom,$(NASHORNAPI_FIRST_COPYRIGHT_YEAR))
 NASHORNAPI_GROUPNAME := Packages
-NASHORNAPI_REGEXP := com.sun.source.*
+NASHORNAPI_REGEXP := jdk.nashorn.api.scripting.*
+
 # NASHORNAPI_PKGS is located in NON_CORE_PKGS.gmk
 
 NASHORNAPI_INDEX_HTML = $(NASHORNAPI_DOCDIR)/index.html
-NASHORNAPI_OPTIONS_FILE = $(DOCSTMPDIR)/treeapi.options
-NASHORNAPI_PACKAGES_FILE = $(DOCSTMPDIR)/treeapi.packages
+NASHORNAPI_OPTIONS_FILE = $(DOCSTMPDIR)/nashornapi.options
+NASHORNAPI_PACKAGES_FILE = $(DOCSTMPDIR)/nashornapi.packages
 
-treeapidocs: $(NASHORNAPI_INDEX_HTML)
+nashornapidocs: $(NASHORNAPI_INDEX_HTML)
 
 # Set relative location to core api document root
 $(NASHORNAPI_INDEX_HTML): GET2DOCSDIR=$(NASHORNAPI2COREAPI)/..