Merge branch 'jetty-9.4.x' into jetty-10.0.x

2018-08-07 21:47:02 -04:00 · 2018-08-07 21:47:02 -04:00 · ab3f4832ad
parent b249021b6d e485b8d78d
commit ab3f4832ad
1 changed files with 1 additions and 1 deletions
--- a/jetty-websocket/websocket-api/src/main/java/org/eclipse/jetty/websocket/api/WebSocketPolicy.java
+++ b/jetty-websocket/websocket-api/src/main/java/org/eclipse/jetty/websocket/api/WebSocketPolicy.java
@ -204,7 +204,7 @@ public class WebSocketPolicy
    }

    /**
-     * The time in ms (milliseconds) that a websocket connection may by idle before being closed automatically.
+     * The time in ms (milliseconds) that a websocket connection may be idle before being closed automatically.
     * 
     * @return the timeout in milliseconds for idle timeout.
     */