Big hunk of merge.

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/WCM-DEV2/root@3265 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261

config/alfresco/avm-context.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE beans PUBLIC "-//SPRING/DTD BEAN//EN"
+	"http://www.springframework.org/dtd/spring-beans.dtd">
+<beans>
+</beans>

config/alfresco/extension/custom-db-connection.properties.sample

@@ -29,4 +29,12 @@
 # SQLServer connection (requires jdts-1.2.jar or equivalent - http://jtds.sourceforge.net/)
 #
 #db.driver=net.sourceforge.jtds.jdbc.Driver
-#db.url=jdbc:jtds:sqlserver://your-server-name/alfresco
+#db.url=jdbc:jtds:sqlserver://localhost/alfresco
+
+#
+# SQLServer connection using Microsoft JDDB driver
+#
+#db.username=sa
+#db.password=sa
+#db.driver=com.microsoft.sqlserver.jdbc.SQLServerDriver
+#db.url=jdbc:sqlserver://localhost;DatabaseName=alfresco

config/alfresco/repository.properties

@@ -69,7 +69,7 @@ mail.port=25
 mail.username=anonymous
 mail.password=
 # Set this value to UTF-8 or similar for encoding of email messages as required
-mail.encoding=
+mail.encoding=UTF-8
 
 # System Configuration
 

config/alfresco/version.properties

@@ -5,7 +5,7 @@
 # Version label
 
 version.major=1
-version.minor=3
+version.minor=4
 version.revision=0
 version.label=RC2 (dev)