Index: ar.xml
===================================================================
--- ar.xml	(revision 5716)
+++ ar.xml	(working copy)
@@ -32,6 +32,7 @@
 <li>Iesi.Collections.dll</li>
 <li>log4net.dll</li>
 <li>NHibernate.dll</li>
+<li>NHibernate.ByteCode.Castle.dll</li>
 </ul>
 </p>
 
@@ -58,17 +59,20 @@
 	    
 		<config>
 			<add 
-				key="hibernate.connection.driver_class" 
+				key="connection.driver_class" 
 				value="NHibernate.Driver.SqlClientDriver" />
 			<add 
-				key="hibernate.dialect"                 
-				value="NHibernate.Dialect.MsSql2000Dialect" />
+				key="dialect"                 
+				value="NHibernate.Dialect.MsSql2005Dialect" />
 			<add 
-				key="hibernate.connection.provider"     
+				key="connection.provider"     
 				value="NHibernate.Connection.DriverConnectionProvider" />
 			<add 
-				key="hibernate.connection.connection_string" 
+				key="connection.connection_string" 
 				value="Data Source=.;Initial Catalog=test;Integrated Security=SSPI" />
+			<add
+			    key="proxyfactory.factory_class"
+			    value="NHibernate.ByteCode.Castle.ProxyFactoryFactory, NHibernate.ByteCode.Castle"  />
 		</config>
 	    
 	</activerecord>
@@ -76,7 +80,7 @@
 
 	<note>
 	<p>
-	The configuration above uses SQL Server 2000. If you are using a different
+	The configuration above uses SQL Server 2005. If you are using a different
 	database you need to change the dialect. Please refer to the
 <a href="../documentation/trunk/manual/configurationref.html">Xml Configuration Reference</a> 
 	document for more information.
@@ -99,147 +103,84 @@
 <pre format="cs"><![CDATA[
 namespace GettingStartedSample.Models
 {
-	using System;
 	using Castle.ActiveRecord;
-	using NHibernate.Expression;
 
-	[ActiveRecord]
-	public class Supplier : ActiveRecordBase
-	{
-		private int id;
-		private String name;
+    [ActiveRecord]
+    public class Supplier : ActiveRecordBase<Supplier>
+    {
+        [PrimaryKey]
+        public int Id { get; set; }
 
-		[PrimaryKey]
-		public int Id
-		{
-			get { return id; }
-			set { id = value; }
-		}
-
-		[Property]
-		public string Name
-		{
-			get { return name; }
-			set { name = value; }
-		}
-		
-		/// <summary>
-		/// Returns the Suppliers ordered by Name
-		/// </summary>
-		/// <returns>Suppliers array</returns>
-		public static Supplier[] FindAll()
-		{
-			return (Supplier[]) FindAll(typeof(Supplier), new Order[] { Order.Asc("Name") });
-		}
-	}
+        [Property]
+        public string Name { get; set; }
+    }
 }]]></pre>
 
 <p>The <tt>Product.cs</tt>:</p>
 
-<pre format="cs">
+<pre format="cs"><![CDATA[
 namespace GettingStartedSample.Models
 {
-	using System;
 	using Castle.ActiveRecord;
 
-	[ActiveRecord]
-	public class Product : ActiveRecordBase
-	{
-		private int id;
-		private String name;
-		private decimal price;
-		private Supplier supplier;
+    [ActiveRecord]
+    public class Product : ActiveRecordBase<Product>
+    {
+        [PrimaryKey]
+        public int Id { get; set; }
 
-		[PrimaryKey]
-		public int Id
-		{
-			get { return id; }
-			set { id = value; }
-		}
+        [Property]
+        public string Name { get; set; }
 
-		[Property]
-		public string Name
-		{
-			get { return name; }
-			set { name = value; }
-		}
+        [Property]
+        public decimal Price { get; set; }
 
-		[Property]
-		public decimal Price
-		{
-			get { return price; }
-			set { price = value; }
-		}
+        [BelongsTo("SupplierId")]
+        public Supplier Supplier { get; set; }
+    }
+}
+}]]></pre>
 
