SPR-7163

SPR-7161
+ update Petclinic references
+ minor corrections

spring-framework-reference/src/aop.xml

@@ -3124,7 +3124,7 @@ public class Account {
       <para>Now that the sales pitch is over, let us first walk through a
       quick example of AspectJ LTW using Spring, followed by detailed
       specifics about elements introduced in the following example. For a
-      complete example, please see the Petclinic sample application.</para>
+      complete example, please see the Petclinic <link linkend="new-in-3-samples">sample</link> application.</para>
 
       <section id="aop-aj-ltw-first-example">
         <title>A first example</title>

spring-framework-reference/src/beans.xml

@@ -1324,7 +1324,7 @@ public class ExampleBean {
         <para>The <literal>value</literal> attribute of the
         <literal>&lt;property/&gt;</literal> element specifies a property or
         constructor argument as a human-readable string representation. <link
-        linkend="beans-factory-collaborators-propertyeditor">As mentioned
+        linkend="beans-beans-conversion">As mentioned
         previously</link>, JavaBeans <literal>PropertyEditors</literal> are
         used to convert these string values from a
         <classname>String</classname> to the actual type of the property or
@@ -2296,8 +2296,7 @@ support=support@example.co.uk</programlisting>
       bean B every time one is needed.</para>
 
       <para>A solution is to forego some inversion of control. You can <link
-      linkend="beans-factory-aware-beanfactoryaware">make bean A aware of the
+      linkend="beans-factory-aware">make bean A aware of the container</link> by implementing the
-      container</link> by implementing the
       <interfacename>ApplicationContextAware</interfacename> interface, and by
       <link linkend="beans-factory-client">making a getBean("B") call to the
       container</link> ask for (a typically new) bean B instance every time

spring-framework-reference/src/mvc.xml

@@ -589,12 +589,10 @@
     configure access to Servlet or Portlet facilities.</para>
 
     <tip>
-      <para>The Spring distribution ships with the
+      <para>Available in the <link linkend="new-in-3-samples">samples repository</link>, 
-      <emphasis>PetClinic</emphasis> sample, a web application that leverages
+      the <emphasis>PetClinic</emphasis> web application leverages
       the annotation support described in this section, in the context of
-      simple form processing. The <emphasis>PetClinic</emphasis> application
+      simple form processing.</para>
-      resides in the <literal>org.springframework.samples.petclinic</literal>
-      module.</para>
 
       <!-- MLP Note removed reference to imagedb -->
     </tip>

spring-framework-reference/src/new-in-3.xml

@@ -63,6 +63,21 @@
 		There are many excellent articles and tutorials that show how to get started with Spring 3 features.
 		Read them at the <ulink url="http://www.springsource.org/documentation">Spring Documentation</ulink> page.
 	  </para>
+	  <para id="new-in-3-samples">
+	  The samples have been improved and updated to take advantage of the new features in Spring 3.
+	  Additionally, the samples have been moved out of the source tree into a dedicated SVN 
+	  <ulink url="https://anonsvn.springframework.org/svn/spring-samples/">repository</ulink> available at:</para>
+	  
+    <para>
+	  <literal>https://anonsvn.springframework.org/svn/spring-samples/</literal>
+	  </para>
+	  
+	  <para>As such, the samples are no longer distributed alongside Spring 3 and need to be downloaded separately from the repository mentioned above. However, this documentation
+	  will continue to refer to some samples (in particular Petclinic) to illustrate various features.</para>
+	  
+	  <note>For more information on Subversion (or in short SVN), see the project homepage at:
+      <literal>http://subversion.apache.org/</literal>
+	  </note>
 
   </section>
 

spring-framework-reference/src/testing.xml

@@ -1757,8 +1757,8 @@ public class SimpleTest {
     <section id="testing-examples-petclinic">
       <title>PetClinic example</title>
 
-      <para>The PetClinic sample application included with the full Spring
+      <para>The PetClinic application, available from the <link linkend="new-in-3-samples">samples repository</link>,
-      distribution illustrates several features of the <emphasis>Spring
+      illustrates several features of the <emphasis>Spring
       TestContext Framework</emphasis> in a JUnit 4.5+ environment. Most test
       functionality is included in the
       <classname>AbstractClinicTests</classname>, for which a partial listing