Minor changes here and there

SVN: trunk@2629

Author: Pierre Henri Kuate

doc/reference/modules/basic_mapping.xml

@@ -66,7 +66,7 @@
 
             <para>
                 All XML mappings should declare the XML namespace shown. The actual schema definition
-                may be found in the <literal>src\nhibernate-mapping-2.2.xsd</literal> file in the
+                may be found in the <literal>src\nhibernate-mapping.xsd</literal> file in the
                 NHibernate distribution.
             </para>
 

doc/reference/modules/nhibernate_mapping_attributes.xml

@@ -38,7 +38,7 @@
 		<para>
 			<important>
 				<para>
-					This library is generated using the file <filename>/src/NHibernate.Mapping.Attributes/nhibernate-mapping-2.2.xsd</filename>
+					This library is generated using the file <filename>/src/NHibernate.Mapping.Attributes/nhibernate-mapping.xsd</filename>
 					(which is embedded in the assembly to be able to validate generated XML streams).
 					As this file can change at each new release of NHibernate, you should regenerate it before using it
 					with a different version (open the Generator solution, compile and run the Generator project).
@@ -231,7 +231,7 @@ Illustration:<programlisting><![CDATA[
 		X(3) will always belong to C(1) ! (as X(2)).
 		</para>
 		<para>It is the case for <literal>&lt;dynamic-component&gt;</literal> and <literal>&lt;nested-composite-element&gt;</literal>.</para>
-		<para>Another bad news is that, currently, XML elements coming after this elements can not be included in them. Eg: There is no way put a collection in <literal>&lt;dynamic-component&gt;</literal>. The reason is that the file <filename>nhibernate-mapping-2.2.xsd</filename> tells how elements are built and in which order, and NHibernate.Mapping.Attributes use this order.</para>
+		<para>Another bad news is that, currently, XML elements coming after this elements can not be included in them. Eg: There is no way put a collection in <literal>&lt;dynamic-component&gt;</literal>. The reason is that the file <filename>nhibernate-mapping.xsd</filename> tells how elements are built and in which order, and NHibernate.Mapping.Attributes use this order.</para>
 		<para>Anyway, the solution would be to add a <methodname>int ParentNode</methodname> property to BaseAttribute so that you can create a real graph...</para>
 		<para>For now, you can fallback on <classname>[RawXml]</classname>.</para>
 
@@ -242,21 +242,21 @@ Illustration:<programlisting><![CDATA[
 
 	<section id="mapping-attributes-devnotes">
 		<title>Developer Notes</title>
-		<para>Any change to the schema (<filename>nhibernate-mapping-2.2.xsd</filename>) implies:</para>
+		<para>Any change to the schema (<filename>nhibernate-mapping.xsd</filename>) implies:</para>
 		<orderedlist>
 			<listitem>
 				<para>Checking if there is any change to do in the Generator (like updating KnowEnums / AllowMultipleValue / IsRoot / IsSystemType / IsSystemEnum / CanContainItself)</para>
 			</listitem>
 			<listitem>
-				<para>Updating <filename>/src/NHibernate.Mapping.Attributes/nhibernate-mapping-2.2.xsd</filename> (copy/paste) and running the Generator again (even if it wasn't modified)</para>
+				<para>Updating <filename>/src/NHibernate.Mapping.Attributes/nhibernate-mapping.xsd</filename> (copy/paste) and running the Generator again (even if it wasn't modified)</para>
 			</listitem>
 			<listitem>
-				<para>Running the Test project and make sure that no exception is thrown. A class/property should be modified/added in this project to be sure that any new breaking change will be caught (=> update the reference hbm.xml files and/or the project <filename>NHibernate.Mapping.Attributes-1.1.csproj</filename>)</para>
+				<para>Running the Test project and make sure that no exception is thrown. A class/property should be modified/added in this project to be sure that any new breaking change will be caught (=> update the reference hbm.xml files and/or the project <filename>NHibernate.Mapping.Attributes-2.0.csproj</filename>)</para>
 			</listitem>
 		</orderedlist>
 		<para>This implementation is based on NHibernate mapping schema; so there is probably lot of "standard schema features" that are not supported...</para>
 		<para>The version of NHibernate.Mapping.Attributes should be the version of the NHibernate schema used to generate it (=> the version of NHibernate library).</para>
-		<para>In the design of this project, performance is a (<emphasis>very</emphasis>) minor goal :) Easier implementation and maintenance are far more important because you can (and should) avoid to use this library in production.</para>
+		<para>In the design of this project, performance is a (<emphasis>very</emphasis>) minor goal :) Easier implementation and maintenance are far more important because you can (and should) avoid to use this library in production (Cf. the first tip in <xref linkend="mapping-attributes-tips"/>).</para>
 	</section>
 
 

doc/reference/modules/performance.xml

@@ -808,12 +808,11 @@ ICat fritz = (ICat) iter.Current;]]></programlisting>
 
         <table frame="topbot">
             <title>Cache Concurrency Strategy Support</title>
-            <tgroup cols='5' align='left' colsep='1' rowsep='1'>
+            <tgroup cols='4' align='left' colsep='1' rowsep='1'>
             <colspec colname='c1' colwidth="1*"/>
             <colspec colname='c2' colwidth="1*"/>
             <colspec colname='c3' colwidth="1*"/>
             <colspec colname='c4' colwidth="1*"/>
-            <colspec colname='c5' colwidth="1*"/>
             <thead>
             <row>
               <entry>Cache</entry>
@@ -1116,15 +1115,15 @@ sessionFactory.EvictCollection("Eg.Cat.Kittens"); //evict all kitten collections
 
             <para>
                 However, suppose that we remove eighteen elements, leaving two and then add thee new elements.
-                There are two possible ways to proceed
+                There are two possible ways to proceed:
             </para>
 
             <itemizedlist>
             <listitem>
-                <para>delete eighteen rows one by one and then insert three rows</para>
+                <para>Delete eighteen rows one by one and then insert three rows</para>
             </listitem>
             <listitem>
-                <para>remove the whole collection (in one SQL <literal>DELETE</literal>) and insert
+                <para>Remove the whole collection (in one SQL <literal>DELETE</literal>) and insert
                 all five current elements (one by one)</para>
             </listitem>
             </itemizedlist>

doc/reference/modules/preface.xml

@@ -48,21 +48,23 @@
 			<para>
 				Use this reference documentation as your primary source of information.
 				Consider reading <emphasis>Hibernate in Action</emphasis>
-				(http://www.manning.com/bauer) if you need more help with application
-				design or if you prefer a step-by-step tutorial. Also visit
-				http://nhibernate.sourceforge.net/NHibernateEg/ for NHibernate
+				(<ulink url="http://www.manning.com/bauer/" />)
+				or the work-in-progress <emphasis>NHibernate in Action</emphasis>
+				(<ulink url="http://www.manning.com/kuate/" />) if you need more help
+				with application design or if you prefer a step-by-step tutorial. Also visit
+				<ulink url="http://nhibernate.sourceforge.net/NHibernateEg/" /> for NHibernate
 				tutorial with examples.
 			</para>
 		</listitem>
 		<listitem>
 			<para>
-				FAQs are answered on the NHibernate website.
+				FAQs are answered on the <ulink url="http://www.nhibernate.org/">NHibernate website</ulink>.
 			</para>
 		</listitem>
 		<listitem>
 			<para>
-				Third party demos, examples and tutorials are linked on the NHibernate
-				website.
+				Third party demos, examples and tutorials are linked on the
+				<ulink url="http://www.hibernate.org/365.html">NHibernate Resources page</ulink>.
 			</para>
 		</listitem>
 		<listitem>
@@ -75,10 +77,12 @@
 	 </orderedlist>
 
 	 <para>
-		 If you have questions, use the user forum linked on the NHibernate website. We also
-		 provide a JIRA issue trackings system for bug reports and feature requests. If you
-		 are interested in the development of NHibernate, join the developer mailing list. If
-		 you are interested in translating this documentation into your language, contact us
-		 on the developer mailing list.
+		 If you have questions, use the
+		 <ulink url="http://forum.hibernate.org/viewforum.php?f=25">NHibernate user forum</ulink>.
+		 We also provide a <ulink url="http://jira.nhibernate.org/">JIRA issue trackings system</ulink>
+		 for bug reports and feature requests.
+		 If you are interested in the development of NHibernate, join the developer mailing list.
+		 If you are interested in translating this documentation into your language, contact us
+		 on the <ulink url="http://sourceforge.net/mail/?group_id=29446">developer mailing list</ulink>.
 	 </para>
 </preface>

doc/reference/modules/transactions.xml

@@ -528,7 +528,7 @@ finally
             <listitem>
                 <para>
                     <literal>OnClose</literal> - is essentially the legacy behavior described above. The
-                    NHibernate session obatins a connection when it first needs to perform some database
+                    NHibernate session obtains a connection when it first needs to perform some database
                     access and holds unto that connection until the session is closed.
                 </para>
             </listitem>