# HG changeset patch
# User mduigou
# Date 1366241925 25200
# Node ID 3077b8935df4194d1ac11e176b0a48ec63fa8afb
# Parent  b95c5c8ee60a7eadc8eb85408faffea1761c2685
8008632: Additional JavaDoc tags @apiNote, @implSpec and @implNote
Reviewed-by: briangoetz

diff --git a/common/makefiles/javadoc/Javadoc.gmk b/common/makefiles/javadoc/Javadoc.gmk
--- a/common/makefiles/javadoc/Javadoc.gmk
+++ b/common/makefiles/javadoc/Javadoc.gmk
@@ -390,6 +390,17 @@
 	  $(call OptionPair,-tag,specdefault:X)				; \
 	  $(call OptionPair,-tag,Note:X)				; \
 	  $(call OptionPair,-tag,ToDo:X)				; \
+          $(call OptionPair,-tag,apiNote:a:<em>API Note:</em>)  	; \
+          $(call OptionPair,-tag,implSpec:a:<em>Implementation Requirements:</em>); \
+          $(call OptionPair,-tag,implNote:a:<em>Implementation Note:</em>); \
+          $(call OptionPair,-tag,param)                                 ; \
+          $(call OptionPair,-tag,return)                                ; \
+          $(call OptionPair,-tag,throws)                                ; \
+          $(call OptionPair,-tag,since)                                 ; \
+          $(call OptionPair,-tag,version)                               ; \
+          $(call OptionPair,-tag,serialData)                            ; \
+          $(call OptionPair,-tag,factory)                               ; \
+          $(call OptionPair,-tag,see)                                   ; \
           $(call OptionPair,-tag,$(TAG_JLS)) 				; \
 	  $(call OptionOnly,-splitIndex)				; \
 	  $(call OptionPair,-overview,$(COREAPI_OVERVIEW))		; \