changeset 2823:ff0a3ced95bb

Merge
author prr
date Mon, 07 Aug 2017 09:45:59 -0700
parents 6ffac2137a73 b803e6cff41e
children 06a8738dc385
files
diffstat 2 files changed, 5 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/.hgtags	Thu Jul 27 12:36:49 2017 -0700
+++ b/.hgtags	Mon Aug 07 09:45:59 2017 -0700
@@ -439,3 +439,5 @@
 2fe66ca1e2b3c361f949de9cb2894661dc0a3fa2 jdk-10+16
 ec4159ebe7050fcc5dcee8a2d150cf948ecc97db jdk-9+178
 252475ccfd84cc249f8d6faf4b7806b5e2c384ce jdk-9+179
+a133a7d1007b1456bc62824382fd8ac93b45d329 jdk-10+17
+536b81db8075486ca0fe3225d8e59313df5b936c jdk-10+18
--- a/make/Docs.gmk	Thu Jul 27 12:36:49 2017 -0700
+++ b/make/Docs.gmk	Mon Aug 07 09:45:59 2017 -0700
@@ -101,9 +101,9 @@
 JAVADOC_DISABLED_DOCLINT := accessibility html missing syntax reference
 
 # The initial set of options for javadoc
-JAVADOC_OPTIONS := -XDignore.symbol.file=true -use -keywords -notimestamp \
-    -serialwarn -encoding ISO-8859-1 -breakiterator -splitIndex --system none \
-    -html5 -javafx --expand-requires transitive
+JAVADOC_OPTIONS := -use -keywords -notimestamp \
+    -serialwarn -encoding ISO-8859-1 -docencoding UTF-8 -breakiterator \
+    -splitIndex --system none -html5 -javafx --expand-requires transitive
 
 # Should we add DRAFT stamps to the generated javadoc?
 ifeq ($(VERSION_IS_GA), true)