From 0d6667dc9f434b59b67772c4adda13b97553d9a4 Mon Sep 17 00:00:00 2001
From: Jan Bartel <janb@webtide.com>
Date: Fri, 2 Sep 2016 13:50:25 +1000
Subject: [PATCH] Issue #894

---
 .../eclipse/jetty/servlet/ServletContextHandler.java   | 10 +++++-----
 .../java/org/eclipse/jetty/servlet/ServletHandler.java |  4 ++--
 .../jetty/util/component/ContainerLifeCycle.java       |  2 +-
 .../org/eclipse/jetty/util/security/Constraint.java    |  2 +-
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/jetty-servlet/src/main/java/org/eclipse/jetty/servlet/ServletContextHandler.java b/jetty-servlet/src/main/java/org/eclipse/jetty/servlet/ServletContextHandler.java
index 013ab5c87fb..92b9f41d288 100644
--- a/jetty-servlet/src/main/java/org/eclipse/jetty/servlet/ServletContextHandler.java
+++ b/jetty-servlet/src/main/java/org/eclipse/jetty/servlet/ServletContextHandler.java
@@ -336,7 +336,7 @@ public class ServletContextHandler extends ContextHandler
     }
 
     /* ------------------------------------------------------------ */
-    /** conveniance method to add a servlet.
+    /** convenience method to add a servlet.
      */
     public ServletHolder addServlet(String className,String pathSpec)
     {
@@ -344,15 +344,15 @@ public class ServletContextHandler extends ContextHandler
     }
 
     /* ------------------------------------------------------------ */
-    /** conveniance method to add a servlet.
+    /** convenience method to add a servlet.
      */
     public ServletHolder addServlet(Class<? extends Servlet> servlet,String pathSpec)
     {
-        return getServletHandler().addServletWithMapping(servlet.getName(), pathSpec);
+        return getServletHandler().addServletWithMapping(servlet, pathSpec);
     }
 
     /* ------------------------------------------------------------ */
-    /** conveniance method to add a servlet.
+    /** convenience method to add a servlet.
      */
     public void addServlet(ServletHolder servlet,String pathSpec)
     {
@@ -360,7 +360,7 @@ public class ServletContextHandler extends ContextHandler
     }
 
     /* ------------------------------------------------------------ */
-    /** conveniance method to add a filter
+    /** convenience method to add a filter
      */
     public void addFilter(FilterHolder holder,String pathSpec,EnumSet<DispatcherType> dispatches)
     {
diff --git a/jetty-servlet/src/main/java/org/eclipse/jetty/servlet/ServletHandler.java b/jetty-servlet/src/main/java/org/eclipse/jetty/servlet/ServletHandler.java
index d5b2add1779..1d6c5dfce08 100644
--- a/jetty-servlet/src/main/java/org/eclipse/jetty/servlet/ServletHandler.java
+++ b/jetty-servlet/src/main/java/org/eclipse/jetty/servlet/ServletHandler.java
@@ -963,7 +963,7 @@ public class ServletHandler extends ScopedHandler
     }
 
     /* ------------------------------------------------------------ */
-    /** conveniance method to add a servlet.
+    /** convenience method to add a servlet.
      * @return The servlet holder.
      */
     public ServletHolder addServletWithMapping (Class<? extends Servlet> servlet,String pathSpec)
@@ -976,7 +976,7 @@ public class ServletHandler extends ScopedHandler
     }
 
     /* ------------------------------------------------------------ */
-    /** conveniance method to add a servlet.
+    /** convenience method to add a servlet.
      * @param servlet servlet holder to add
      * @param pathSpec servlet mappings for the servletHolder
      */
diff --git a/jetty-util/src/main/java/org/eclipse/jetty/util/component/ContainerLifeCycle.java b/jetty-util/src/main/java/org/eclipse/jetty/util/component/ContainerLifeCycle.java
index 4756bc12a09..01711e31e1a 100644
--- a/jetty-util/src/main/java/org/eclipse/jetty/util/component/ContainerLifeCycle.java
+++ b/jetty-util/src/main/java/org/eclipse/jetty/util/component/ContainerLifeCycle.java
@@ -329,7 +329,7 @@ public class ContainerLifeCycle extends AbstractLifeCycle implements Container,
     
     /* ------------------------------------------------------------ */
     /** Add a managed lifecycle.
-     * <p>This is a conveniance method that uses addBean(lifecycle,true)
+     * <p>This is a convenience method that uses addBean(lifecycle,true)
      * and then ensures that the added bean is started iff this container
      * is running.  Exception from nested calls to start are caught and 
      * wrapped as RuntimeExceptions
diff --git a/jetty-util/src/main/java/org/eclipse/jetty/util/security/Constraint.java b/jetty-util/src/main/java/org/eclipse/jetty/util/security/Constraint.java
index daf343335cc..5dc45d4b4a6 100644
--- a/jetty-util/src/main/java/org/eclipse/jetty/util/security/Constraint.java
+++ b/jetty-util/src/main/java/org/eclipse/jetty/util/security/Constraint.java
@@ -93,7 +93,7 @@ public class Constraint implements Cloneable, Serializable
 
     /* ------------------------------------------------------------ */
     /**
-     * Conveniance Constructor.
+     * convenience Constructor.
      * 
      * @param name
      * @param role