Merge branch '3.4.x'

Author: oskarb

src/.editorconfig

@@ -5,3 +5,6 @@ end_of_line = CRLF
 
 [*.cs]
 indent_style = tab
+
+[*.xsd]
+indent_style = tab

src/NHibernate/Cfg/Environment.cs

@@ -54,7 +54,7 @@ public static string Version
 
 					if (attrs != null && attrs.Length > 0)
 					{
-						cachedVersion = string.Format("{0} ({1})", thisAssembly.GetName().Version, attrs[0].InformationalVersion);
+						cachedVersion = string.Format("{0} (assembly {1})", attrs[0].InformationalVersion, thisAssembly.GetName().Version);
 					}
 					else
 					{

src/NHibernate/nhibernate-configuration.xsd

@@ -11,17 +11,17 @@
 		<xs:complexType>
 			<xs:sequence>
 				<xs:element ref="bytecode-provider" minOccurs="0" maxOccurs="1" >
-          <xs:annotation>
-            <xs:documentation>
-              There are 3 default short-cut values
-              - lcg     : default for .NET2.0 and higher.
-              - codedom : CodeDOM-based bytecode provider (mostly for .NET1.1).
-              - null    : Disable the reflection optimization completely.
-              In addition you can specify the AssemblyQualifiedName of your custom bytecode-provider (implementation of IBytecodeProvider).
-              Note: the bytecode-provider will be tooks in account only when specified in the app.config or web.config.
-            </xs:documentation>
-          </xs:annotation>
-        </xs:element>
+					<xs:annotation>
+						<xs:documentation>
+							There are 3 default short-cut values
+							- lcg     : default for .NET2.0 and higher.
+							- codedom : CodeDOM-based bytecode provider (mostly for .NET1.1).
+							- null    : Disable the reflection optimization completely.
+							In addition you can specify the AssemblyQualifiedName of your custom bytecode-provider (implementation of IBytecodeProvider).
+							Note: the bytecode-provider will be tooks in account only when specified in the app.config or web.config.
+						</xs:documentation>
+					</xs:annotation>
+				</xs:element>
 				<xs:element ref="reflection-optimizer" maxOccurs="1" minOccurs="0" />
 				<xs:element ref="session-factory" minOccurs="0" maxOccurs="1" />
 			</xs:sequence>
@@ -53,10 +53,10 @@
 	<xs:element name="mapping">
 		<xs:annotation>
 			<xs:documentation>
-			There are 3 possible combinations of mapping attributes
-			1 - resource &amp; assembly:  NHibernate will read the mapping resource from the specified assembly
-			2 - file only: NHibernate will read the mapping from the file.
-			3 - assembly only: NHibernate will find all the resources ending in hbm.xml from the assembly.
+				There are 3 possible combinations of mapping attributes
+				1 - resource &amp; assembly:  NHibernate will read the mapping resource from the specified assembly
+				2 - file only: NHibernate will read the mapping from the file.
+				3 - assembly only: NHibernate will find all the resources ending in hbm.xml from the assembly.
 			</xs:documentation>
 		</xs:annotation>
 		<xs:complexType>
@@ -114,8 +114,9 @@
 								<xs:enumeration value="format_sql" />
 								<xs:enumeration value="collectiontype.factory_class" />
 								<xs:enumeration value="interceptors.beforetransactioncompletion_ignore_exceptions" />
-                <xs:enumeration value="order_inserts" />
-              </xs:restriction>
+								<xs:enumeration value="order_inserts" />
+								<xs:enumeration value="linqtohql.generatorsregistry" />
+							</xs:restriction>
 						</xs:simpleType>
 					</xs:attribute>
 				</xs:extension>