-		[BelongsTo("SupplierId")]
-		public Supplier Supplier
-		{
-			get { return supplier; }
-			set { supplier = value; }
-		}
-		
-		public static Product[] FindAll()
-		{
-			return (Product[]) FindAll(typeof(Product));
-		}
-		
-		public static Product FindById(int id)
-		{
-			return (Product) FindByPrimaryKey(typeof(Product), id);
-		}
-	}
-}</pre>
-
 </li>
 
 <li>
 <p>
 The last step is to initialize ActiveRecord passing the configuration.
 The best place to do that in a web application is on the global.asax related
-class. So create a <tt>global.asax</tt> if none exists and on the related
+class. So create a <tt>Global.asax</tt> if none exists and on the related
 class, use the <tt>Application_OnStart</tt> event to initialize ActiveRecord:
 </p>
 
 <p>
-The <tt>global.asax</tt> file:
+The <tt>Global.asax</tt> file:
 </p>
 
 <pre format="html"><![CDATA[
-<%@ Application Inherits="GettingStartedSample.GlobalApplication" %>]]></pre>
+<%@ Application Codebehind="Global.asax.cs" Inherits="GettingStarted.Global" Language="C#" %>]]></pre>
 
 <p>
-The <tt>GlobalApplication.cs</tt> file:
+The <tt>Global.asax.cs</tt> file:
 </p>
 
 <pre format="cs">
 namespace GettingStartedSample
 {
 	using System;
-	using System.Web;
-	using Castle.ActiveRecord;
-	using Castle.ActiveRecord.Framework.Config;
-	using GettingStartedSample.Models;
-	
+    using System.Web;
+    using Castle.ActiveRecord;
+    using Castle.ActiveRecord.Framework.Config;
+    using Models;
+    public class Global : HttpApplication
+    {
 
-	public class GlobalApplication : HttpApplication
-	{
-		public GlobalApplication()
-		{
-		}
+        protected void Application_Start(object sender, EventArgs e)
+        {
+            ActiveRecordStarter.Initialize(typeof(Supplier).Assembly, ActiveRecordSectionHandler.Instance);
 
-		public void Application_OnStart()
-		{
-			ActiveRecordStarter.Initialize(ActiveRecordSectionHandler.Instance, 
-			                               new Type[] { typeof(Supplier), typeof(Product) });
-			
-			// If you want to let ActiveRecord create the schema for you:
-			ActiveRecordStarter.CreateSchema();
-		}
-
-		public void Application_OnEnd() 
-		{
-		}
-	}
+            // If you want to let ActiveRecord create the schema for you:
+            ActiveRecordStarter.CreateSchema();
+        }
+    }
 }
 </pre>
 
Index: creatingproject.xml
===================================================================
--- creatingproject.xml	(revision 5716)
+++ creatingproject.xml	(working copy)
@@ -130,7 +130,7 @@
 	<li>Castle.Components.Validator.dll: Our lightweight validation infrastructure</li>
 	<li>Castle.Components.Binder.dll: The binder implementation</li>
 	<li>Castle.Components.Common.EmailSender.dll: The email service contracts</li>
-	<li>Castle.Components.Common.EmailSender.SmtpEmailSender.dll: The email service implementation</li>
+	<li>Castle.Components.DictionaryAdapter.dll: Dictionary adapter implementation</li>
 	<li>Castle.Core.dll: Core functionalities shared by projects</li>
 	<li>NVelocity.dll: The template engine</li>
 	</ul>
@@ -199,30 +199,6 @@
 ]]></pre>
 
 		</li>
-
-		<li>
-		<p>Finally register the http module:</p>
-
-		<pre format="html"><![CDATA[
-	...
-	
-	<system.web>
-		<httpHandlers>
-			<add 
-				verb="*" 
-				path="*.castle" 
-				type="Castle.MonoRail.Framework.MonoRailHttpHandlerFactory, Castle.MonoRail.Framework" />
-		</httpHandlers>
-		<httpModules>
-			<add 
-				name="monorail" 
-				type="Castle.MonoRail.Framework.EngineContextModule, Castle.MonoRail.Framework" />
-		</httpModules>
-	</system.web>
-	
-</configuration>
-]]></pre>
-		</li>
 		
 	</ol>
 	
