diff --git a/org.springframework.context/src/main/java/org/springframework/context/support/SimpleThreadScope.java b/org.springframework.context/src/main/java/org/springframework/context/support/SimpleThreadScope.java
index c45f2c43129..db04a72e19a 100644
--- a/org.springframework.context/src/main/java/org/springframework/context/support/SimpleThreadScope.java
+++ b/org.springframework.context/src/main/java/org/springframework/context/support/SimpleThreadScope.java
@@ -36,9 +36,12 @@ import org.springframework.core.NamedThreadLocal;
  * <p>For a implementation of a thread-based <code>Scope</code> with support for destruction callbacks, refer to <a
  * href="http://www.springbyexample.org/twiki/bin/view/Example/CustomThreadScopeModule">this module</a>.
  *
- * @author Eugene Kuleshov
+ * <p>Thanks to Eugene Kuleshov for submitting the original prototype for a thread scope!
+ *
  * @author Arjen Poutsma
+ * @author Juergen Hoeller
  * @since 3.0
+ * @see org.springframework.web.context.request.RequestScope
  */
 public class SimpleThreadScope implements Scope {
 
@@ -69,7 +72,7 @@ public class SimpleThreadScope implements Scope {
 
 	public void registerDestructionCallback(String name, Runnable callback) {
 		logger.warn("SimpleThreadScope does not support descruction callbacks. " +
-				"Consider using a RequestScope in a Web environment");
+				"Consider using a RequestScope in a Web environment.");
 	}
 
 	public Object resolveContextualObject(String key) {
@@ -79,4 +82,5 @@ public class SimpleThreadScope implements Scope {
 	public String getConversationId() {
 		return Thread.currentThread().getName();
 	}
+
 }
diff --git a/org.springframework.context/src/main/resources/org/springframework/context/config/spring-context-2.5.xsd b/org.springframework.context/src/main/resources/org/springframework/context/config/spring-context-2.5.xsd
index 0cbb8da9273..542eade52b4 100644
--- a/org.springframework.context/src/main/resources/org/springframework/context/config/spring-context-2.5.xsd
+++ b/org.springframework.context/src/main/resources/org/springframework/context/config/spring-context-2.5.xsd
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <xsd:schema xmlns="http://www.springframework.org/schema/context" xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-			xmlns:beans="http://www.springframework.org/schema/beans"
-			xmlns:tool="http://www.springframework.org/schema/tool"
-			targetNamespace="http://www.springframework.org/schema/context" elementFormDefault="qualified"
-			attributeFormDefault="unqualified">
+		xmlns:beans="http://www.springframework.org/schema/beans"
+		xmlns:tool="http://www.springframework.org/schema/tool"
+		targetNamespace="http://www.springframework.org/schema/context" elementFormDefault="qualified"
+		attributeFormDefault="unqualified">
 
 	<xsd:import namespace="http://www.springframework.org/schema/beans"/>
 	<xsd:import namespace="http://www.springframework.org/schema/tool"/>
@@ -313,7 +313,7 @@
 			]]></xsd:documentation>
 			<xsd:appinfo>
 				<tool:annotation>
-					<tool:exports type="org.springframework.jmx.export.annotation.MBeanExporter"/>
+					<tool:exports type="org.springframework.jmx.export.annotation.AnnotationMBeanExporter"/>
 				</tool:annotation>
 			</xsd:appinfo>
 		</xsd:annotation>