From b7f143ae581289b541d81be1661b015de2a0b408 Mon Sep 17 00:00:00 2001
From: Thomas Risberg <trisberg@vmware.com>
Date: Thu, 21 Jan 2010 16:49:05 +0000
Subject: [PATCH] updated reference documentation with references to
 "spring-agent.jar" to use "org.springframework.instrument-{version}.jar"
 (SPR-6597)

---
 spring-framework-reference/src/aop.xml |  4 ++--
 spring-framework-reference/src/orm.xml | 10 ++++++----
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/spring-framework-reference/src/aop.xml b/spring-framework-reference/src/aop.xml
index 4e246be7686..15d34eee759 100644
--- a/spring-framework-reference/src/aop.xml
+++ b/spring-framework-reference/src/aop.xml
@@ -3115,8 +3115,8 @@ public class Account {
       <emphasis>without making any modifications to the application server's
       launch script</emphasis> that will be needed to add
       <literal>-javaagent:path/to/aspectjweaver.jar</literal> or (as we describe later in this
-      section) <literal>-javaagent:path/to/spring-instrument.jar</literal> (previously named
-      <literal>spring-agent.jar</literal>). Developers simply modify
+      section) <literal>-javaagent:path/to/org.springframework.instrument-{version}.jar</literal> 
+      (previously named <literal>spring-agent.jar</literal>). Developers simply modify
       one or more files that form the application context to enable load-time
       weaving instead of relying on administrators who typically are in charge
       of the deployment configuration such as the launch script.</para>
diff --git a/spring-framework-reference/src/orm.xml b/spring-framework-reference/src/orm.xml
index b7e3523602b..766a9ffa148 100644
--- a/spring-framework-reference/src/orm.xml
+++ b/spring-framework-reference/src/orm.xml
@@ -1631,7 +1631,8 @@ TR: REVISED, PLS REVIEW. Should be *inside your war*.--></para>
           a JDK agent can be the only solution. For such cases, Spring
           provides <classname>InstrumentationLoadTimeWeaver,</classname> which
           requires a Spring-specific (but very general) VM agent, <filename
-          class="libraryfile">spring-agent.jar</filename>:</para>
+          class="libraryfile">org.springframework.instrument-{version}.jar</filename> (previously named <filename
+          class="libraryfile">spring-agent.jar</filename>):</para>
 
           <programlisting language="xml">&lt;bean id="emf" class="org.springframework.orm.jpa.LocalContainerEntityManagerFactoryBean"&gt;
   &lt;property name="loadTimeWeaver"&gt;
@@ -1642,15 +1643,16 @@ TR: REVISED, PLS REVIEW. Should be *inside your war*.--></para>
           <para>You must start the virtual machine with the Spring agent, by
           supplying the following JVM options:</para>
 
-          <programlisting>-javaagent:/path/to/spring-agent.jar</programlisting>
+          <programlisting>-javaagent:/path/to/org.springframework.instrument-{version}.jar</programlisting>
         </section>
 
         <section id="orm-jpa-setup-lcemfb-weaver">
           <title>Context-wide load-time weaver setup</title>
 
-          <para>In Spring 2.5 and later, you can configure a context-wide
+          <para>You can configure a context-wide
           <interfacename>LoadTimeWeaver</interfacename> using the
-          <literal>context:load-time-weaver</literal> configuration element.
+          <literal>context:load-time-weaver</literal> configuration element. (This 
+          has been available since Spring 2.5.)  
           Such a global weaver is picked up by all JPA
           <classname>LocalContainerEntityManagerFactoryBeans</classname>
           automatically.</para>