diff --git a/org.springframework.core/src/main/java/org/springframework/core/env/PropertySource.java b/org.springframework.core/src/main/java/org/springframework/core/env/PropertySource.java
index d0587ef0fa..aab278b895 100644
--- a/org.springframework.core/src/main/java/org/springframework/core/env/PropertySource.java
+++ b/org.springframework.core/src/main/java/org/springframework/core/env/PropertySource.java
@@ -182,17 +182,15 @@ public abstract class PropertySource<T> {
 	 * <p>Primarily for internal use, but given a collection of {@code PropertySource} objects, may be
 	 * used as follows:
 	 * <pre class="code">
-	 * {@code  
-	 *   List<PropertySource<?>> sources = new ArrayList<PropertySource<?>>();
-	 *   sources.add(new MapPropertySource("sourceA", mapA));
-	 *   sources.add(new MapPropertySource("sourceB", mapB));
-	 *   assert sources.contains(PropertySource.named("sourceA"));
-	 *   assert sources.contains(PropertySource.named("sourceB"));
-	 *   assert !sources.contains(PropertySource.named("sourceC"));
-	 * }
-	 * </pre>
+	 * {@code List<PropertySource<?>> sources = new ArrayList<PropertySource<?>>();
+	 * sources.add(new MapPropertySource("sourceA", mapA));
+	 * sources.add(new MapPropertySource("sourceB", mapB));
+	 * assert sources.contains(PropertySource.named("sourceA"));
+	 * assert sources.contains(PropertySource.named("sourceB"));
+	 * assert !sources.contains(PropertySource.named("sourceC"));
+	 * }</pre>
 	 *
-	 * <p>The returned {@code PropertySource} will throw {@code UnsupportedOperationException}
+	 * The returned {@code PropertySource} will throw {@code UnsupportedOperationException}
 	 * if any methods other than {@code equals(Object)}, {@code hashCode()}, and {@code toString()}
 	 * are called.
 	 *
diff --git a/org.springframework.core/src/main/java/org/springframework/core/env/package-info.java b/org.springframework.core/src/main/java/org/springframework/core/env/package-info.java
new file mode 100644
index 0000000000..bfaccbfdca
--- /dev/null
+++ b/org.springframework.core/src/main/java/org/springframework/core/env/package-info.java
@@ -0,0 +1,7 @@
+/**
+ * Spring's environment abstraction consisting of bean definition
+ * profile and hierarchical property source support.
+ * @author Chris Beams
+ * @since 3.1
+ */
+package org.springframework.core.env;