Merge branch 'master' into DocUpdate

Conflicts:
	doc/reference/src/index.xml

doc/reference/src/objects.xml

@@ -1565,7 +1565,7 @@ Public Class ExampleObject
         myObjectTwo = yetAnotherObject
         Me.i = i
     End Sub
-End Class</programlisting>Ghe constructor arguments specified in the object
+End Class</programlisting>The constructor arguments specified in the object
         definition will be used to pass in as arguments to the constructor of
         the <literal>ExampleObject</literal>.</para>
 
@@ -6868,17 +6868,8 @@ ctx.Refresh();</programlisting>
     RootObjectDefinition, etc. Note a web version of this application class
     has not yet been implemented.</para>
 
-    <para>An example, with a<emphasis> yet to be created</emphasis> DLL
-    scanner, that would get configuration metadata from the .dll named
-    MyAssembly.dll located in the runtime path, would look something like
-    this</para>
-
-    <programlisting language="csharp">GenericApplicationContext ctx = new GenericApplicationContext();
-ObjectDefinitionScanner scanner = new ObjectDefinitionScanner(ctx);
-scanner.scan("MyAssembly.dll");
-ctx.refresh();</programlisting>
-
-    <para>Refer to the Spring API documentation for more information.</para>
+    <para>For a an even richer XML-free configuration experience, refer
+    instead to the Spring CodeConfig approach.</para>
   </sect1>
 
   <sect1 xml:id="objects-servicelocator">