Index: crud.xml
===================================================================
--- crud.xml	(revision 5716)
+++ crud.xml	(working copy)
@@ -69,7 +69,7 @@
 <h3>Product list</h3>
 
 <p>
-<a href="new.rails">Create new Product</a>
+<a href="new.castle">Create new Product</a>
 </p>
 
 <table width="100%" border="1" cellpadding="2" cellspacing="0">
@@ -85,15 +85,15 @@
 	<td align="center">$product.Name</td>
 	<td align="center">$product.Supplier.Name</td>
 	<td align="center">
-		<a href="edit.rails?id=${product.Id}">Edit</a> | 
-		<a href="delete.rails?id=${product.Id}">Delete</a>
+		<a href="edit.castle?id=${product.Id}">Edit</a> | 
+		<a href="delete.castle?id=${product.Id}">Delete</a>
 	</td>
 </tr>
 #end
 </table>]]></pre>
 	
 	<p>
-	Test your working accessing <tt>/product/list.rails</tt>
+	Test your working accessing <tt>/product/list.castle</tt>
 	</p>
 	
 	<p>
@@ -155,7 +155,7 @@
 </p>
 #end
 
-<form action="create.rails" method="post">
+<form action="create.castle" method="post">
 
 	<p>
 	Name: $FormHelper.TextField("product.name")
@@ -178,7 +178,7 @@
 </form>]]></pre>
 	
 	<p>
-	Test your working accessing <tt>/product/new.rails</tt>
+	Test your working accessing <tt>/product/new.castle</tt>
 	</p>
 	
 	<p>
@@ -199,7 +199,7 @@
 	<pre format="cs">
 public void Edit(int id)
 {
-	PropertyBag["product"] = Product.FindById(id);
+	PropertyBag["product"] = Product.Find(id);
 	PropertyBag["suppliers"] = Supplier.FindAll();
 }
 
@@ -248,7 +248,7 @@
 </p>
 #end
 
-<form action="update.rails" method="post">
+<form action="update.castle" method="post">
 
 $FormHelper.HiddenField("product.id")
 
@@ -285,7 +285,7 @@
 	<pre format="cs">
 public void Delete(int id)
 {
-	Product product = Product.FindById(id);
+	var product = Product.Find(id);
 	
 	product.Delete();
 	
Index: scaffolding.xml
===================================================================
--- scaffolding.xml	(revision 5716)
+++ scaffolding.xml	(working copy)
@@ -31,7 +31,9 @@
 
 <ul>
 <li>Castle.MonoRail.ActiveRecordScaffold</li>
-<li>Castle.MonoRail.ActiveRecordSupport</li>
+<li>Castle.Components.Common.TemplateEngine</li>
+<li>Castle.Components.Common.TemplateEngine.NVelocityTemplateEngine.dll</li>
+<li>Castle.Components.Pagination.dll</li>
 </ul>
 </p>
 
@@ -67,7 +69,7 @@
 
 <p>
 That is it. Now run the application and direct your browser
-to <tt>/supplier/list.rails</tt>
+to <tt>/supplier/list.castle</tt>
 </p>
 
 <p>
Index: smartdispatcher.xml
===================================================================
--- smartdispatcher.xml	(revision 5716)
+++ smartdispatcher.xml	(working copy)
@@ -181,7 +181,7 @@
 We are interested in hearing from you.
 </p>
 
-<form action="SendContactMessage.rails" method="post">
+<form action="SendContactMessage.castle" method="post">
 
 <p>
 From: $FormHelper.TextField("contact.from")
@@ -276,7 +276,7 @@
 	
 	<p>
 	Now test your work by running the application
-	and accessing <tt>/contact/contactform.rails</tt>. Fill the form 
+	and accessing <tt>/contact/contactform.castle</tt>. Fill the form 
 	elements and submit it.
 	</p>
 	
