diff --git a/apache-jsp/src/main/java/org/eclipse/jetty/apache/jsp/JettyTldPreScanned.java b/apache-jsp/src/main/java/org/eclipse/jetty/apache/jsp/JettyTldPreScanned.java
index e4042909c3d..0dda9f1e2fe 100644
--- a/apache-jsp/src/main/java/org/eclipse/jetty/apache/jsp/JettyTldPreScanned.java
+++ b/apache-jsp/src/main/java/org/eclipse/jetty/apache/jsp/JettyTldPreScanned.java
@@ -45,13 +45,6 @@ public class JettyTldPreScanned extends TldPreScanned
 {
     private final Collection<URL> _jettyPreScannedURLs;
     
-    /**
-     * @param context
-     * @param namespaceAware
-     * @param validation
-     * @param blockExternal
-     * @param preScannedTlds
-     */
     public JettyTldPreScanned(ServletContext context, boolean namespaceAware, boolean validation, boolean blockExternal, Collection<URL> preScannedTlds)
     {
         super(context, namespaceAware, validation, blockExternal, preScannedTlds);
diff --git a/jetty-quickstart/src/main/java/org/eclipse/jetty/quickstart/QuickStartDescriptorGenerator.java b/jetty-quickstart/src/main/java/org/eclipse/jetty/quickstart/QuickStartDescriptorGenerator.java
index 458c6d50fb2..2b8091e5ffd 100644
--- a/jetty-quickstart/src/main/java/org/eclipse/jetty/quickstart/QuickStartDescriptorGenerator.java
+++ b/jetty-quickstart/src/main/java/org/eclipse/jetty/quickstart/QuickStartDescriptorGenerator.java
@@ -96,8 +96,10 @@ public class QuickStartDescriptorGenerator
     /**
      * @param w the source WebAppContext
      * @param extraXML any extra xml snippet to append
+     * @param originAttribute param value to use for the context param origin attribute
+     * @param generateOrigin <code>true</code> to generate the origin attribute
      */
-    public QuickStartDescriptorGenerator (WebAppContext w,  String extraXML, String originAttribute, boolean generateOrigin)
+    public QuickStartDescriptorGenerator (WebAppContext w, String extraXML, String originAttribute, boolean generateOrigin)
     {
         _webApp = w;
         _extraXML = extraXML;
diff --git a/jetty-websocket/javax-websocket-server-impl/src/main/java/org/eclipse/jetty/websocket/jsr356/server/ServerContainer.java b/jetty-websocket/javax-websocket-server-impl/src/main/java/org/eclipse/jetty/websocket/jsr356/server/ServerContainer.java
index dc7883b839a..f64bc3b02fa 100644
--- a/jetty-websocket/javax-websocket-server-impl/src/main/java/org/eclipse/jetty/websocket/jsr356/server/ServerContainer.java
+++ b/jetty-websocket/javax-websocket-server-impl/src/main/java/org/eclipse/jetty/websocket/jsr356/server/ServerContainer.java
@@ -80,13 +80,20 @@ public class ServerContainer extends ClientContainer implements javax.websocket.
     
     /**
      * @deprecated use {@code ServerContainer(NativeWebSocketConfiguration, HttpClient)} instead
+     * @param configuration the {@link NativeWebSocketConfiguration} to use
+     * @param executor not used
      */
     @Deprecated
     public ServerContainer(NativeWebSocketConfiguration configuration, Executor executor)
     {
         this(configuration, (HttpClient) null);
     }
-    
+
+    /**
+     *
+     * @param configuration the {@link NativeWebSocketConfiguration} to use
+     * @param httpClient the {@link HttpClient} instance to use
+     */
     public ServerContainer(NativeWebSocketConfiguration configuration, HttpClient httpClient)
     {
         super(configuration.getFactory(), httpClient);
diff --git a/jetty-websocket/javax-websocket-server-impl/src/main/java/org/eclipse/jetty/websocket/jsr356/server/deploy/WebSocketServerContainerInitializer.java b/jetty-websocket/javax-websocket-server-impl/src/main/java/org/eclipse/jetty/websocket/jsr356/server/deploy/WebSocketServerContainerInitializer.java
index 33632837621..c567952e037 100644
--- a/jetty-websocket/javax-websocket-server-impl/src/main/java/org/eclipse/jetty/websocket/jsr356/server/deploy/WebSocketServerContainerInitializer.java
+++ b/jetty-websocket/javax-websocket-server-impl/src/main/java/org/eclipse/jetty/websocket/jsr356/server/deploy/WebSocketServerContainerInitializer.java
@@ -132,6 +132,9 @@ public class WebSocketServerContainerInitializer implements ServletContainerInit
     
     /**
      * Embedded Jetty approach for non-bytecode scanning.
+     * @param context the {@link ServletContextHandler} to use
+     * @return a configured {@link ServerContainer} instance
+     * @throws ServletException if the {@link WebSocketUpgradeFilter} cannot be configured
      */
     public static ServerContainer configureContext(ServletContextHandler context) throws ServletException
     {
@@ -170,6 +173,10 @@ public class WebSocketServerContainerInitializer implements ServletContainerInit
     
     /**
      * @deprecated use {@link #configureContext(ServletContextHandler)} instead
+     * @param context not used
+     * @param jettyContext the {@link ServletContextHandler} to use
+     * @return a configured {@link ServerContainer} instance
+     * @throws ServletException if the {@link WebSocketUpgradeFilter} cannot be configured
      */
     @Deprecated
     public static ServerContainer configureContext(ServletContext context, ServletContextHandler jettyContext) throws ServletException