diff --git a/src/docs/asciidoc/core/core-resources.adoc b/src/docs/asciidoc/core/core-resources.adoc
index 760c889202..c8e4508ab9 100644
--- a/src/docs/asciidoc/core/core-resources.adoc
+++ b/src/docs/asciidoc/core/core-resources.adoc
@@ -563,7 +563,7 @@ files named `services.xml` and `daos.xml` (which are on the classpath) can be in
 	val ctx = ClassPathXmlApplicationContext(arrayOf("services.xml", "daos.xml"), MessengerService::class.java)
 ----
 
-See the {api-spring-framework}/jca/context/SpringContextResourceAdapter.html[`ClassPathXmlApplicationContext`]
+See the api-spring-framework}/context/support/ClassPathXmlApplicationContext.html[`ClassPathXmlApplicationContext`]
 javadoc for details on the various constructors.
 
 
diff --git a/src/docs/asciidoc/web/webmvc.adoc b/src/docs/asciidoc/web/webmvc.adoc
index 4542ad9d98..16143be591 100644
--- a/src/docs/asciidoc/web/webmvc.adoc
+++ b/src/docs/asciidoc/web/webmvc.adoc
@@ -46,16 +46,15 @@ the `DispatcherServlet`, which is auto-detected by the Servlet container
 	public class MyWebApplicationInitializer implements WebApplicationInitializer {
 
 		@Override
-		public void onStartup(ServletContext servletCxt) {
+		public void onStartup(ServletContext servletContext) {
 
 			// Load Spring web application configuration
-			AnnotationConfigWebApplicationContext ac = new AnnotationConfigWebApplicationContext();
-			ac.register(AppConfig.class);
-			ac.refresh();
+			AnnotationConfigWebApplicationContext context = new AnnotationConfigWebApplicationContext();
+			context.register(AppConfig.class);
 
 			// Create and register the DispatcherServlet
-			DispatcherServlet servlet = new DispatcherServlet(ac);
-			ServletRegistration.Dynamic registration = servletCxt.addServlet("app", servlet);
+			DispatcherServlet servlet = new DispatcherServlet(context);
+			ServletRegistration.Dynamic registration = servletContext.addServlet("app", servlet);
 			registration.setLoadOnStartup(1);
 			registration.addMapping("/app/*");
 		}
@@ -66,16 +65,15 @@ the `DispatcherServlet`, which is auto-detected by the Servlet container
 ----
 	class MyWebApplicationInitializer : WebApplicationInitializer {
 
-		override fun onStartup(servletCxt: ServletContext) {
+		override fun onStartup(servletContext: ServletContext) {
 
 			// Load Spring web application configuration
-			val ac = AnnotationConfigWebApplicationContext()
-			ac.register(AppConfig::class.java)
-			ac.refresh()
+			val context = AnnotationConfigWebApplicationContext()
+			context.register(AppConfig::class.java)
 
 			// Create and register the DispatcherServlet
-			val servlet = DispatcherServlet(ac)
-			val registration = servletCxt.addServlet("app", servlet)
+			val servlet = DispatcherServlet(context)
+			val registration = servletContext.addServlet("app", servlet)
 			registration.setLoadOnStartup(1)
 			registration.addMapping("/app/*")
 		}