diff --git a/library/server/wsf/router/support/starts_with/wsf_starts_with_mapping_i.e b/library/server/wsf/router/support/starts_with/wsf_starts_with_mapping_i.e
index 63774e5f..ac09d22c 100644
--- a/library/server/wsf/router/support/starts_with/wsf_starts_with_mapping_i.e
+++ b/library/server/wsf/router/support/starts_with/wsf_starts_with_mapping_i.e
@@ -59,7 +59,7 @@ feature -- Status
 		end
 
 	try (req: WSF_REQUEST; res: WSF_RESPONSE; sess: WSF_ROUTER_SESSION; a_router: WSF_ROUTER)
-			-- Return the handler if Current matches the request `req'.
+			-- <Precursor>
 		local
 			p: READABLE_STRING_8
 			s: like based_uri
diff --git a/library/server/wsf/router/support/uri/wsf_uri_mapping_i.e b/library/server/wsf/router/support/uri/wsf_uri_mapping_i.e
index aa69a860..7301fb3d 100644
--- a/library/server/wsf/router/support/uri/wsf_uri_mapping_i.e
+++ b/library/server/wsf/router/support/uri/wsf_uri_mapping_i.e
@@ -73,6 +73,7 @@ feature -- Status
 		end
 
 	try (req: WSF_REQUEST; res: WSF_RESPONSE; sess: WSF_ROUTER_SESSION; a_router: WSF_ROUTER)
+			-- <Precursor>
 		do
 			if is_mapping (req, a_router) then
 				sess.set_dispatched_handler (handler)
diff --git a/library/server/wsf/router/wsf_router_mapping.e b/library/server/wsf/router/wsf_router_mapping.e
index 6f7b4605..475818ca 100644
--- a/library/server/wsf/router/wsf_router_mapping.e
+++ b/library/server/wsf/router/wsf_router_mapping.e
@@ -24,14 +24,14 @@ feature {NONE} -- Initialization
 feature -- Access
 
 	associated_resource: READABLE_STRING_8
-			-- Name (URI, or URI template or regular expression or ...) of handled resource.
+			-- Name (URI, or URI template or regular expression or ...) of handled resource
 		deferred
 		ensure
 			assciated_resource_not_void: Result /= Void
 		end
 
 	handler: WSF_HANDLER
-			-- Handler associated with `Current' mapping.
+			-- Handler associated with `Current' mapping
 		deferred
 		ensure
 			handler_attached: Result /= Void
@@ -40,7 +40,7 @@ feature -- Access
 feature -- Documentation
 
 	description: READABLE_STRING_32
-			-- Short description of associated mapping.
+			-- Short description of associated mapping
 		deferred
 		ensure
 			description_attached: Result /= Void
@@ -78,7 +78,7 @@ feature -- Status
 feature -- Helper
 
 	path_from_request (req: WSF_REQUEST): READABLE_STRING_32
-			-- Path used by `Current' to check that mapping matches request `req'.
+			-- Path used by `Current' to check that mapping matches request `req'
 		require
 			req_attached: req /= Void
 		do