From 62b2c4716cf1ade3da20d728f3406f94a580953f Mon Sep 17 00:00:00 2001 From: Magnus Ihse Bursie Date: Tue, 16 May 2017 14:14:26 +0200 Subject: [PATCH] 8180328: Bad links in footer of all javadoc-generated pages Reviewed-by: erikj --- make/Docs.gmk | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/make/Docs.gmk b/make/Docs.gmk index 2859070391d..f95a57d376f 100644 --- a/make/Docs.gmk +++ b/make/Docs.gmk @@ -48,11 +48,8 @@ $(eval $(call IncludeCustomExtension, , Docs.gmk)) MODULES_SOURCE_PATH := $(call PathList, $(call GetModuleSrcPath) \ $(SUPPORT_OUTPUTDIR)/rmic/* $(JDK_TOPDIR)/src/*/share/doc/stub) -# Should we use -Xdocrootparent? Allow custom to overwrite. -DOCROOTPARENT_FLAG ?= TRUE - # URLs -JAVADOC_BASE_URL := http://www.oracle.com/pls/topic/lookup?ctx=javase9&id=homepage +JAVADOC_BASE_URL := http://www.oracle.com/pls/topic/lookup?ctx=javase9&id=homepage BUG_SUBMIT_URL := http://bugreport.java.com/bugreport/ COPYRIGHT_URL := {@docroot}/../legal/cpyr.html LICENSE_URL := http://www.oracle.com/technetwork/java/javase/terms/license/java9speclicense.html @@ -130,7 +127,7 @@ JAVADOC_BOTTOM := \ \ Submit a bug or feature
\ For further API reference and developer documentation, see \ - Java SE \ + Java SE \ Documentation. That documentation contains more detailed, \ developer-targeted descriptions, with conceptual overviews, definitions \ of terms, workarounds, and working code examples.
\ @@ -236,10 +233,6 @@ define SetupApiDocsGenerationBody $1_OPTIONS += -Xdoclint:all,$$(call CommaList, $$(addprefix -, \ $$(JAVADOC_DISABLED_DOCLINT))) - ifeq ($$($$DOCROOTPARENT_FLAG), TRUE) - $1_OPTIONS += -Xdocrootparent $$(JAVADOC_BASE_URL) - endif - $1_OPTIONS += -doctitle '$$($1_DOC_TITLE)' $1_OPTIONS += -windowtitle '$$($1_WINDOW_TITLE)' $1_OPTIONS += -header '$$($1_HEADER_TITLE)'