Merge branch '2.0.x'

spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/annotation/DiscoveredEndpoint.java

@@ -20,7 +20,7 @@ import org.springframework.boot.actuate.endpoint.ExposableEndpoint;
 import org.springframework.boot.actuate.endpoint.Operation;
 
 /**
- * An {@link ExposableEndpoint endpoint} discovered by a {@link EndpointDiscoverer}.
+ * An {@link ExposableEndpoint endpoint} discovered by an {@link EndpointDiscoverer}.
  *
  * @param <O> The operation type
  * @author Phillip Webb

spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/annotation/DiscoveredOperationMethod.java

@@ -27,7 +27,7 @@ import org.springframework.core.annotation.AnnotationAttributes;
 import org.springframework.util.Assert;
 
 /**
- * A {@link OperationMethod} discovered by a {@link EndpointDiscoverer}.
+ * An {@link OperationMethod} discovered by an {@link EndpointDiscoverer}.
  *
  * @author Phillip Webb
  * @since 2.0.0

spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/annotation/EndpointDiscoverer.java

@@ -354,7 +354,7 @@ public abstract class EndpointDiscoverer<E extends ExposableEndpoint<O>, O exten
 			DiscoveredOperationMethod operationMethod, OperationInvoker invoker);
 
 	/**
-	 * Create a {@link OperationKey} for the given operation.
+	 * Create an {@link OperationKey} for the given operation.
 	 * @param operation the source operation
 	 * @return the operation key
 	 */

spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/jmx/MBeanInfoFactory.java

@@ -30,7 +30,7 @@ import javax.management.modelmbean.ModelMBeanOperationInfo;
 import org.springframework.boot.actuate.endpoint.OperationType;
 
 /**
- * Factory to create {@link MBeanInfo} from a {@link ExposableJmxEndpoint}.
+ * Factory to create {@link MBeanInfo} from an {@link ExposableJmxEndpoint}.
  *
  * @author Stephane Nicoll
  * @author Phillip Webb