1 files changed, 18 insertions, 46 deletions
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/tasks012.htm b/jpa/plugins/org.eclipse.jpt.doc.user/tasks012.htm
index 15bcd589b9..9a48136628 100644
--- a/jpa/plugins/org.eclipse.jpt.doc.user/tasks012.htm
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/tasks012.htm
@@ -2,7 +2,7 @@
     "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head>
-<!-- Run date = May 3, 2007 9:19:10 -->
+<!-- Run date = May 9, 2007 10:03:43 -->
 <meta name="OAC_IGNORE_SKIP_NAV" content="true" />
 <title>Many-to-one mapping</title>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii" />
@@ -29,7 +29,7 @@
 </td>
 </tr>
 </table>
-<p><a id="sthref130" name="sthref130"></a><a id="sthref131" name="sthref131"></a><a id="sthref132" name="sthref132"></a><a id="sthref133" name="sthref133"></a>Use a <span class="bold">Many-to-One</span> mapping to defines a single-valued association to another entity class that has many-to-one multiplicity.</p>
+<p><a id="sthref133" name="sthref133"></a><a id="sthref134" name="sthref134"></a><a id="sthref135" name="sthref135"></a><a id="sthref136" name="sthref136"></a>Use a <span class="bold">Many-to-One</span> mapping to defines a single-valued association to another entity class that has many-to-one multiplicity.</p>
 <ol type="1" start="1">
 <li>
 <p>In the <a href="ref_persistence_outline.htm#BABEGGFE">JPA Structure view</a>, select the field to map. The <a href="ref_persistence_map_view.htm#BABIFBAF">JPA Details view (for attributes)</a> displays the properties for the selected.</p>
@@ -43,22 +43,22 @@
 <table class="RuleInformal" title="This table lists the fields ion the General tab for this mapping." summary="This table lists the fields ion the General tab for this mapping." dir="ltr" border="1" width="100%" frame="border" rules="all" cellpadding="3" cellspacing="0">
 <thead>
 <tr align="left" valign="top">
-<th align="left" valign="bottom" id="r1c1-t10">Property</th>
-<th align="left" valign="bottom" id="r1c2-t10">Description</th>
-<th align="left" valign="bottom" id="r1c3-t10">Default</th>
+<th align="left" valign="bottom" id="r1c1-t11">Property</th>
+<th align="left" valign="bottom" id="r1c2-t11">Description</th>
+<th align="left" valign="bottom" id="r1c3-t11">Default</th>
 </tr>
 </thead>
 <tbody>
 <tr align="left" valign="top">
-<td align="left" id="r2c1-t10" headers="r1c1-t10">Target Entity</td>
-<td align="left" headers="r2c1-t10 r1c2-t10">The entity to which this attribute is mapped.</td>
-<td align="left" headers="r2c1-t10 r1c3-t10">null
+<td align="left" id="r2c1-t11" headers="r1c1-t11">Target Entity</td>
+<td align="left" headers="r2c1-t11 r1c2-t11">The entity to which this attribute is mapped.</td>
+<td align="left" headers="r2c1-t11 r1c3-t11">null
 <p>You do not need to explicitly specify the target entity, since it can be inferred from the type of object being referenced.</p>
 </td>
 </tr>
 <tr align="left" valign="top">
-<td align="left" id="r3c1-t10" headers="r1c1-t10">Fetch Type</td>
-<td align="left" headers="r3c1-t10 r1c2-t10">Defines how data is loaded from the database. See <a href="ref_mapping_general.htm#CACGGGHB">"Fetch Type"</a> for details.
+<td align="left" id="r3c1-t11" headers="r1c1-t11">Fetch Type</td>
+<td align="left" headers="r3c1-t11 r1c2-t11">Defines how data is loaded from the database. See <a href="ref_mapping_general.htm#CACGGGHB">"Fetch Type"</a> for details.
 <ul>
 <li type="disc">
 <p>Eager</p>
