Merge branch '1.5.x'

spring-boot-docs/src/main/asciidoc/spring-boot-features.adoc

@@ -229,7 +229,7 @@ key.
 
 Application events are sent in the following order, as your application runs:
 
-. An `ApplicationStartedEvent` is sent at the start of a run, but before any
+. An `ApplicationStartingEvent` is sent at the start of a run, but before any
   processing except the registration of listeners and initializers.
 . An `ApplicationEnvironmentPreparedEvent` is sent when the `Environment` to be used in
   the context is known, but before the context is created.

spring-boot/src/main/java/org/springframework/boot/system/ApplicationPidFileWriter.java

@@ -121,7 +121,7 @@ public class ApplicationPidFileWriter
 	/**
 	 * Sets the type of application event that will trigger writing of the PID file.
 	 * Defaults to {@link ApplicationPreparedEvent}. NOTE: If you use the
-	 * {@link org.springframework.boot.context.event.ApplicationStartedEvent} to trigger
+	 * {@link org.springframework.boot.context.event.ApplicationStartingEvent} to trigger
 	 * the write, you will not be able to specify the PID filename in the Spring
 	 * {@link Environment}.
 	 * @param triggerEventType the trigger event type