diff --git a/querydsl-core/src/main/java/com/querydsl/core/QueryMetadata.java b/querydsl-core/src/main/java/com/querydsl/core/QueryMetadata.java
index 63867986e..3d952bfe7 100644
--- a/querydsl-core/src/main/java/com/querydsl/core/QueryMetadata.java
+++ b/querydsl-core/src/main/java/com/querydsl/core/QueryMetadata.java
@@ -147,7 +147,7 @@ public interface QueryMetadata extends Serializable {
     /**
      * Get the parameter bindings
      *
-     * @return parameteter bindings
+     * @return parameter bindings
      */
     Map<ParamExpression<?>,Object> getParams();
 
@@ -187,7 +187,7 @@ public interface QueryMetadata extends Serializable {
     void setDistinct(boolean distinct);
 
     /**
-     * Set the maxmium amount of rows
+     * Set the maximum number of rows
      *
      * @param limit limit
      */
@@ -201,7 +201,7 @@ public interface QueryMetadata extends Serializable {
     void setModifiers(QueryModifiers restriction);
 
     /**
-     * Set the amount of skipped rows
+     * Set the number of skipped rows
      *
      * @param offset offset
      */
diff --git a/querydsl-core/src/main/java/com/querydsl/core/alias/Alias.java b/querydsl-core/src/main/java/com/querydsl/core/alias/Alias.java
index f8e3ba3b9..798bd5da6 100644
--- a/querydsl-core/src/main/java/com/querydsl/core/alias/Alias.java
+++ b/querydsl-core/src/main/java/com/querydsl/core/alias/Alias.java
@@ -36,7 +36,7 @@ import com.querydsl.core.types.dsl.*;
  * <p>Example:</p>
  *
  * <pre>{@code
- * Empoyee e = alias(Employee.class, "e");
+ * Employee e = alias(Employee.class, "e");
  * for (String name : query.from($(e),employees)
  *     .where($(e.getDepartment().getId()).eq(1001))
  *     .list($(e.getName()))) {
@@ -422,7 +422,7 @@ public final class Alias {
     }
 
     /**
-     * Create a new varibale path
+     * Create a new variable path
      *
      * @param arg alias
      * @param <D>
diff --git a/querydsl-core/src/main/java/com/querydsl/core/alias/AliasFactory.java b/querydsl-core/src/main/java/com/querydsl/core/alias/AliasFactory.java
index 3160e7016..75f9d7ce3 100644
--- a/querydsl-core/src/main/java/com/querydsl/core/alias/AliasFactory.java
+++ b/querydsl-core/src/main/java/com/querydsl/core/alias/AliasFactory.java
@@ -102,7 +102,7 @@ class AliasFactory {
      *
      * @param <A>
      * @param cl type for alias
-     * @param var variable name for the underyling expression
+     * @param var variable name for the underlying expression
      * @return alias instance
      */
     @SuppressWarnings("unchecked")
diff --git a/querydsl-core/src/main/java/com/querydsl/core/alias/MethodType.java b/querydsl-core/src/main/java/com/querydsl/core/alias/MethodType.java
index f123c77e3..b0e8ee29d 100644
--- a/querydsl-core/src/main/java/com/querydsl/core/alias/MethodType.java
+++ b/querydsl-core/src/main/java/com/querydsl/core/alias/MethodType.java
@@ -59,7 +59,7 @@ public enum MethodType {
      */
     TO_STRING("toString",String.class, Object.class),
     /**
-     * Scala getter inovication
+     * Scala getter invocation
      */
     SCALA_GETTER(".+", Object.class, Object.class),
     /**
diff --git a/querydsl-core/src/main/java/com/querydsl/core/group/GroupBy.java b/querydsl-core/src/main/java/com/querydsl/core/group/GroupBy.java
index e61b22d88..a05a9fc40 100644
--- a/querydsl-core/src/main/java/com/querydsl/core/group/GroupBy.java
+++ b/querydsl-core/src/main/java/com/querydsl/core/group/GroupBy.java
@@ -51,7 +51,7 @@ public final class GroupBy {
     /**
      * Create a new GroupByBuilder for the given key expressions
      *
-     * @param keys keys for aggreation
+     * @param keys keys for aggregation
      * @return builder for further specification
      */
     public static GroupByBuilder<List<?>> groupBy(Expression<?>... keys) {
diff --git a/querydsl-core/src/main/java/com/querydsl/core/types/ExpressionUtils.java b/querydsl-core/src/main/java/com/querydsl/core/types/ExpressionUtils.java
index 63f4c0702..93b8c32bb 100644
--- a/querydsl-core/src/main/java/com/querydsl/core/types/ExpressionUtils.java
+++ b/querydsl-core/src/main/java/com/querydsl/core/types/ExpressionUtils.java
@@ -556,7 +556,7 @@ public final class ExpressionUtils {
     }
 
     /**
-     * Creat a list expression for the given arguments
+     * Create a list expression for the given arguments
      *
      * @param exprs list elements
      * @return list expression
@@ -661,7 +661,7 @@ public final class ExpressionUtils {
     /**
      * Create a {@code left not in right} expression
      *
-     * @param <D> type of epressions
+     * @param <D> type of expressions
      * @param left lhs of expression
      * @param right rhs of expression
      * @return left not in right
@@ -673,7 +673,7 @@ public final class ExpressionUtils {
     /**
      * Create a {@code left not in right} expression
      *
-     * @param <D> type of epressions
+     * @param <D> type of expressions
      * @param left lhs of expression
      * @param right rhs of expression
      * @return left not in right
@@ -685,7 +685,7 @@ public final class ExpressionUtils {
     /**
      * Create a {@code left not in right} expression
      *
-     * @param <D> tyoe of expressions
+     * @param <D> type of expressions
      * @param left lhs of expression
      * @param right rhs of expression
      * @return left not in right
diff --git a/querydsl-core/src/main/java/com/querydsl/core/types/QBean.java b/querydsl-core/src/main/java/com/querydsl/core/types/QBean.java
index 7787bee01..e03b1cabc 100644
--- a/querydsl-core/src/main/java/com/querydsl/core/types/QBean.java
+++ b/querydsl-core/src/main/java/com/querydsl/core/types/QBean.java
@@ -40,7 +40,7 @@ import com.querydsl.core.group.GroupExpression;
  * List<EmployeeInfo> result = query.from(employee)
  *      .where(employee.valid.eq(true))
  *      .select(Projections.bean(EmployeeInfo.class, employee.firstName, employee.lastName))
- *      .fech();
+ *      .fetch();
  * }
  * </pre>
  *
diff --git a/querydsl-core/src/main/java/com/querydsl/core/types/Visitor.java b/querydsl-core/src/main/java/com/querydsl/core/types/Visitor.java
index 9dc493c77..a9947eaad 100644
--- a/querydsl-core/src/main/java/com/querydsl/core/types/Visitor.java
+++ b/querydsl-core/src/main/java/com/querydsl/core/types/Visitor.java
@@ -24,7 +24,7 @@ package com.querydsl.core.types;
 public interface Visitor<R, C> {
 
     /**
-     * Visit a Contant instance with the given context
+     * Visit a Constant instance with the given context
      *
      * @param expr expression to visit
      * @param context context of the visit or null, if not used
@@ -42,7 +42,7 @@ public interface Visitor<R, C> {
     R visit(FactoryExpression<?> expr, C context);
 
     /**
-     * Vist a Operation instance with the given context
+     * Visit an Operation instance with the given context
      *
      * @param expr expression to visit
      * @param context context of the visit or null, if not used
diff --git a/querydsl-core/src/main/java/com/querydsl/core/types/dsl/BeanPath.java b/querydsl-core/src/main/java/com/querydsl/core/types/dsl/BeanPath.java
index 177ef52da..a840aae77 100644
--- a/querydsl-core/src/main/java/com/querydsl/core/types/dsl/BeanPath.java
+++ b/querydsl-core/src/main/java/com/querydsl/core/types/dsl/BeanPath.java
@@ -262,7 +262,7 @@ public class BeanPath<T> extends SimpleExpression<T> implements Path<T> {
     }
 
     /**
-     * Create a new Simpe path
+     * Create a new Simple path
      *
      * @param <A>
      * @param property property name
diff --git a/querydsl-core/src/main/java/com/querydsl/core/types/dsl/CaseForEqBuilder.java b/querydsl-core/src/main/java/com/querydsl/core/types/dsl/CaseForEqBuilder.java
index 997c753ec..fe038c9cc 100644
--- a/querydsl-core/src/main/java/com/querydsl/core/types/dsl/CaseForEqBuilder.java
+++ b/querydsl-core/src/main/java/com/querydsl/core/types/dsl/CaseForEqBuilder.java
@@ -182,7 +182,7 @@ public final class CaseForEqBuilder<D> {
      * Intermediate step
      *
      * @param <T> Result type
-     * @param <Q> Parent expreession type
+     * @param <Q> Parent expression type
      */
     public class CaseWhen<T, Q extends Expression<T>> {
 
diff --git a/querydsl-core/src/main/java/com/querydsl/core/types/dsl/CollectionExpressionBase.java b/querydsl-core/src/main/java/com/querydsl/core/types/dsl/CollectionExpressionBase.java
index ecced2e08..d0dc1cd30 100644
--- a/querydsl-core/src/main/java/com/querydsl/core/types/dsl/CollectionExpressionBase.java
+++ b/querydsl-core/src/main/java/com/querydsl/core/types/dsl/CollectionExpressionBase.java
@@ -104,7 +104,7 @@ public abstract class CollectionExpressionBase<T extends Collection<E>, E> exten
     /**
      * Create a {@code this.size()} expression
      *
-     * <p>Gets the amounnt of elements in this collection</p>
+     * <p>Gets the number of elements in this collection</p>
      *
      * @return this.size()
      */
diff --git a/querydsl-core/src/main/java/com/querydsl/core/types/dsl/ComparableExpressionBase.java b/querydsl-core/src/main/java/com/querydsl/core/types/dsl/ComparableExpressionBase.java
index f09cf13be..2aea1adb3 100644
--- a/querydsl-core/src/main/java/com/querydsl/core/types/dsl/ComparableExpressionBase.java
+++ b/querydsl-core/src/main/java/com/querydsl/core/types/dsl/ComparableExpressionBase.java
@@ -67,7 +67,7 @@ public abstract class ComparableExpressionBase<T extends Comparable> extends Sim
     /**
      * Create a {@code coalesce(this, args...)} expression
      *
-     * @param args additonal arguments
+     * @param args additional arguments
      * @return coalesce
      */
     public final Coalesce<T> coalesce(T... args) {
diff --git a/querydsl-core/src/main/java/com/querydsl/core/types/dsl/SimpleExpression.java b/querydsl-core/src/main/java/com/querydsl/core/types/dsl/SimpleExpression.java
index b762524db..31b4dbeb1 100644
--- a/querydsl-core/src/main/java/com/querydsl/core/types/dsl/SimpleExpression.java
+++ b/querydsl-core/src/main/java/com/querydsl/core/types/dsl/SimpleExpression.java
@@ -161,7 +161,7 @@ public abstract class SimpleExpression<T> extends DslExpression<T> {
     }
 
     /**
-     * Create a {@code this == all right} expresion
+     * Create a {@code this == all right} expression
      *
      * @param right
      * @return this == all right
diff --git a/querydsl-jpa/src/main/java/com/querydsl/jpa/Conversions.java b/querydsl-jpa/src/main/java/com/querydsl/jpa/Conversions.java
index bf2d8e7aa..23dc8c585 100644
--- a/querydsl-jpa/src/main/java/com/querydsl/jpa/Conversions.java
+++ b/querydsl-jpa/src/main/java/com/querydsl/jpa/Conversions.java
@@ -63,16 +63,16 @@ public final class Conversions {
         return false;
     }
 
-    private static <RT> FactoryExpression<RT> createEntityPathConversions(FactoryExpression<RT> factorye) {
+    private static <RT> FactoryExpression<RT> createEntityPathConversions(FactoryExpression<RT> factoryExpr) {
         List<Expression<?>> conversions = Lists.newArrayList();
-        for (Expression<?> e : factorye.getArgs()) {
+        for (Expression<?> e : factoryExpr.getArgs()) {
             if (isEntityPathAndNeedsWrapping(e)) {
                 conversions.add(ExpressionUtils.operation(e.getType(), SQLOps.ALL, e));
             } else {
                 conversions.add(e);
             }
         }
-        return FactoryExpressionUtils.wrap(factorye, conversions);
+        return FactoryExpressionUtils.wrap(factoryExpr, conversions);
     }
 
     public static <RT> Expression<RT> convertForNativeQuery(Expression<RT> expr) {
diff --git a/querydsl-jpa/src/main/java/com/querydsl/jpa/JPAExpressions.java b/querydsl-jpa/src/main/java/com/querydsl/jpa/JPAExpressions.java
index 45adfa600..f2a99fe1d 100644
--- a/querydsl-jpa/src/main/java/com/querydsl/jpa/JPAExpressions.java
+++ b/querydsl-jpa/src/main/java/com/querydsl/jpa/JPAExpressions.java
@@ -74,7 +74,7 @@ public final class JPAExpressions {
     }
 
     /**
-     * Create a new detached JPQLQuery instacne with the projection zero
+     * Create a new detached JPQLQuery instance with the projection zero
      *
      * @return select(0)
      */
@@ -83,7 +83,7 @@ public final class JPAExpressions {
     }
 
     /**
-     * Create a new detached JPQLQuery instacne with the projection one
+     * Create a new detached JPQLQuery instance with the projection one
      *
      * @return select(1)
      */
diff --git a/querydsl-jpa/src/main/java/com/querydsl/jpa/JPQLQuery.java b/querydsl-jpa/src/main/java/com/querydsl/jpa/JPQLQuery.java
index fd6195987..34d3b71c2 100644
--- a/querydsl-jpa/src/main/java/com/querydsl/jpa/JPQLQuery.java
+++ b/querydsl-jpa/src/main/java/com/querydsl/jpa/JPQLQuery.java
@@ -233,7 +233,7 @@ public interface JPQLQuery<T> extends FetchableQuery<T, JPQLQuery<T>>, Query<JPQ
      * Use fetchJoin() to add the fetchJoin parameter to this join.
      *
      * @param <P>
-     * @param target targt
+     * @param target target
      * @return the current object
      */
     <P> JPQLQuery<T> rightJoin(EntityPath<P> target);
diff --git a/querydsl-jpa/src/main/java/com/querydsl/jpa/impl/JPAQuery.java b/querydsl-jpa/src/main/java/com/querydsl/jpa/impl/JPAQuery.java
index 2a627973c..c536ed030 100644
--- a/querydsl-jpa/src/main/java/com/querydsl/jpa/impl/JPAQuery.java
+++ b/querydsl-jpa/src/main/java/com/querydsl/jpa/impl/JPAQuery.java
@@ -72,7 +72,7 @@ public class JPAQuery<T> extends AbstractJPAQuery<T, JPAQuery<T>> {
      * Creates a new query
      *
      * @param em entity manager
-     * @param templates temoplates
+     * @param templates templates
      * @param metadata query metadata
      */
     public JPAQuery(EntityManager em, JPQLTemplates templates, QueryMetadata metadata) {
diff --git a/querydsl-spatial/src/main/java/com/querydsl/spatial/GeometryExpression.java b/querydsl-spatial/src/main/java/com/querydsl/spatial/GeometryExpression.java
index 4fdf8e779..c43703e16 100644
--- a/querydsl-spatial/src/main/java/com/querydsl/spatial/GeometryExpression.java
+++ b/querydsl-spatial/src/main/java/com/querydsl/spatial/GeometryExpression.java
@@ -274,7 +274,7 @@ public abstract class GeometryExpression<T extends Geometry> extends SimpleExpre
     /**
      * Returns 1 (TRUE) if this geometric object is “spatially within” anotherGeometry.
      *
-     * @param geometry other goemetry
+     * @param geometry other geometry
      * @return true, if within
      */
     public BooleanExpression within(Geometry geometry) {
@@ -496,7 +496,7 @@ public abstract class GeometryExpression<T extends Geometry> extends SimpleExpre
      * Point set symmetric difference of this geometric object with anotherGeometry.
      *
      * @param geometry other geometry
-     * @return symmetric difference between this and the other goemetry
+     * @return symmetric difference between this and the other geometry
      */
     public GeometryExpression<Geometry> symDifference(Geometry geometry) {
         return symDifference(ConstantImpl.create(geometry));
diff --git a/querydsl-spatial/src/main/java/com/querydsl/spatial/LineStringExpression.java b/querydsl-spatial/src/main/java/com/querydsl/spatial/LineStringExpression.java
index 8ac67540f..d44cccf0f 100644
--- a/querydsl-spatial/src/main/java/com/querydsl/spatial/LineStringExpression.java
+++ b/querydsl-spatial/src/main/java/com/querydsl/spatial/LineStringExpression.java
@@ -57,7 +57,7 @@ public abstract class LineStringExpression<T extends LineString> extends CurveEx
     /**
      * Returns the specified Point N in this LineString.
      *
-     * @param idx one basedindex of element
+     * @param idx one-based index of element
      * @return matched element
      */
     public PointExpression<Point> pointN(int idx) {
diff --git a/querydsl-sql-codegen/src/main/java/com/querydsl/sql/codegen/ant/AntMetaDataExporter.java b/querydsl-sql-codegen/src/main/java/com/querydsl/sql/codegen/ant/AntMetaDataExporter.java
index be6402ea1..757292b9b 100644
--- a/querydsl-sql-codegen/src/main/java/com/querydsl/sql/codegen/ant/AntMetaDataExporter.java
+++ b/querydsl-sql-codegen/src/main/java/com/querydsl/sql/codegen/ant/AntMetaDataExporter.java
@@ -126,7 +126,7 @@ public class AntMetaDataExporter extends Task {
     private boolean exportBeans;
 
     /**
-     * additional bean inerfaces
+     * additional bean interfaces
      */
     private String[] beanInterfaces;
 
diff --git a/querydsl-sql/src/main/java/com/querydsl/sql/Configuration.java b/querydsl-sql/src/main/java/com/querydsl/sql/Configuration.java
index ae17b59f0..a03e56a4b 100644
--- a/querydsl-sql/src/main/java/com/querydsl/sql/Configuration.java
+++ b/querydsl-sql/src/main/java/com/querydsl/sql/Configuration.java
@@ -202,7 +202,7 @@ public final class Configuration {
      *
      * @param key schema and table
      * @param column column
-     * @return overriden column
+     * @return overridden column
      */
     public String getColumnOverride(SchemaAndTable key, String column) {
         return nameMapping.getColumnOverride(key, column);
diff --git a/querydsl-sql/src/main/java/com/querydsl/sql/ProjectableSQLQuery.java b/querydsl-sql/src/main/java/com/querydsl/sql/ProjectableSQLQuery.java
index 40e299f8a..38c91f736 100644
--- a/querydsl-sql/src/main/java/com/querydsl/sql/ProjectableSQLQuery.java
+++ b/querydsl-sql/src/main/java/com/querydsl/sql/ProjectableSQLQuery.java
@@ -316,7 +316,7 @@ public abstract class ProjectableSQLQuery<T, Q extends ProjectableSQLQuery<T, Q>
      *
      * @param <RT>
      * @param alias alias for union
-     * @param sq subqueryies
+     * @param sq subqueries
      * @return the current object
      */
     public <RT> Q union(Path<?> alias, SubQueryExpression<RT>... sq) {
diff --git a/querydsl-sql/src/main/java/com/querydsl/sql/SQLQueryFactory.java b/querydsl-sql/src/main/java/com/querydsl/sql/SQLQueryFactory.java
index 8602c43e4..77adf5524 100644
--- a/querydsl-sql/src/main/java/com/querydsl/sql/SQLQueryFactory.java
+++ b/querydsl-sql/src/main/java/com/querydsl/sql/SQLQueryFactory.java
@@ -70,7 +70,7 @@ public class SQLQueryFactory extends AbstractSQLQueryFactory<SQLQuery<?>> {
     /**
      * Create a new SQLQuery instance with the given projection
      *
-     * @param expr projetion
+     * @param expr projection
      * @param <T>
      * @return select(expr)
      */
@@ -130,7 +130,7 @@ public class SQLQueryFactory extends AbstractSQLQueryFactory<SQLQuery<?>> {
     /**
      * Create a new detached SQLQuery instance with the given projection and source
      *
-     * @param expr query source andd projection
+     * @param expr query source and projection
      * @param <T>
      * @return select(expr).from(expr)
      */
diff --git a/querydsl-sql/src/main/java/com/querydsl/sql/WithinGroup.java b/querydsl-sql/src/main/java/com/querydsl/sql/WithinGroup.java
index c2dc84110..38c855e2f 100644
--- a/querydsl-sql/src/main/java/com/querydsl/sql/WithinGroup.java
+++ b/querydsl-sql/src/main/java/com/querydsl/sql/WithinGroup.java
@@ -26,7 +26,7 @@ import com.querydsl.core.types.dsl.SimpleExpression;
 import com.querydsl.core.types.dsl.SimpleOperation;
 
 /**
- * {@code WithinGroup} is a builder for {@code WIHIN GROUP} constructs
+ * {@code WithinGroup} is a builder for {@code WITHIN GROUP} constructs
  *
  * @param <T> expression type
  *