diff --git a/spring-messaging/src/main/java/org/springframework/messaging/rsocket/service/RSocketExchange.java b/spring-messaging/src/main/java/org/springframework/messaging/rsocket/service/RSocketExchange.java
index 115d7bd294..4f86c51775 100644
--- a/spring-messaging/src/main/java/org/springframework/messaging/rsocket/service/RSocketExchange.java
+++ b/spring-messaging/src/main/java/org/springframework/messaging/rsocket/service/RSocketExchange.java
@@ -24,11 +24,11 @@ import java.lang.annotation.Target;
 
 /**
  * Annotation to declare a method on an RSocket service interface as an RSocket
- * endpoint. The endpoint route is defined statically through the annotation
- * attributes, and through the input method argument types.
+ * endpoint. The endpoint route is determined through the annotation attribute,
+ * and through the method arguments.
  *
- * <p>Supported at the type level to express common attributes, to be inherited
- * by all methods, such as a base route.
+ * <p>The annotation is supported at the type level to express a common route,
+ * to be inherited by all methods.
  *
  * <p>Supported method arguments:
  * <table border="1">
@@ -48,13 +48,13 @@ import java.lang.annotation.Target;
  * <td>{@link PayloadArgumentResolver}</td>
  * </tr>
  * <tr>
- * <td>{@link Object} argument followed by {@link org.springframework.util.MimeType} argument</td>
+ * <td>{@link Object}, if followed by {@link org.springframework.util.MimeType}</td>
  * <td>Add a metadata value</td>
  * <td>{@link MetadataArgumentResolver}</td>
  * </tr>
  * <tr>
- * <td>{@link org.springframework.util.MimeType} argument preceded by {@link Object} argument</td>
- * <td>Specify the mime type for the preceding metadata value</td>
+ * <td>{@link org.springframework.util.MimeType}</td>
+ * <td>Set the MIME type for the metadata value in the preceding argument</td>
  * <td>{@link MetadataArgumentResolver}</td>
  * </tr>
  * </table>
@@ -71,8 +71,9 @@ public @interface RSocketExchange {
 	 * Destination-based mapping expressed by this annotation. This is either
 	 * {@link org.springframework.util.AntPathMatcher AntPathMatcher} or
 	 * {@link org.springframework.web.util.pattern.PathPattern PathPattern}
-	 * based pattern, depending on which is configured, matched to the route of
-	 * the stream request.
+	 * based pattern, depending on which is configured via
+	 * {@link org.springframework.messaging.rsocket.RSocketStrategies} in
+	 * {@link org.springframework.messaging.rsocket.RSocketRequester}.
 	 */
 	String value() default "";
 
diff --git a/src/docs/asciidoc/rsocket.adoc b/src/docs/asciidoc/rsocket.adoc
index 25ead33294..51a080255a 100644
--- a/src/docs/asciidoc/rsocket.adoc
+++ b/src/docs/asciidoc/rsocket.adoc
@@ -964,7 +964,7 @@ method parameters:
 
 | `Object`, if followed by `MimeType`
 | The value for a metadata entry in the input payload. This can be any `Object` as long
-  as the next argument is the metadata entry `MimeType`. The value can be can a concrete
+  as the next argument is the metadata entry `MimeType`. The value can be a concrete
   value or any producer of a single value that can be adapted to a Reactive Streams
   `Publisher` via `ReactiveAdapterRegistry`.
 
@@ -981,5 +981,3 @@ method parameters:
 Annotated, RSocket exchange methods support return values that are concrete value(s), or
 any producer of value(s) that can be adapted to a Reactive Streams `Publisher` via
 `ReactiveAdapterRegistry`.
-
-