Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat (limited to 'doc/org.eclipse.jet.doc/references/taglibs/javaTags/mergeTag.html')
-rw-r--r--doc/org.eclipse.jet.doc/references/taglibs/javaTags/mergeTag.html21
1 files changed, 10 insertions, 11 deletions
diff --git a/doc/org.eclipse.jet.doc/references/taglibs/javaTags/mergeTag.html b/doc/org.eclipse.jet.doc/references/taglibs/javaTags/mergeTag.html
index ab5e977..1fb457f 100644
--- a/doc/org.eclipse.jet.doc/references/taglibs/javaTags/mergeTag.html
+++ b/doc/org.eclipse.jet.doc/references/taglibs/javaTags/mergeTag.html
@@ -38,15 +38,6 @@
</TR>
</TBODY>
</TABLE>
-<exists node="tag/attribute use='required'">
-<HR>
-<TABLE border="1" width="100%">
- <TBODY>
- <TR>
- <TH colspan="2" align="left">Required Attributes</TH></TR>
- </TBODY>
-</TABLE>
-</exists>
<HR>
<TABLE border="1" width="100%">
<TBODY>
@@ -72,8 +63,16 @@
<TD width="10%"></TD>
<TD><SPAN style="font-family: monospace">
<!-- Begin merge example -->
-
- &lt;java:merge/&gt;<br>
+ <i>... template generating a .java or .properties file ...</i><BR><BR>
+ &lt;%-- Merge the generated contents with any existing file, using the standard JMerge rules --%&gt;<BR>
+ &lt;java:merge/&gt;<br><br>
+
+ &lt;%-- Merge using custom JMerge rules --%&gt;<BR>
+ &lt;java:merge rules=&quot;myMergeRules.xml&quot; rulesContext=&quot;transform&quot;/&gt;<br><br>
+
+ &lt;%-- Explicit use of EMF Codegen merge rules (same as first) --%&gt;<BR>
+ &lt;java:merge rules=&quot;platform:/plugin/org.eclipse.emf.codegen.ecore/templates/emf-merge.xml&quot;/&gt;<br><br>
+
<!-- End merge example -->
</SPAN></TD>
</TR>

Back to the top