Mercurial Mercurial > jdk-sandbox / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
authorduke
Thu, 24 Aug 2017 16:34:17 +0200
changeset 46090 bf1ceea5d97a
parent 46089 195433227a40 (current diff)
parent 46088 d75472163401 (diff)
child 46098 46f8a2a8ccfb
Merge
--- a/.hgtags-top-repo	Fri Aug 04 23:29:05 2017 +0000
+++ b/.hgtags-top-repo	Thu Aug 24 16:34:17 2017 +0200
@@ -440,3 +440,4 @@
 ec4159ebe7050fcc5dcee8a2d150cf948ecc97db jdk-9+178
 252475ccfd84cc249f8d6faf4b7806b5e2c384ce jdk-9+179
 a133a7d1007b1456bc62824382fd8ac93b45d329 jdk-10+17
+536b81db8075486ca0fe3225d8e59313df5b936c jdk-10+18
--- a/make/Docs.gmk	Fri Aug 04 23:29:05 2017 +0000
+++ b/make/Docs.gmk	Thu Aug 24 16:34:17 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)
jdk-sandbox