@@ -68,58 +68,30 @@
 </li>
 </ul>
 </td>
-<td align="left" headers="r3c1-t10 r1c3-t10">Eager</td>
-</tr>
-<tr align="left" valign="top">
-<td align="left" id="r4c1-t10" headers="r1c1-t10">Cascade Type</td>
-<td align="left" headers="r4c1-t10 r1c2-t10">See <a href="ref_mapping_general.htm#CACJAIHB">"Cascade Type"</a> for details.
-<ul>
-<li type="disc">
-<p>Default</p>
-</li>
-<li type="disc">
-<p>All</p>
-</li>
-<li type="disc">
-<p>Persist</p>
-</li>
-<li type="disc">
-<p>Merge</p>
-</li>
-<li type="disc">
-<p>Remove</p>
-</li>
-</ul>
-</td>
-<td align="left" headers="r4c1-t10 r1c3-t10">Default</td>
-</tr>
-<tr align="left" valign="top">
-<td align="left" id="r5c1-t10" headers="r1c1-t10">Optional</td>
-<td align="left" headers="r5c1-t10 r1c2-t10">Specifies if this field is can be null.</td>
-<td align="left" headers="r5c1-t10 r1c3-t10">Yes</td>
+<td align="left" headers="r3c1-t11 r1c3-t11">Eager</td>
 </tr>
 </tbody>
 </table>
 <br /></div>
 <!-- class="inftblruleinformal" --></li>
 <li>
-<p>Use this table to complete the fields on the <a href="reference006.htm#CACFCEJC">Join Columns Information</a> tab in the <span class="gui-object-title">JPA Details</span> view.</p>
+<p>Use this table to complete the fields on the <a href="reference007.htm#CACFCEJC">Join Columns Information</a> tab in the <span class="gui-object-title">JPA Details</span> view.</p>
 <div class="inftblruleinformal">
 <table class="RuleInformal" title="This table lists the fields in the Persistence Properties view for this mapping." summary="This table lists the fields in the Persistence Properties view for this mapping." dir="ltr" border="1" width="100%" frame="border" rules="all" cellpadding="3" cellspacing="0">
 <thead>
 <tr align="left" valign="top">
-<th align="left" valign="bottom" id="r1c1-t11">Property</th>
-<th align="left" valign="bottom" id="r1c2-t11">Description</th>
-<th align="left" valign="bottom" id="r1c3-t11">Default</th>
+<th align="left" valign="bottom" id="r1c1-t12">Property</th>
+<th align="left" valign="bottom" id="r1c2-t12">Description</th>
+<th align="left" valign="bottom" id="r1c3-t12">Default</th>
 </tr>
 </thead>
 <tbody>
 <tr align="left" valign="top">
-<td align="left" id="r2c1-t11" headers="r1c1-t11">Join Column</td>
-<td align="left" headers="r2c1-t11 r1c2-t11"><a id="sthref134" name="sthref134"></a><a id="sthref135" name="sthref135"></a>Specify a mapped column for joining an entity association. This field corresponds to the <code>@JoinColum</code> attribute.
+<td align="left" id="r2c1-t12" headers="r1c1-t12">Join Column</td>
+<td align="left" headers="r2c1-t12 r1c2-t12"><a id="sthref137" name="sthref137"></a><a id="sthref138" name="sthref138"></a>Specify a mapped column for joining an entity association. This field corresponds to the <code>@JoinColum</code> attribute.
 <p>Select <span class="bold">Override Default</span>, then Add, Edit, or Remove the join columns.</p>
 </td>
-<td align="left" headers="r2c1-t11 r1c3-t11">By default, the mapping is assumed to have a single join.</td>
+<td align="left" headers="r2c1-t12 r1c3-t12">By default, the mapping is assumed to have a single join.</td>
 </tr>
 </tbody>
 </table>