Merge pull request #11324 from xuwei-k/typo

core/play/src/main/java/play/ApplicationLoader.java

@@ -51,7 +51,7 @@ public Application load(Context context) {
   /**
    * Load an application given the context.
    *
-   * @param context the context the apps hould be loaded into
+   * @param context the context the apps should be loaded into
    * @return the loaded application
    */
   Application load(ApplicationLoader.Context context);

core/play/src/main/java/play/core/j/MappedJavaHandlerComponents.java

@@ -29,7 +29,7 @@ public class MappedJavaHandlerComponents implements JavaHandlerComponents {
   private final JavaContextComponents contextComponents;
 
   private final Map<Class<? extends Action<?>>, Supplier<Action<?>>> actions = new HashMap<>();
-  private final Map<Class<? extends BodyParser<?>>, Supplier<BodyParser<?>>> bodyPasers =
+  private final Map<Class<? extends BodyParser<?>>, Supplier<BodyParser<?>>> bodyParsers =
       new HashMap<>();
 
   public MappedJavaHandlerComponents(
@@ -55,7 +55,7 @@ public MappedJavaHandlerComponents(
   @Override
   @SuppressWarnings("unchecked")
   public <A extends BodyParser<?>> A getBodyParser(Class<A> parserClass) {
-    return (A) this.bodyPasers.get(parserClass).get();
+    return (A) this.bodyParsers.get(parserClass).get();
   }
 
   @Override
@@ -93,7 +93,7 @@ public <A extends Action<?>> MappedJavaHandlerComponents addAction(
 
   public <B extends BodyParser<?>> MappedJavaHandlerComponents addBodyParser(
       Class<B> clazz, Supplier<B> bodyParserSupplier) {
-    bodyPasers.put(clazz, widenSupplier(bodyParserSupplier));
+    bodyParsers.put(clazz, widenSupplier(bodyParserSupplier));
     return this;
   }
 

core/play/src/main/java/play/i18n/Lang.java

@@ -83,7 +83,7 @@ public static List<Lang> availables(Application app) {
    * Guess the preferred lang in the langs set passed as argument. The first Lang that matches an
    * available Lang wins, otherwise returns the first Lang available in this application.
    *
-   * @param app the currept application
+   * @param app the current application
    * @param availableLangs the set of langs from which to guess the preferred
    * @return the preferred lang.
    */

core/play/src/main/java/play/mvc/Http.java

@@ -1602,7 +1602,7 @@ public JsonNode asJson() {
      * [[Json.fromJson(JsonNode,Class)]].
      *
      * <p>Will return Optional.empty() if the request body is not an instance of JsonNode. If the
-     * JsonNode simply has missing fields, a valid reference with null fields is returne.
+     * JsonNode simply has missing fields, a valid reference with null fields is return.
      *
      * @param <A> The type to convert the JSON value to.
      * @param clazz The class to convert the JSON value to.

core/play/src/main/scala/play/api/mvc/RequestHeader.scala

@@ -20,7 +20,7 @@ import play.api.mvc.request._
 import scala.annotation.implicitNotFound
 
 /**
- * The HTTP request header. Note that it doesn’t contain the request body yet.
+ * The HTTP request header. Note that it doesn't contain the request body yet.
  */
 @implicitNotFound("Cannot find any HTTP Request Header here")
 trait RequestHeader {

documentation/manual/working/javaGuide/main/async/JavaWebSockets.md

@@ -76,7 +76,7 @@ Now you can use it like so.
 
 @[streams1](code/javaguide/async/JavaWebSockets.java)
 
-A `WebSocket` has access to the request headers (from the HTTP request that initiates the WebSocket connection), allowing you to retrieve standard headers and session data. However, it doesn’t have access to a request body, nor to the HTTP response.
+A `WebSocket` has access to the request headers (from the HTTP request that initiates the WebSocket connection), allowing you to retrieve standard headers and session data. However, it doesn't have access to a request body, nor to the HTTP response.
 
 It this example we are creating a simple sink that prints each message to console. To send messages, we create a simple source that will send a single **Hello!** message.  We also need to concatenate a source that will never send anything, otherwise our single source will terminate the flow, and thus the connection.
 

documentation/manual/working/scalaGuide/main/async/ScalaStream.md

@@ -72,7 +72,7 @@ For this kind of response we have to use **Chunked transfer encoding**.
 >
 > <https://en.wikipedia.org/wiki/Chunked_transfer_encoding>
 
-The advantage is that we can serve the data **live**, meaning that we send chunks of data as soon as they are available. The drawback is that since the web browser doesn’t know the content size, it is not able to display a proper download progress bar.
+The advantage is that we can serve the data **live**, meaning that we send chunks of data as soon as they are available. The drawback is that since the web browser doesn't know the content size, it is not able to display a proper download progress bar.
 
 Let’s say that we have a service somewhere that provides a dynamic `InputStream` computing some data. First we have to create an `Source` for this stream:
 

documentation/manual/working/scalaGuide/main/async/ScalaWebSockets.md

@@ -88,7 +88,7 @@ Actors are not always the right abstraction for handling WebSockets, particularl
 
 @[streams1](code/ScalaWebSockets.scala)
 
-A `WebSocket` has access to the request headers (from the HTTP request that initiates the WebSocket connection), allowing you to retrieve standard headers and session data. However, it doesn’t have access to a request body, nor to the HTTP response.
+A `WebSocket` has access to the request headers (from the HTTP request that initiates the WebSocket connection), allowing you to retrieve standard headers and session data. However, it doesn't have access to a request body, nor to the HTTP response.
 
 In this example we are creating a simple sink that prints each message to console. To send messages, we create a simple source that will send a single **Hello!** message.  We also need to concatenate a source that will never send anything, otherwise our single source will terminate the flow, and thus the connection.
 

documentation/manual/working/scalaGuide/main/ws/ScalaOpenID.md

@@ -46,7 +46,7 @@ Here is an example of usage (from a controller):
 
 The OpenID of a user gives you his identity. The protocol also supports getting [extended attributes](https://openid.net/specs/openid-attribute-exchange-1_0.html) such as the e-mail address, the first name, or the last name.
 
-You may request *optional* attributes and/or *required* attributes from the OpenID server. Asking for required attributes means the user cannot login to your service if he doesn’t provides them.
+You may request *optional* attributes and/or *required* attributes from the OpenID server. Asking for required attributes means the user cannot login to your service if he doesn't provides them.
 
 Extended attributes are requested in the redirect URL: