diff --git a/library/server/wsf/router/documentation/wsf_self_documented_handler.e b/library/server/wsf/router/documentation/wsf_self_documented_handler.e
index 84608a0d..453ee958 100644
--- a/library/server/wsf/router/documentation/wsf_self_documented_handler.e
+++ b/library/server/wsf/router/documentation/wsf_self_documented_handler.e
@@ -10,6 +10,8 @@ deferred class
 feature -- Documentation
 
 	mapping_documentation (m: WSF_ROUTER_MAPPING; a_request_methods: detachable WSF_REQUEST_METHODS): WSF_ROUTER_MAPPING_DOCUMENTATION
+			-- Documentation associated with Current handler, in the context of the mapping `m' and methods `a_request_methods'.
+			--| `m' and `a_request_methods' are useful to produce specific documentation when the handler is used for multiple mapping.
 		deferred
 		end
 
diff --git a/library/server/wsf/router/documentation/wsf_self_documented_router_mapping.e b/library/server/wsf/router/documentation/wsf_self_documented_router_mapping.e
index 49a8f5ca..a696b807 100644
--- a/library/server/wsf/router/documentation/wsf_self_documented_router_mapping.e
+++ b/library/server/wsf/router/documentation/wsf_self_documented_router_mapping.e
@@ -13,6 +13,9 @@ inherit
 feature -- Documentation
 
 	documentation (a_request_methods: detachable WSF_REQUEST_METHODS): WSF_ROUTER_MAPPING_DOCUMENTATION
+			-- Documentation associated with Current mapping, with methods `a_request_methods'.
+			--| If the associated handler is a WSF_SELF_DOCUMENTED_HANDLER , then the handler will also
+			--| Self described itself in the context of Current mapping and `a_request_methods'
 		do
 			if attached {WSF_SELF_DOCUMENTED_HANDLER} handler as obj then
 				Result := obj.mapping_documentation (Current, a_request_methods)