[Nhibernate-commit] nhibernate/doc/reference/en/modules basic_mapping.xml,1.12,1.13

[Michael D. <mik...@us...>]

Update of /cvsroot/nhibernate/nhibernate/doc/reference/en/modules
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12185

Modified Files:
	basic_mapping.xml 
Log Message:
added some mods made in latest cvs commits.

Index: basic_mapping.xml
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/doc/reference/en/modules/basic_mapping.xml,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** basic_mapping.xml	6 Apr 2005 18:25:27 -0000	1.12
--- basic_mapping.xml	4 May 2005 03:13:17 -0000	1.13
***************
*** 32,38 ****
  		<programlisting><![CDATA[
  <?xml version="1.0" ?>
! <hibernate-mapping xmlns="urn:nhibernate-mapping-2.0">
  
! 	<class name="Eg.Cat, Eg" table="CATS" discriminator-value="C">
  		<id name="Id" column="uid" type="Int64">
  			<generator class="hilo"/>
--- 32,39 ----
  		<programlisting><![CDATA[
  <?xml version="1.0" ?>
! <hibernate-mapping xmlns="urn:nhibernate-mapping-2.0"
! 	namespace="Eg" assembly="Eg">
  
! 	<class name="Cat" table="CATS" discriminator-value="C">
  		<id name="Id" column="uid" type="Int64">
  			<generator class="hilo"/>
***************
*** 46,57 ****
  		<set name="Kittens">
  			<key column="mother_id"/>
! 			<one-to-many class="Eg.Cat, Eg"/>
  		</set>
! 		<subclass name="Eg.DomesticCat, Eg" discriminator-value="D">
  			<property name="Name" type="String"/>
  		</subclass>
  	</class>
  
! 	<class name="Eg.Dog, Eg">
  		<!-- mapping for Dog could go here -->
  	</class>
--- 47,58 ----
  		<set name="Kittens">
  			<key column="mother_id"/>
! 			<one-to-many class="Cat"/>
  		</set>
! 		<subclass name="DomesticCat" discriminator-value="D">
  			<property name="Name" type="String"/>
  		</subclass>
  	</class>
  
! 	<class name="Dog">
  		<!-- mapping for Dog could go here -->
  	</class>
***************
*** 104,107 ****
--- 105,110 ----
  	auto-import="true|false" <co id="hm3-co" linkends="hm3" />
  	default-access="property|field|nosetter|ClassName" <co id="hm4-co" linkends="hm4" />
+ 	assembly="assembly.name" <co id="hm5-co" linkends="hm5" />
+ 	namespace="namespace.name" <co id="hm6-co" linkends="hm6" />
  &gt; </programlisting>
  			<calloutlist>
***************
*** 111,115 ****
  						</para>
  					</callout>
- 	
  					<callout arearefs="hm2-co" id="hm2">
  						<para>
--- 114,117 ----
***************
*** 118,122 ****
  						</para>
  					</callout>
- 	
  					<callout arearefs="hm3-co" id="hm3">
  						<para>
--- 120,123 ----
***************
*** 132,136 ****
  						</para>
  					</callout>
! 					
  				</calloutlist>
  			
--- 133,149 ----
  						</para>
  					</callout>
! 					<callout arearefs="hm5-co" id="hm5">
! 						<para>
! 							<literal>assembly</literal> (optional):
! 							Specifies an Assembly to assume for any class names that don't have the
! 							Assembly specified.
! 						</para>
! 					</callout>
! 					<callout arearefs="hm6-co" id="hm6">
! 						<para>
! 							<literal>namespace</literal> (optional):  Specifies a namespace prefix 
! 							to assume for unqualified class names in the mapping document.
! 						</para>
! 					</callout>
  				</calloutlist>
  			
***************
*** 163,166 ****
--- 176,180 ----
  	where="arbitrary sql where condition"<co id="class10-co" linkends="class10" />
  	persister="PersisterClass"<co id="class11-co" linkends="class11" />
+ 	lazy="true|false"<co id="class12-co" linkends="class12" />
  /&gt;</programlisting>
  			<calloutlist>
***************
*** 231,235 ****
  						<literal>persister</literal> (optional): Specifies a custom <literal>IClassPersister</literal>.
  					</para>
! 				</callout>                 
  			</calloutlist>
  	
--- 245,256 ----
  						<literal>persister</literal> (optional): Specifies a custom <literal>IClassPersister</literal>.
  					</para>
! 				</callout>                   
! 				<callout arearefs="class12-co" id="class12">
! 					<para>
! 						<literal>lazy</literal>(optional): Setting <literal>lazy="true"</literal> is a shortcut 
! 						equalivalent to specifying the name of the class itself as the <literal>proxy</literal>
! 						interface.
! 					</para>
! 				</callout>                
  			</calloutlist>