diff --git a/config/src/main/java/org/springframework/security/config/annotation/authentication/configuration/AuthenticationConfiguration.java b/config/src/main/java/org/springframework/security/config/annotation/authentication/configuration/AuthenticationConfiguration.java
index 046fd5af8a..face2a2bf5 100644
--- a/config/src/main/java/org/springframework/security/config/annotation/authentication/configuration/AuthenticationConfiguration.java
+++ b/config/src/main/java/org/springframework/security/config/annotation/authentication/configuration/AuthenticationConfiguration.java
@@ -51,7 +51,7 @@ public class AuthenticationConfiguration {
 
 	private boolean authenticationManagerInitialized;
 
-	private List<GlobalAuthenticationConfigurerAdapter> globalAuthConfigures = Collections
+	private List<GlobalAuthenticationConfigurerAdapter> globalAuthConfigurers = Collections
 			.emptyList();
 
 	private ObjectPostProcessor<Object> objectPostProcessor;
@@ -84,14 +84,14 @@ public class AuthenticationConfiguration {
 		}
 
 		AuthenticationManagerBuilder authBuilder = authenticationManagerBuilder(objectPostProcessor);
-		for (GlobalAuthenticationConfigurerAdapter config : globalAuthConfigures) {
+		for (GlobalAuthenticationConfigurerAdapter config : globalAuthConfigurers) {
 			authBuilder.apply(config);
 		}
 
 		authenticationManager = authBuilder.build();
 
 		if (authenticationManager == null) {
-			authenticationManager = getAuthenticationMangerBean();
+			authenticationManager = getAuthenticationManagerBean();
 		}
 
 		this.authenticationManagerInitialized = true;
@@ -102,7 +102,7 @@ public class AuthenticationConfiguration {
 	public void setGlobalAuthenticationConfigurers(
 			List<GlobalAuthenticationConfigurerAdapter> configurers) throws Exception {
 		Collections.sort(configurers, AnnotationAwareOrderComparator.INSTANCE);
-		this.globalAuthConfigures = configurers;
+		this.globalAuthConfigurers = configurers;
 	}
 
 	@Autowired
@@ -134,7 +134,7 @@ public class AuthenticationConfiguration {
 		return (T) proxyFactory.getObject();
 	}
 
-	private AuthenticationManager getAuthenticationMangerBean() {
+	private AuthenticationManager getAuthenticationManagerBean() {
 		return lazyBean(AuthenticationManager.class);
 	}
 
diff --git a/config/src/main/java/org/springframework/security/config/annotation/web/configuration/SpringWebMvcImportSelector.java b/config/src/main/java/org/springframework/security/config/annotation/web/configuration/SpringWebMvcImportSelector.java
index 1f053ee46b..59e10073fa 100644
--- a/config/src/main/java/org/springframework/security/config/annotation/web/configuration/SpringWebMvcImportSelector.java
+++ b/config/src/main/java/org/springframework/security/config/annotation/web/configuration/SpringWebMvcImportSelector.java
@@ -20,7 +20,7 @@ import org.springframework.core.type.AnnotationMetadata;
 import org.springframework.util.ClassUtils;
 
 /**
- * Used by {@link EnableWebSecurity} to conditionaly import
+ * Used by {@link EnableWebSecurity} to conditionally import
  * {@link WebMvcSecurityConfiguration} when the DispatcherServlet is present on the
  * classpath.
  *
diff --git a/config/src/main/resources/org/springframework/security/config/spring-security-3.0.3.xsd b/config/src/main/resources/org/springframework/security/config/spring-security-3.0.3.xsd
index 3f026e78f9..0be464f0db 100644
--- a/config/src/main/resources/org/springframework/security/config/spring-security-3.0.3.xsd
+++ b/config/src/main/resources/org/springframework/security/config/spring-security-3.0.3.xsd
@@ -1203,7 +1203,7 @@
     </xs:attribute>
     <xs:attribute name="erase-credentials" type="security:boolean">
       <xs:annotation>
-        <xs:documentation>If set to true, the AuthenticationManger will attempt to clear any credentials data in the returned Authentication object, once the user has been authenticated. Defaults to false.</xs:documentation>
+        <xs:documentation>If set to true, the AuthenticationManager will attempt to clear any credentials data in the returned Authentication object, once the user has been authenticated. Defaults to false.</xs:documentation>
       </xs:annotation>
     </xs:attribute>
   </xs:attributeGroup>
diff --git a/config/src/main/resources/org/springframework/security/config/spring-security-3.1.rnc b/config/src/main/resources/org/springframework/security/config/spring-security-3.1.rnc
index 9c2b324bb0..8d1b683e2a 100644
--- a/config/src/main/resources/org/springframework/security/config/spring-security-3.1.rnc
+++ b/config/src/main/resources/org/springframework/security/config/spring-security-3.1.rnc
@@ -657,7 +657,7 @@ authman.attlist &=
     ## An alias you wish to use for the AuthenticationManager bean (not required it you are using a specific id)
     attribute alias {xsd:token}?
 authman.attlist &=
-    ## If set to true, the AuthenticationManger will attempt to clear any credentials data in the returned Authentication object, once the user has been authenticated.
+    ## If set to true, the AuthenticationManager will attempt to clear any credentials data in the returned Authentication object, once the user has been authenticated.
     attribute erase-credentials {xsd:boolean}?
 
 authentication-provider =
diff --git a/config/src/main/resources/org/springframework/security/config/spring-security-3.1.xsd b/config/src/main/resources/org/springframework/security/config/spring-security-3.1.xsd
index 8b7d492de1..714194f5d0 100644
--- a/config/src/main/resources/org/springframework/security/config/spring-security-3.1.xsd
+++ b/config/src/main/resources/org/springframework/security/config/spring-security-3.1.xsd
@@ -2067,7 +2067,7 @@
       </xs:attribute>
       <xs:attribute name="erase-credentials" type="xs:boolean">
          <xs:annotation>
-            <xs:documentation>If set to true, the AuthenticationManger will attempt to clear any credentials data in the
+            <xs:documentation>If set to true, the AuthenticationManager will attempt to clear any credentials data in the
                 returned Authentication object, once the user has been authenticated.
                 </xs:documentation>
          </xs:annotation>
diff --git a/config/src/main/resources/org/springframework/security/config/spring-security-3.2.rnc b/config/src/main/resources/org/springframework/security/config/spring-security-3.2.rnc
index fe231706cf..31a821fe07 100644
--- a/config/src/main/resources/org/springframework/security/config/spring-security-3.2.rnc
+++ b/config/src/main/resources/org/springframework/security/config/spring-security-3.2.rnc
@@ -659,7 +659,7 @@ authman.attlist &=
     ## An alias you wish to use for the AuthenticationManager bean (not required it you are using a specific id)
     attribute alias {xsd:token}?
 authman.attlist &=
-    ## If set to true, the AuthenticationManger will attempt to clear any credentials data in the returned Authentication object, once the user has been authenticated.
+    ## If set to true, the AuthenticationManager will attempt to clear any credentials data in the returned Authentication object, once the user has been authenticated.
     attribute erase-credentials {xsd:boolean}?
 
 authentication-provider =
diff --git a/config/src/main/resources/org/springframework/security/config/spring-security-3.2.xsd b/config/src/main/resources/org/springframework/security/config/spring-security-3.2.xsd
index a9f27637a1..461ca88792 100644
--- a/config/src/main/resources/org/springframework/security/config/spring-security-3.2.xsd
+++ b/config/src/main/resources/org/springframework/security/config/spring-security-3.2.xsd
@@ -2083,7 +2083,7 @@
       </xs:attribute>
       <xs:attribute name="erase-credentials" type="xs:boolean">
          <xs:annotation>
-            <xs:documentation>If set to true, the AuthenticationManger will attempt to clear any credentials data in the
+            <xs:documentation>If set to true, the AuthenticationManager will attempt to clear any credentials data in the
                 returned Authentication object, once the user has been authenticated.
                 </xs:documentation>
          </xs:annotation>
diff --git a/config/src/main/resources/org/springframework/security/config/spring-security-4.0.rnc b/config/src/main/resources/org/springframework/security/config/spring-security-4.0.rnc
index 5bc9df237c..82df04bf01 100644
--- a/config/src/main/resources/org/springframework/security/config/spring-security-4.0.rnc
+++ b/config/src/main/resources/org/springframework/security/config/spring-security-4.0.rnc
@@ -668,7 +668,7 @@ authman.attlist &=
 	## An alias you wish to use for the AuthenticationManager bean (not required it you are using a specific id)
 	attribute alias {xsd:token}?
 authman.attlist &=
-	## If set to true, the AuthenticationManger will attempt to clear any credentials data in the returned Authentication object, once the user has been authenticated.
+	## If set to true, the AuthenticationManager will attempt to clear any credentials data in the returned Authentication object, once the user has been authenticated.
 	attribute erase-credentials {xsd:boolean}?
 
 authentication-provider =
diff --git a/config/src/main/resources/org/springframework/security/config/spring-security-4.0.xsd b/config/src/main/resources/org/springframework/security/config/spring-security-4.0.xsd
index af44d6918b..17660f0011 100644
--- a/config/src/main/resources/org/springframework/security/config/spring-security-4.0.xsd
+++ b/config/src/main/resources/org/springframework/security/config/spring-security-4.0.xsd
@@ -2114,7 +2114,7 @@
       </xs:attribute>
       <xs:attribute name="erase-credentials" type="xs:boolean">
          <xs:annotation>
-            <xs:documentation>If set to true, the AuthenticationManger will attempt to clear any credentials data in the
+            <xs:documentation>If set to true, the AuthenticationManager will attempt to clear any credentials data in the
                 returned Authentication object, once the user has been authenticated.
                 </xs:documentation>
          </xs:annotation>
diff --git a/docs/manual/src/docs/asciidoc/index.adoc b/docs/manual/src/docs/asciidoc/index.adoc
index 36a48fef47..a09044baf6 100644
--- a/docs/manual/src/docs/asciidoc/index.adoc
+++ b/docs/manual/src/docs/asciidoc/index.adoc
@@ -8514,7 +8514,7 @@ This attribute allows you to define an alias name for the internal instance for
 
 [[nsa-authentication-manager-erase-credentials]]
 * **erase-credentials**
-If set to true, the AuthenticationManger will attempt to clear any credentials data in the returned Authentication object, once the user has been authenticated. Literally it maps to the `eraseCredentialsAfterAuthentication` property of the `ProviderManager`. This is discussed in the <<core-services-erasing-credentials,Core Services>> chapter.
+If set to true, the AuthenticationManager will attempt to clear any credentials data in the returned Authentication object, once the user has been authenticated. Literally it maps to the `eraseCredentialsAfterAuthentication` property of the `ProviderManager`. This is discussed in the <<core-services-erasing-credentials,Core Services>> chapter.
 
 
 [[nsa-authentication-manager-id]]
diff --git a/web/src/test/java/org/springframework/security/web/access/DefaultWebInvocationPrivilegeEvaluatorTests.java b/web/src/test/java/org/springframework/security/web/access/DefaultWebInvocationPrivilegeEvaluatorTests.java
index c124aa6d3a..f3818ad39b 100644
--- a/web/src/test/java/org/springframework/security/web/access/DefaultWebInvocationPrivilegeEvaluatorTests.java
+++ b/web/src/test/java/org/springframework/security/web/access/DefaultWebInvocationPrivilegeEvaluatorTests.java
@@ -91,7 +91,7 @@ public class DefaultWebInvocationPrivilegeEvaluatorTests {
 	}
 
 	@Test
-	public void allowsAccessIfAccessDecisionMangerDoes() throws Exception {
+	public void allowsAccessIfAccessDecisionManagerDoes() throws Exception {
 		Authentication token = new TestingAuthenticationToken("test", "Password",
 				"MOCK_INDEX");
 		DefaultWebInvocationPrivilegeEvaluator wipe = new DefaultWebInvocationPrivilegeEvaluator(
@@ -101,7 +101,7 @@ public class DefaultWebInvocationPrivilegeEvaluatorTests {
 
 	@SuppressWarnings("unchecked")
 	@Test
-	public void deniesAccessIfAccessDecisionMangerDoes() throws Exception {
+	public void deniesAccessIfAccessDecisionManagerDoes() throws Exception {
 		Authentication token = new TestingAuthenticationToken("test", "Password",
 				"MOCK_INDEX");
 		DefaultWebInvocationPrivilegeEvaluator wipe = new DefaultWebInvocationPrivilegeEvaluator(