changeset 46098:46f8a2a8ccfb

Merge
author duke
date Thu, 24 Aug 2017 16:34:23 +0200
parents 22316369c9b0 bf1ceea5d97a
children 39106800b006
files
diffstat 3 files changed, 5 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/.hgtags-top-repo	Mon Aug 07 14:14:03 2017 -0400
+++ b/.hgtags-top-repo	Thu Aug 24 16:34:23 2017 +0200
@@ -440,3 +440,4 @@
 ec4159ebe7050fcc5dcee8a2d150cf948ecc97db jdk-9+178
 252475ccfd84cc249f8d6faf4b7806b5e2c384ce jdk-9+179
 a133a7d1007b1456bc62824382fd8ac93b45d329 jdk-10+17
+536b81db8075486ca0fe3225d8e59313df5b936c jdk-10+18
--- a/hotspot/.hgtags	Mon Aug 07 14:14:03 2017 -0400
+++ b/hotspot/.hgtags	Thu Aug 24 16:34:23 2017 +0200
@@ -600,3 +600,4 @@
 9d032191f82fca5ba0aac98682f69c4ff0f1283d jdk-9+178
 d2661aa42bff322badbe6c1337fc638d2e0f5730 jdk-9+179
 73e2cb8700bfa51304bd4b02f224620859a3f600 jdk-10+17
+c9d3317623d48da3327232c81e3f8cfc0d29d888 jdk-10+18
--- a/make/Docs.gmk	Mon Aug 07 14:14:03 2017 -0400
+++ b/make/Docs.gmk	Thu Aug 24 16:34:23 2017 +0200
@@ -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)