diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/embedded/AbstractEmbeddedDatabaseConfigurer.java b/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/embedded/AbstractEmbeddedDatabaseConfigurer.java
index 2497a6cc019..aedfd431270 100644
--- a/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/embedded/AbstractEmbeddedDatabaseConfigurer.java
+++ b/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/embedded/AbstractEmbeddedDatabaseConfigurer.java
@@ -44,7 +44,7 @@ abstract class AbstractEmbeddedDatabaseConfigurer implements EmbeddedDatabaseCon
 		}
 		catch (SQLException ex) {
 			if (logger.isWarnEnabled()) {
-				logger.warn("Could not shutdown embedded database", ex);
+				logger.warn("Could not shut down embedded database", ex);
 			}
 		}
 	}
diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/embedded/DerbyEmbeddedDatabaseConfigurer.java b/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/embedded/DerbyEmbeddedDatabaseConfigurer.java
index 85ea5df67cb..9c0a0a196ab 100644
--- a/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/embedded/DerbyEmbeddedDatabaseConfigurer.java
+++ b/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/embedded/DerbyEmbeddedDatabaseConfigurer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2014 the original author or authors.
+ * Copyright 2002-2015 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -74,7 +74,7 @@ final class DerbyEmbeddedDatabaseConfigurer implements EmbeddedDatabaseConfigure
 		catch (SQLException ex) {
 			// Error code that indicates successful shutdown
 			if (!"08006".equals(ex.getSQLState())) {
-				LogFactory.getLog(getClass()).warn("Could not shutdown in-memory Derby database", ex);
+				LogFactory.getLog(getClass()).warn("Could not shut down embedded Derby database", ex);
 			}
 		}
 	}
diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/embedded/EmbeddedDatabaseConfigurer.java b/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/embedded/EmbeddedDatabaseConfigurer.java
index d6328ff1bdb..c461aa6a8f5 100644
--- a/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/embedded/EmbeddedDatabaseConfigurer.java
+++ b/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/embedded/EmbeddedDatabaseConfigurer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2014 the original author or authors.
+ * Copyright 2002-2015 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -20,10 +20,8 @@ import javax.sql.DataSource;
 
 /**
  * {@code EmbeddedDatabaseConfigurer} encapsulates the configuration required to
- * create, connect to, and shutdown a specific type of embedded database such as
- * HSQL or H2.
- * <p>Create an implementation for each database type you wish to support; for
- * example HSQL, H2, or some other type.
+ * create, connect to, and shut down a specific type of embedded database such as
+ * HSQL, H2, or Derby.
  *
  * @author Keith Donald
  * @author Sam Brannen
@@ -40,9 +38,9 @@ public interface EmbeddedDatabaseConfigurer {
 	void configureConnectionProperties(ConnectionProperties properties, String databaseName);
 
 	/**
-	 * Shutdown the embedded database instance that backs the supplied {@link DataSource}.
+	 * Shut down the embedded database instance that backs the supplied {@link DataSource}.
 	 * @param dataSource the data source
-	 * @param databaseName the name of the database being shutdown
+	 * @param databaseName the name of the database being shut down
 	 */
 	void shutdown(DataSource dataSource, String databaseName);
 
diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/embedded/EmbeddedDatabaseFactory.java b/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/embedded/EmbeddedDatabaseFactory.java
index 0b4f43c0356..2dcbc0a77f2 100644
--- a/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/embedded/EmbeddedDatabaseFactory.java
+++ b/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/embedded/EmbeddedDatabaseFactory.java
@@ -44,7 +44,7 @@ import org.springframework.util.Assert;
  * <li>Call {@link #setDatabaseName} to set an explicit name for the database.
  * <li>Call {@link #setDatabaseType} to set the database type if you wish to
  * use one of the supported types.
- * <li>Call {@link #setDatabaseConfigurer} to configure support for your own
+ * <li>Call {@link #setDatabaseConfigurer} to configure support for a custom
  * embedded database type.
  * <li>Call {@link #setDatabasePopulator} to change the algorithm used to
  * populate the database.