--- a/make/Docs.gmk	Mon Nov 26 14:18:22 2018 +0100
+++ b/make/Docs.gmk	Mon Nov 26 14:18:32 2018 +0100
@@ -28,7 +28,6 @@
 include MakeBase.gmk
 include Modules.gmk
 include ProcessMarkdown.gmk
-include TextFileProcessing.gmk
 include ZipArchive.gmk
 include $(TOPDIR)/make/ToolsJdk.gmk
 include $(TOPDIR)/make/ModuleTools.gmk
@@ -543,7 +542,7 @@
     $(eval SPECS_$m := $(call FindModuleSpecsDirs, $m)) \
     $(foreach d, $(SPECS_$m), \
       $(if $(filter %.md, $(call CacheFind, $d)), \
-        $(eval $m_$d_NAME := CONVERT_MARKDOWN_$m_$(strip $(call RelativePath, $d, $(TOPDIR)))) \
+        $(eval $m_$d_NAME := SPEC_TO_HTML_$m_$(strip $(call RelativePath, $d, $(TOPDIR)))) \
         $(eval $(call SetupProcessMarkdown, $($m_$d_NAME), \
             SRC := $d, \
             FILES := $(filter %.md, $(call CacheFind, $d)), \
@@ -555,7 +554,8 @@
     ) \
   )
 
-  # Generate html pages ("man spec") from markdown
+  # For all markdown files in $module/share/man directories, convert them to
+  # html.
   $(foreach m, $(ALL_MODULES), \
     $(eval MAN_$m := $(call FindModuleManDirs, $m)) \
     $(foreach d, $(MAN_$m), \
@@ -568,14 +568,13 @@
             CSS := $(GLOBAL_SPECS_DEFAULT_CSS_FILE), \
             REPLACEMENTS := @@VERSION_SHORT@@ => $(VERSION_SHORT), \
         )) \
-        $(eval MAN_PAGE_TARGETS += $($($m_$d_NAME))) \
+        $(eval JDK_SPECS_TARGETS += $($($m_$d_NAME))) \
       ) \
     ) \
   )
 
-  # The html version also needs the css file
-  MAN_PAGE_TARGETS += $(COPY_GLOBAL_RESOURCES)
-  JDK_SPECS_TARGETS += $(MAN_PAGE_TARGETS)
+  # The html generated from markdown also needs the css file
+  JDK_SPECS_TARGETS += $(COPY_GLOBAL_RESOURCES)
 endif
 
 # Special treatment for generated documentation
@@ -628,8 +627,6 @@
 
 docs-jdk-index: $(JDK_INDEX_TARGETS)
 
-man-pages: $(MAN_PAGE_TARGETS)
-
 docs-zip: $(ZIP_TARGETS)
 
 all: docs-jdk-api-javadoc docs-jdk-api-modulegraph docs-javase-api-javadoc \

--- a/make/Main.gmk	Mon Nov 26 14:18:22 2018 +0100
+++ b/make/Main.gmk	Mon Nov 26 14:18:32 2018 +0100
@@ -405,9 +405,6 @@
 docs-jdk-index:
 	+($(CD) $(TOPDIR)/make && $(MAKE) $(MAKE_ARGS) -f Docs.gmk docs-jdk-index)
 
-docs-man-pages:
-	+($(CD) $(TOPDIR)/make && $(MAKE) $(MAKE_ARGS) -f Docs.gmk man-pages)
-
 docs-zip:
 	+($(CD) $(TOPDIR)/make && $(MAKE) $(MAKE_ARGS) -f Docs.gmk docs-zip)
 
@@ -420,7 +417,7 @@
 ALL_TARGETS += docs-jdk-api-javadoc docs-jdk-api-modulegraph \
     docs-javase-api-javadoc docs-javase-api-modulegraph \
     docs-reference-api-javadoc docs-reference-api-modulegraph docs-jdk-specs \
-    docs-jdk-index docs-man-pages docs-zip update-build-docs update-x11wrappers
+    docs-jdk-index docs-zip update-build-docs update-x11wrappers
 
 ################################################################################
 # Cross compilation support