[77413] updates to  Defining Generics with UML Templates
diff --git a/docs/articles/Defining_Generics_with_UML_Templates/article.html b/docs/articles/Defining_Generics_with_UML_Templates/article.html
index 04d5c5e..f7b281b 100644
--- a/docs/articles/Defining_Generics_with_UML_Templates/article.html
+++ b/docs/articles/Defining_Generics_with_UML_Templates/article.html
@@ -31,18 +31,18 @@
   <o:Author>jbruck</o:Author>
   <o:Template>Normal</o:Template>
   <o:LastAuthor>jbruck</o:LastAuthor>
-  <o:Revision>738</o:Revision>
-  <o:TotalTime>24742</o:TotalTime>
+  <o:Revision>740</o:Revision>
+  <o:TotalTime>24746</o:TotalTime>
   <o:LastPrinted>2006-09-12T15:08:00Z</o:LastPrinted>
   <o:Created>2004-07-06T14:17:00Z</o:Created>
-  <o:LastSaved>2007-09-17T22:15:00Z</o:LastSaved>
-  <o:Pages>2</o:Pages>
-  <o:Words>2887</o:Words>
-  <o:Characters>16459</o:Characters>
+  <o:LastSaved>2007-09-17T22:29:00Z</o:LastSaved>
+  <o:Pages>1</o:Pages>
+  <o:Words>2888</o:Words>
+  <o:Characters>16465</o:Characters>
   <o:Company>IBM</o:Company>
   <o:Lines>137</o:Lines>
   <o:Paragraphs>38</o:Paragraphs>
-  <o:CharactersWithSpaces>19308</o:CharactersWithSpaces>
+  <o:CharactersWithSpaces>19315</o:CharactersWithSpaces>
   <o:Version>10.6830</o:Version>
  </o:DocumentProperties>
 </xml><![endif]--><!--[if gte mso 9]><xml>
@@ -75,13 +75,6 @@
 	mso-font-pitch:variable;
 	mso-font-signature:3 0 0 0 1 0;}
 @font-face
-	{font-family:Wingdings;
-	panose-1:5 0 0 0 0 0 0 0 0 0;
-	mso-font-charset:2;
-	mso-generic-font-family:auto;
-	mso-font-pitch:variable;
-	mso-font-signature:0 268435456 0 0 -2147483648 0;}
-@font-face
 	{font-family:"MS Mincho";
 	panose-1:2 2 6 9 4 2 5 8 3 4;
 	mso-font-alt:"\FF2D\FF33 \660E\671D";
@@ -273,201 +266,350 @@
 	{mso-level-tab-stop:.5in;
 	mso-level-number-position:left;
 	text-indent:-.25in;}
-@list l1
-	{mso-list-id:105926845;
-	mso-list-template-ids:303988458;}
-@list l1:level1
-	{mso-level-tab-stop:.5in;
+@list l0:level2
+	{mso-level-tab-stop:1.0in;
 	mso-level-number-position:left;
 	text-indent:-.25in;}
-@list l1:level2
-	{mso-level-number-format:alpha-lower;
-	mso-level-tab-stop:1.0in;
+@list l0:level3
+	{mso-level-tab-stop:1.5in;
 	mso-level-number-position:left;
 	text-indent:-.25in;}
-@list l1:level3
-	{mso-level-number-format:roman-lower;
-	mso-level-tab-stop:1.5in;
-	mso-level-number-position:right;
-	text-indent:-9.0pt;}
-@list l1:level4
+@list l0:level4
 	{mso-level-tab-stop:2.0in;
 	mso-level-number-position:left;
 	text-indent:-.25in;}
-@list l1:level5
-	{mso-level-number-format:alpha-lower;
-	mso-level-tab-stop:2.5in;
+@list l0:level5
+	{mso-level-tab-stop:2.5in;
 	mso-level-number-position:left;
 	text-indent:-.25in;}
-@list l1:level6
-	{mso-level-number-format:roman-lower;
-	mso-level-tab-stop:3.0in;
-	mso-level-number-position:right;
-	text-indent:-9.0pt;}
-@list l1:level7
+@list l0:level6
+	{mso-level-tab-stop:3.0in;
+	mso-level-number-position:left;
+	text-indent:-.25in;}
+@list l0:level7
 	{mso-level-tab-stop:3.5in;
 	mso-level-number-position:left;
 	text-indent:-.25in;}
-@list l1:level8
-	{mso-level-number-format:alpha-lower;
-	mso-level-tab-stop:4.0in;
+@list l0:level8
+	{mso-level-tab-stop:4.0in;
 	mso-level-number-position:left;
 	text-indent:-.25in;}
-@list l1:level9
-	{mso-level-number-format:roman-lower;
-	mso-level-tab-stop:4.5in;
-	mso-level-number-position:right;
-	text-indent:-9.0pt;}
+@list l0:level9
+	{mso-level-tab-stop:4.5in;
+	mso-level-number-position:left;
+	text-indent:-.25in;}
+@list l1
+	{mso-list-id:195701691;
+	mso-list-template-ids:-485840268;}
 @list l2
-	{mso-list-id:120349545;
+	{mso-list-id:297878226;
 	mso-list-type:hybrid;
-	mso-list-template-ids:-224357134 67698703 67698713 67698715 67698703 67698713 67698715 67698703 67698713 67698715;}
+	mso-list-template-ids:1290409668 67698691 67698691 67698693 67698689 67698691 67698693 67698689 67698691 67698693;}
 @list l2:level1
-	{mso-level-tab-stop:.5in;
+	{mso-level-number-format:bullet;
+	mso-level-text:o;
+	mso-level-tab-stop:.5in;
+	mso-level-number-position:left;
+	text-indent:-.25in;
+	font-family:"Courier New";}
+@list l2:level2
+	{mso-level-tab-stop:1.0in;
+	mso-level-number-position:left;
+	text-indent:-.25in;}
+@list l2:level3
+	{mso-level-tab-stop:1.5in;
+	mso-level-number-position:left;
+	text-indent:-.25in;}
+@list l2:level4
+	{mso-level-tab-stop:2.0in;
+	mso-level-number-position:left;
+	text-indent:-.25in;}
+@list l2:level5
+	{mso-level-tab-stop:2.5in;
+	mso-level-number-position:left;
+	text-indent:-.25in;}
+@list l2:level6
+	{mso-level-tab-stop:3.0in;
+	mso-level-number-position:left;
+	text-indent:-.25in;}
+@list l2:level7
+	{mso-level-tab-stop:3.5in;
+	mso-level-number-position:left;
+	text-indent:-.25in;}
+@list l2:level8
+	{mso-level-tab-stop:4.0in;
+	mso-level-number-position:left;
+	text-indent:-.25in;}
+@list l2:level9
+	{mso-level-tab-stop:4.5in;
 	mso-level-number-position:left;
 	text-indent:-.25in;}
 @list l3
-	{mso-list-id:247617834;
-	mso-list-template-ids:303988458;}
+	{mso-list-id:985623800;
+	mso-list-type:hybrid;
+	mso-list-template-ids:1387151514 67698703 67698713 67698715 67698703 67698713 67698715 67698703 67698713 67698715;}
 @list l3:level1
 	{mso-level-tab-stop:.5in;
 	mso-level-number-position:left;
 	text-indent:-.25in;}
 @list l3:level2
-	{mso-level-number-format:alpha-lower;
-	mso-level-tab-stop:1.0in;
+	{mso-level-tab-stop:1.0in;
 	mso-level-number-position:left;
 	text-indent:-.25in;}
 @list l3:level3
-	{mso-level-number-format:roman-lower;
-	mso-level-tab-stop:1.5in;
-	mso-level-number-position:right;
-	text-indent:-9.0pt;}
+	{mso-level-tab-stop:1.5in;
+	mso-level-number-position:left;
+	text-indent:-.25in;}
 @list l3:level4
 	{mso-level-tab-stop:2.0in;
 	mso-level-number-position:left;
 	text-indent:-.25in;}
 @list l3:level5
-	{mso-level-number-format:alpha-lower;
-	mso-level-tab-stop:2.5in;
+	{mso-level-tab-stop:2.5in;
 	mso-level-number-position:left;
 	text-indent:-.25in;}
 @list l3:level6
-	{mso-level-number-format:roman-lower;
-	mso-level-tab-stop:3.0in;
-	mso-level-number-position:right;
-	text-indent:-9.0pt;}
+	{mso-level-tab-stop:3.0in;
+	mso-level-number-position:left;
+	text-indent:-.25in;}
 @list l3:level7
 	{mso-level-tab-stop:3.5in;
 	mso-level-number-position:left;
 	text-indent:-.25in;}
 @list l3:level8
-	{mso-level-number-format:alpha-lower;
-	mso-level-tab-stop:4.0in;
+	{mso-level-tab-stop:4.0in;
 	mso-level-number-position:left;
 	text-indent:-.25in;}
 @list l3:level9
-	{mso-level-number-format:roman-lower;
-	mso-level-tab-stop:4.5in;
-	mso-level-number-position:right;
-	text-indent:-9.0pt;}
+	{mso-level-tab-stop:4.5in;
+	mso-level-number-position:left;
+	text-indent:-.25in;}
 @list l4
-	{mso-list-id:260646622;
+	{mso-list-id:1075471096;
+	mso-list-template-ids:292181416;}
+@list l5
+	{mso-list-id:1184899670;
 	mso-list-type:hybrid;
-	mso-list-template-ids:2021130386 67698703 67698713 67698715 67698703 67698713 67698715 67698703 67698713 67698715;}
-@list l4:level1
+	mso-list-template-ids:-45207776 67698703 67698713 67698715 67698703 67698713 67698715 67698703 67698713 67698715;}
+@list l5:level1
 	{mso-level-tab-stop:.5in;
 	mso-level-number-position:left;
 	text-indent:-.25in;}
-@list l5
-	{mso-list-id:297878226;
+@list l5:level2
+	{mso-level-tab-stop:1.0in;
+	mso-level-number-position:left;
+	text-indent:-.25in;}
+@list l5:level3
+	{mso-level-tab-stop:1.5in;
+	mso-level-number-position:left;
+	text-indent:-.25in;}
+@list l5:level4
+	{mso-level-tab-stop:2.0in;
+	mso-level-number-position:left;
+	text-indent:-.25in;}
+@list l5:level5
+	{mso-level-tab-stop:2.5in;
+	mso-level-number-position:left;
+	text-indent:-.25in;}
+@list l5:level6
+	{mso-level-tab-stop:3.0in;
+	mso-level-number-position:left;
+	text-indent:-.25in;}
+@list l5:level7
+	{mso-level-tab-stop:3.5in;
+	mso-level-number-position:left;
+	text-indent:-.25in;}
+@list l5:level8
+	{mso-level-tab-stop:4.0in;
+	mso-level-number-position:left;
+	text-indent:-.25in;}
+@list l5:level9
+	{mso-level-tab-stop:4.5in;
+	mso-level-number-position:left;
+	text-indent:-.25in;}
+@list l6
+	{mso-list-id:1224634209;
 	mso-list-type:hybrid;
-	mso-list-template-ids:1290409668 67698691 67698691 67698693 67698689 67698691 67698693 67698689 67698691 67698693;}
-@list l5:level1
+	mso-list-template-ids:1234604792 67698691 67698691 67698693 67698689 67698691 67698693 67698689 67698691 67698693;}
+@list l6:level1
 	{mso-level-number-format:bullet;
 	mso-level-text:o;
 	mso-level-tab-stop:.5in;
 	mso-level-number-position:left;
 	text-indent:-.25in;
 	font-family:"Courier New";}
-@list l6
-	{mso-list-id:439380925;
-	mso-list-type:hybrid;
-	mso-list-template-ids:414216240 67698703 67698713 67698715 67698703 67698713 67698715 67698703 67698713 67698715;}
-@list l6:level1
-	{mso-level-tab-stop:.5in;
+@list l6:level2
+	{mso-level-tab-stop:1.0in;
+	mso-level-number-position:left;
+	text-indent:-.25in;}
+@list l6:level3
+	{mso-level-tab-stop:1.5in;
+	mso-level-number-position:left;
+	text-indent:-.25in;}
+@list l6:level4
+	{mso-level-tab-stop:2.0in;
+	mso-level-number-position:left;
+	text-indent:-.25in;}
+@list l6:level5
+	{mso-level-tab-stop:2.5in;
+	mso-level-number-position:left;
+	text-indent:-.25in;}
+@list l6:level6
+	{mso-level-tab-stop:3.0in;
+	mso-level-number-position:left;
+	text-indent:-.25in;}
+@list l6:level7
+	{mso-level-tab-stop:3.5in;
+	mso-level-number-position:left;
+	text-indent:-.25in;}
+@list l6:level8
+	{mso-level-tab-stop:4.0in;
+	mso-level-number-position:left;
+	text-indent:-.25in;}
+@list l6:level9
+	{mso-level-tab-stop:4.5in;
 	mso-level-number-position:left;
 	text-indent:-.25in;}
 @list l7
-	{mso-list-id:564030215;
+	{mso-list-id:1356535618;
 	mso-list-type:hybrid;
-	mso-list-template-ids:-1783324934 67698703 67698713 67698715 67698703 67698713 67698715 67698703 67698713 67698715;}
+	mso-list-template-ids:-556531444 67698703 67698713 67698715 67698703 67698713 67698715 67698703 67698713 67698715;}
 @list l7:level1
 	{mso-level-tab-stop:.5in;
 	mso-level-number-position:left;
 	text-indent:-.25in;}
-@list l8
-	{mso-list-id:681786722;
-	mso-list-type:hybrid;
-	mso-list-template-ids:1239840670 67698703 67698713 67698715 67698703 67698713 67698715 67698703 67698713 67698715;}
-@list l8:level1
-	{mso-level-tab-stop:.5in;
+@list l7:level2
+	{mso-level-tab-stop:1.0in;
 	mso-level-number-position:left;
 	text-indent:-.25in;}
+@list l7:level3
+	{mso-level-tab-stop:1.5in;
+	mso-level-number-position:left;
+	text-indent:-.25in;}
+@list l7:level4
+	{mso-level-tab-stop:2.0in;
+	mso-level-number-position:left;
+	text-indent:-.25in;}
+@list l7:level5
+	{mso-level-tab-stop:2.5in;
+	mso-level-number-position:left;
+	text-indent:-.25in;}
+@list l7:level6
+	{mso-level-tab-stop:3.0in;
+	mso-level-number-position:left;
+	text-indent:-.25in;}
+@list l7:level7
+	{mso-level-tab-stop:3.5in;
+	mso-level-number-position:left;
+	text-indent:-.25in;}
+@list l7:level8
+	{mso-level-tab-stop:4.0in;
+	mso-level-number-position:left;
+	text-indent:-.25in;}
+@list l7:level9
+	{mso-level-tab-stop:4.5in;
+	mso-level-number-position:left;
+	text-indent:-.25in;}
+@list l8
+	{mso-list-id:1449008647;
+	mso-list-template-ids:1626134656;}
 @list l9
-	{mso-list-id:985623800;
+	{mso-list-id:1490828746;
 	mso-list-type:hybrid;
-	mso-list-template-ids:1387151514 67698703 67698713 67698715 67698703 67698713 67698715 67698703 67698713 67698715;}
+	mso-list-template-ids:2099921038 67698703 67698713 67698715 67698703 67698713 67698715 67698703 67698713 67698715;}
 @list l9:level1
 	{mso-level-tab-stop:.5in;
 	mso-level-number-position:left;
 	text-indent:-.25in;}
+@list l9:level2
+	{mso-level-tab-stop:1.0in;
+	mso-level-number-position:left;
+	text-indent:-.25in;}
+@list l9:level3
+	{mso-level-tab-stop:1.5in;
+	mso-level-number-position:left;
+	text-indent:-.25in;}
+@list l9:level4
+	{mso-level-tab-stop:2.0in;
+	mso-level-number-position:left;
+	text-indent:-.25in;}
+@list l9:level5
+	{mso-level-tab-stop:2.5in;
+	mso-level-number-position:left;
+	text-indent:-.25in;}
+@list l9:level6
+	{mso-level-tab-stop:3.0in;
+	mso-level-number-position:left;
+	text-indent:-.25in;}
+@list l9:level7
+	{mso-level-tab-stop:3.5in;
+	mso-level-number-position:left;
+	text-indent:-.25in;}
+@list l9:level8
+	{mso-level-tab-stop:4.0in;
+	mso-level-number-position:left;
+	text-indent:-.25in;}
+@list l9:level9
+	{mso-level-tab-stop:4.5in;
+	mso-level-number-position:left;
+	text-indent:-.25in;}
 @list l10
-	{mso-list-id:1079403071;
-	mso-list-type:hybrid;
-	mso-list-template-ids:-913438976 67698691 67698691 67698693 67698689 67698691 67698693 67698689 67698691 67698693;}
-@list l10:level1
-	{mso-level-number-format:bullet;
-	mso-level-text:o;
-	mso-level-tab-stop:.5in;
-	mso-level-number-position:left;
-	text-indent:-.25in;
-	font-family:"Courier New";}
+	{mso-list-id:1737776321;
+	mso-list-template-ids:1149025684;}
 @list l11
-	{mso-list-id:1141077762;
-	mso-list-type:hybrid;
-	mso-list-template-ids:-491230574 67698703 67698713 67698715 67698703 67698713 67698715 67698703 67698713 67698715;}
-@list l11:level1
-	{mso-level-tab-stop:.5in;
-	mso-level-number-position:left;
-	text-indent:-.25in;}
+	{mso-list-id:1878395768;
+	mso-list-template-ids:1260412326;}
 @list l12
-	{mso-list-id:1174611236;
-	mso-list-type:hybrid;
-	mso-list-template-ids:831429086 67698703 67698713 67698715 67698703 67698713 67698715 67698703 67698713 67698715;}
-@list l12:level1
-	{mso-level-tab-stop:.5in;
-	mso-level-number-position:left;
-	text-indent:-.25in;}
+	{mso-list-id:1933975461;
+	mso-list-template-ids:1312611384;}
 @list l13
-	{mso-list-id:1184899670;
+	{mso-list-id:1969629405;
 	mso-list-type:hybrid;
-	mso-list-template-ids:-45207776 67698703 67698713 67698715 67698703 67698713 67698715 67698703 67698713 67698715;}
+	mso-list-template-ids:-1313463162 67698703 67698713 67698715 67698703 67698713 67698715 67698703 67698713 67698715;}
 @list l13:level1
 	{mso-level-tab-stop:.5in;
 	mso-level-number-position:left;
 	text-indent:-.25in;}
-@list l14
-	{mso-list-id:1224634209;
-	mso-list-type:hybrid;
-	mso-list-template-ids:1234604792 67698691 67698691 67698693 67698689 67698691 67698693 67698689 67698691 67698693;}
-@list l14:level1
-	{mso-level-number-format:bullet;
-	mso-level-text:o;
-	mso-level-tab-stop:.5in;
+@list l13:level2
+	{mso-level-tab-stop:1.0in;
 	mso-level-number-position:left;
-	text-indent:-.25in;
-	font-family:"Courier New";}
+	text-indent:-.25in;}
+@list l13:level3
+	{mso-level-tab-stop:1.5in;
+	mso-level-number-position:left;
+	text-indent:-.25in;}
+@list l13:level4
+	{mso-level-tab-stop:2.0in;
+	mso-level-number-position:left;
+	text-indent:-.25in;}
+@list l13:level5
+	{mso-level-tab-stop:2.5in;
+	mso-level-number-position:left;
+	text-indent:-.25in;}
+@list l13:level6
+	{mso-level-tab-stop:3.0in;
+	mso-level-number-position:left;
+	text-indent:-.25in;}
+@list l13:level7
+	{mso-level-tab-stop:3.5in;
+	mso-level-number-position:left;
+	text-indent:-.25in;}
+@list l13:level8
+	{mso-level-tab-stop:4.0in;
+	mso-level-number-position:left;
+	text-indent:-.25in;}
+@list l13:level9
+	{mso-level-tab-stop:4.5in;
+	mso-level-number-position:left;
+	text-indent:-.25in;}
+@list l14
+	{mso-list-id:1975402694;
+	mso-list-type:hybrid;
+	mso-list-template-ids:1530842176 67698703 67698713 67698715 67698703 67698713 67698715 67698703 67698713 67698715;}
+@list l14:level1
+	{mso-level-tab-stop:.5in;
+	mso-level-number-position:left;
+	text-indent:-.25in;}
 @list l14:level2
 	{mso-level-tab-stop:1.0in;
 	mso-level-number-position:left;
@@ -501,189 +643,48 @@
 	mso-level-number-position:left;
 	text-indent:-.25in;}
 @list l15
-	{mso-list-id:1286614759;
-	mso-list-type:hybrid;
-	mso-list-template-ids:1034325836 67698703 67698713 67698715 67698703 67698713 67698715 67698703 67698713 67698715;}
-@list l15:level1
-	{mso-level-tab-stop:.5in;
-	mso-level-number-position:left;
-	text-indent:-.25in;}
-@list l16
-	{mso-list-id:1344085129;
-	mso-list-type:hybrid;
-	mso-list-template-ids:-931728398 67698703 67698713 67698715 67698703 67698713 67698715 67698703 67698713 67698715;}
-@list l16:level1
-	{mso-level-tab-stop:.5in;
-	mso-level-number-position:left;
-	text-indent:-.25in;}
-@list l17
-	{mso-list-id:1356535618;
-	mso-list-type:hybrid;
-	mso-list-template-ids:-556531444 67698703 67698713 67698715 67698703 67698713 67698715 67698703 67698713 67698715;}
-@list l17:level1
-	{mso-level-tab-stop:.5in;
-	mso-level-number-position:left;
-	text-indent:-.25in;}
-@list l18
-	{mso-list-id:1476218274;
-	mso-list-type:hybrid;
-	mso-list-template-ids:-260670700 67698703 67698713 67698715 67698703 67698713 67698715 67698703 67698713 67698715;}
-@list l18:level1
-	{mso-level-tab-stop:.5in;
-	mso-level-number-position:left;
-	text-indent:-.25in;}
-@list l19
-	{mso-list-id:1490828746;
-	mso-list-type:hybrid;
-	mso-list-template-ids:2099921038 67698703 67698713 67698715 67698703 67698713 67698715 67698703 67698713 67698715;}
-@list l19:level1
-	{mso-level-tab-stop:.5in;
-	mso-level-number-position:left;
-	text-indent:-.25in;}
-@list l19:level2
-	{mso-level-tab-stop:1.0in;
-	mso-level-number-position:left;
-	text-indent:-.25in;}
-@list l19:level3
-	{mso-level-tab-stop:1.5in;
-	mso-level-number-position:left;
-	text-indent:-.25in;}
-@list l19:level4
-	{mso-level-tab-stop:2.0in;
-	mso-level-number-position:left;
-	text-indent:-.25in;}
-@list l19:level5
-	{mso-level-tab-stop:2.5in;
-	mso-level-number-position:left;
-	text-indent:-.25in;}
-@list l19:level6
-	{mso-level-tab-stop:3.0in;
-	mso-level-number-position:left;
-	text-indent:-.25in;}
-@list l19:level7
-	{mso-level-tab-stop:3.5in;
-	mso-level-number-position:left;
-	text-indent:-.25in;}
-@list l19:level8
-	{mso-level-tab-stop:4.0in;
-	mso-level-number-position:left;
-	text-indent:-.25in;}
-@list l19:level9
-	{mso-level-tab-stop:4.5in;
-	mso-level-number-position:left;
-	text-indent:-.25in;}
-@list l20
-	{mso-list-id:1573269719;
-	mso-list-template-ids:-556531444;}
-@list l20:level1
-	{mso-level-tab-stop:.5in;
-	mso-level-number-position:left;
-	text-indent:-.25in;}
-@list l20:level2
-	{mso-level-number-format:alpha-lower;
-	mso-level-tab-stop:1.0in;
-	mso-level-number-position:left;
-	text-indent:-.25in;}
-@list l20:level3
-	{mso-level-number-format:roman-lower;
-	mso-level-tab-stop:1.5in;
-	mso-level-number-position:right;
-	text-indent:-9.0pt;}
-@list l20:level4
-	{mso-level-tab-stop:2.0in;
-	mso-level-number-position:left;
-	text-indent:-.25in;}
-@list l20:level5
-	{mso-level-number-format:alpha-lower;
-	mso-level-tab-stop:2.5in;
-	mso-level-number-position:left;
-	text-indent:-.25in;}
-@list l20:level6
-	{mso-level-number-format:roman-lower;
-	mso-level-tab-stop:3.0in;
-	mso-level-number-position:right;
-	text-indent:-9.0pt;}
-@list l20:level7
-	{mso-level-tab-stop:3.5in;
-	mso-level-number-position:left;
-	text-indent:-.25in;}
-@list l20:level8
-	{mso-level-number-format:alpha-lower;
-	mso-level-tab-stop:4.0in;
-	mso-level-number-position:left;
-	text-indent:-.25in;}
-@list l20:level9
-	{mso-level-number-format:roman-lower;
-	mso-level-tab-stop:4.5in;
-	mso-level-number-position:right;
-	text-indent:-9.0pt;}
-@list l21
-	{mso-list-id:1969629405;
-	mso-list-type:hybrid;
-	mso-list-template-ids:-1313463162 67698703 67698713 67698715 67698703 67698713 67698715 67698703 67698713 67698715;}
-@list l21:level1
-	{mso-level-tab-stop:.5in;
-	mso-level-number-position:left;
-	text-indent:-.25in;}
-@list l22
-	{mso-list-id:1975402694;
-	mso-list-type:hybrid;
-	mso-list-template-ids:1530842176 67698703 67698713 67698715 67698703 67698713 67698715 67698703 67698713 67698715;}
-@list l22:level1
-	{mso-level-tab-stop:.5in;
-	mso-level-number-position:left;
-	text-indent:-.25in;}
-@list l23
 	{mso-list-id:2054108931;
 	mso-list-type:hybrid;
 	mso-list-template-ids:1688889934 67698691 67698691 67698693 67698689 67698691 67698693 67698689 67698691 67698693;}
-@list l23:level1
+@list l15:level1
 	{mso-level-number-format:bullet;
 	mso-level-text:o;
 	mso-level-tab-stop:.5in;
 	mso-level-number-position:left;
 	text-indent:-.25in;
 	font-family:"Courier New";}
-@list l23:level2
+@list l15:level2
 	{mso-level-tab-stop:1.0in;
 	mso-level-number-position:left;
 	text-indent:-.25in;}
-@list l23:level3
+@list l15:level3
 	{mso-level-tab-stop:1.5in;
 	mso-level-number-position:left;
 	text-indent:-.25in;}
-@list l23:level4
+@list l15:level4
 	{mso-level-tab-stop:2.0in;
 	mso-level-number-position:left;
 	text-indent:-.25in;}
-@list l23:level5
+@list l15:level5
 	{mso-level-tab-stop:2.5in;
 	mso-level-number-position:left;
 	text-indent:-.25in;}
-@list l23:level6
+@list l15:level6
 	{mso-level-tab-stop:3.0in;
 	mso-level-number-position:left;
 	text-indent:-.25in;}
-@list l23:level7
+@list l15:level7
 	{mso-level-tab-stop:3.5in;
 	mso-level-number-position:left;
 	text-indent:-.25in;}
-@list l23:level8
+@list l15:level8
 	{mso-level-tab-stop:4.0in;
 	mso-level-number-position:left;
 	text-indent:-.25in;}
-@list l23:level9
+@list l15:level9
 	{mso-level-tab-stop:4.5in;
 	mso-level-number-position:left;
 	text-indent:-.25in;}
-@list l24
-	{mso-list-id:2086340134;
-	mso-list-type:hybrid;
-	mso-list-template-ids:129676938 67698703 67698691 67698693 67698689 67698691 67698693 67698689 67698691 67698693;}
-@list l24:level1
-	{mso-level-tab-stop:.5in;
-	mso-level-number-position:left;
-	text-indent:-.25in;}
 ol
 	{margin-bottom:0in;}
 ul
@@ -1040,7 +1041,7 @@
 	{margin-left:8.5pt;}
 </style>
 <![endif]><!--[if gte mso 9]><xml>
- <o:shapedefaults v:ext="edit" spidmax="62466"/>
+ <o:shapedefaults v:ext="edit" spidmax="64514"/>
 </xml><![endif]--><!--[if gte mso 9]><xml>
  <o:shapelayout v:ext="edit">
   <o:idmap v:ext="edit" data="1"/>
@@ -1197,7 +1198,7 @@
 
 <p>What UML does not capture that Ecore does:</p>
 
-<p style='margin-left:.5in;text-indent:-.25in;mso-list:l14 level1 lfo2;
+<p style='margin-left:.5in;text-indent:-.25in;mso-list:l6 level1 lfo2;
 tab-stops:list .5in'><![if !supportLists]><span style='font-family:"Courier New";
 mso-fareast-font-family:"Courier New"'><span style='mso-list:Ignore'>o<span
 style='font:7.0pt "Times New Roman"'>&nbsp;&nbsp; </span></span></span><![endif]>Multiple
@@ -1205,7 +1206,7 @@
 style='mso-spacerun:yes'>  </span>The &lt;&lt;<span class=SpellE>eTypeParameter</span>&gt;&gt;
 stereotype has been created for this purpose.</p>
 
-<p style='margin-left:.5in;text-indent:-.25in;mso-list:l14 level1 lfo2;
+<p style='margin-left:.5in;text-indent:-.25in;mso-list:l6 level1 lfo2;
 tab-stops:list .5in'><![if !supportLists]><span style='font-family:"Courier New";
 mso-fareast-font-family:"Courier New"'><span style='mso-list:Ignore'>o<span
 style='font:7.0pt "Times New Roman"'>&nbsp;&nbsp; </span></span></span><![endif]>Upper
@@ -1216,7 +1217,7 @@
 </span>The &lt;&lt;<span class=SpellE>eGenericType</span>&gt;&gt; stereotype
 has been created for this purpose.</p>
 
-<p style='margin-left:.5in;text-indent:-.25in;mso-list:l14 level1 lfo2;
+<p style='margin-left:.5in;text-indent:-.25in;mso-list:l6 level1 lfo2;
 tab-stops:list .5in'><![if !supportLists]><span style='font-family:"Courier New";
 mso-fareast-font-family:"Courier New"'><span style='mso-list:Ignore'>o<span
 style='font:7.0pt "Times New Roman"'>&nbsp;&nbsp; </span></span></span><![endif]>UML
@@ -1354,20 +1355,20 @@
 
 <p>With this metamodel in mind, we can point out several points of interesting:</p>
 
-<p style='margin-left:.5in;text-indent:-.25in;mso-list:l5 level1 lfo7;
+<p style='margin-left:.5in;text-indent:-.25in;mso-list:l2 level1 lfo4;
 tab-stops:list .5in'><![if !supportLists]><span style='font-family:"Courier New";
 mso-fareast-font-family:"Courier New"'><span style='mso-list:Ignore'>o<span
 style='font:7.0pt "Times New Roman"'>&nbsp;&nbsp; </span></span></span><![endif]><span
 class=SpellE>ETypeParameter</span> correspond roughly to <span class=SpellE>TemplateParameter</span>
 in UML.</p>
 
-<p style='margin-left:.5in;text-indent:-.25in;mso-list:l5 level1 lfo7;
+<p style='margin-left:.5in;text-indent:-.25in;mso-list:l2 level1 lfo4;
 tab-stops:list .5in'><![if !supportLists]><span style='font-family:"Courier New";
 mso-fareast-font-family:"Courier New"'><span style='mso-list:Ignore'>o<span
 style='font:7.0pt "Times New Roman"'>&nbsp;&nbsp; </span></span></span><![endif]><span
 class=SpellE>EGenericType</span> has no direct mapping to UML</p>
 
-<p style='margin-left:.5in;text-indent:-.25in;mso-list:l5 level1 lfo7;
+<p style='margin-left:.5in;text-indent:-.25in;mso-list:l2 level1 lfo4;
 tab-stops:list .5in'><![if !supportLists]><span style='font-family:"Courier New";
 mso-fareast-font-family:"Courier New"'><span style='mso-list:Ignore'>o<span
 style='font:7.0pt "Times New Roman"'>&nbsp;&nbsp; </span></span></span><![endif]><span
@@ -1375,16 +1376,16 @@
 class=SpellE>eClassifier</span> or <span class=SpellE>eTypeParameter</span>
 property.</p>
 
-<p style='margin-left:.5in;text-indent:-.25in;mso-list:l5 level1 lfo7;
+<p style='margin-left:.5in;text-indent:-.25in;mso-list:l2 level1 lfo4;
 tab-stops:list .5in'><![if !supportLists]><span style='font-family:"Courier New";
 mso-fareast-font-family:"Courier New"'><span style='mso-list:Ignore'>o<span
 style='font:7.0pt "Times New Roman"'>&nbsp;&nbsp; </span></span></span><![endif]><span
-class=SpellE>EOperations</span> and <span class=SpellE>EClassifiers</span> can
-have <span class=SpellE>ETypeParameters</span>.<span
-style='mso-spacerun:yes'>   </span>Similarly, Operations and Classifiers in UML
+class=SpellE>EOperation</span> and <span class=SpellE>EClassifier</span> can be
+parameterized with <span class=SpellE>ETypeParameter</span>.<span
+style='mso-spacerun:yes'>   </span>Similarly, Operation and Classifier in UML
 can have a template signature with parameters.</p>
 
-<p style='margin-left:.5in;text-indent:-.25in;mso-list:l5 level1 lfo7;
+<p style='margin-left:.5in;text-indent:-.25in;mso-list:l2 level1 lfo4;
 tab-stops:list .5in'><![if !supportLists]><span style='font-family:"Courier New";
 mso-fareast-font-family:"Courier New"'><span style='mso-list:Ignore'>o<span
 style='font:7.0pt "Times New Roman"'>&nbsp;&nbsp; </span></span></span><![endif]><span
@@ -1393,14 +1394,14 @@
 of some <span class=SpellE>EClass</span> can be represented by some <span
 class=SpellE>EGenericType</span>.</p>
 
-<p style='margin-left:.5in;text-indent:-.25in;mso-list:l5 level1 lfo7;
+<p style='margin-left:.5in;text-indent:-.25in;mso-list:l2 level1 lfo4;
 tab-stops:list .5in'><![if !supportLists]><span style='font-family:"Courier New";
 mso-fareast-font-family:"Courier New"'><span style='mso-list:Ignore'>o<span
 style='font:7.0pt "Times New Roman"'>&nbsp;&nbsp; </span></span></span><![endif]><span
 class=SpellE>ETypedElement</span> can have some <span class=SpellE>EGenericType</span>
 as a type.</p>
 
-<p style='margin-left:.5in;text-indent:-.25in;mso-list:l5 level1 lfo7;
+<p style='margin-left:.5in;text-indent:-.25in;mso-list:l2 level1 lfo4;
 tab-stops:list .5in'><![if !supportLists]><span style='font-family:"Courier New";
 mso-fareast-font-family:"Courier New"'><span style='mso-list:Ignore'>o<span
 style='font:7.0pt "Times New Roman"'>&nbsp;&nbsp; </span></span></span><![endif]><span
@@ -1439,26 +1440,26 @@
 style='mso-spacerun:yes'>  </span>The reason for starting with Ecore is that it
 is much easier to specify generics using Ecore and requires fewer constructs.</p>
 
-<p style='margin-left:.5in;text-indent:-.25in;mso-list:l19 level1 lfo4;
+<p style='margin-left:.5in;text-indent:-.25in;mso-list:l9 level1 lfo6;
 tab-stops:list .5in'><![if !supportLists]><span style='mso-fareast-font-family:
 Arial'><span style='mso-list:Ignore'>1.<span style='font:7.0pt "Times New Roman"'>
 </span></span></span><![endif]>In your development environment, ensure you have
 the UML examples plug-ins installed.</p>
 
-<p style='margin-left:.5in;text-indent:-.25in;mso-list:l19 level1 lfo4;
+<p style='margin-left:.5in;text-indent:-.25in;mso-list:l9 level1 lfo6;
 tab-stops:list .5in'><![if !supportLists]><span style='mso-fareast-font-family:
 Arial'><span style='mso-list:Ignore'>2.<span style='font:7.0pt "Times New Roman"'>
 </span></span></span><![endif]>Create an Ecore model using generics in
 Ecore.<span style='mso-spacerun:yes'>  </span>The resulting Ecore model should
 closely match the Java representation.</p>
 
-<p style='margin-left:.5in;text-indent:-.25in;mso-list:l19 level1 lfo4;
+<p style='margin-left:.5in;text-indent:-.25in;mso-list:l9 level1 lfo6;
 tab-stops:list .5in'><![if !supportLists]><span style='mso-fareast-font-family:
 Arial'><span style='mso-list:Ignore'>3.<span style='font:7.0pt "Times New Roman"'>
 </span></span></span><![endif]>From the sample Ecore editor, select the root
 package of your Ecore model.</p>
 
-<p style='margin-left:.5in;text-indent:-.25in;mso-list:l19 level1 lfo4;
+<p style='margin-left:.5in;text-indent:-.25in;mso-list:l9 level1 lfo6;
 tab-stops:list .5in'><![if !supportLists]><span style='mso-fareast-font-family:
 Arial'><span style='mso-list:Ignore'>4.<span style='font:7.0pt "Times New Roman"'>
 </span></span></span><![endif]>From the toolbar select “<b style='mso-bidi-font-weight:
@@ -1545,25 +1546,25 @@
  <tr style='mso-yfti-irow:0;mso-yfti-lastrow:yes'>
   <td width=216 valign=top style='width:162.1pt;border:solid windowtext 1.0pt;
   mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
-  <p class=MsoNormal><!--[if gte vml 1]><v:shape id="_x0000_i1066" type="#_x0000_t75"
+  <p class=MsoNormal><!--[if gte vml 1]><v:shape id="_x0000_i1032" type="#_x0000_t75"
    style='width:138pt;height:80.25pt;mso-position-horizontal:left;
    mso-position-horizontal-relative:text;mso-position-vertical:top;
    mso-position-vertical-relative:line' o:allowoverlap="f">
    <v:imagedata src="article_files/image009.png" o:title=""/>
   </v:shape><![endif]--><![if !vml]><img border=0 width=184 height=107
-  src="article_files/image010.jpg" v:shapes="_x0000_i1066"><![endif]><o:p></o:p></p>
+  src="article_files/image010.jpg" v:shapes="_x0000_i1032"><![endif]></p>
   </td>
   <td width=612 style='width:459.0pt;border:solid windowtext 1.0pt;border-left:
   none;mso-border-left-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
   padding:0in 5.4pt 0in 5.4pt'>
   <ol style='margin-top:0in' start=1 type=1>
-   <li class=MsoNormal style='mso-list:l17 level1 lfo10;tab-stops:list .5in'>We
+   <li class=MsoNormal style='mso-list:l7 level1 lfo9;tab-stops:list .5in'>We
        create a simple <span class=SpellE>EClass</span> with an <span
-       class=SpellE>ETypeParameter</span> <i style='mso-bidi-font-style:normal'>E</i>.<o:p></o:p></li>
-   <li class=MsoNormal style='mso-list:l17 level1 lfo10;tab-stops:list .5in'>We
+       class=SpellE>ETypeParameter</span> <i style='mso-bidi-font-style:normal'>E</i>.</li>
+   <li class=MsoNormal style='mso-list:l7 level1 lfo9;tab-stops:list .5in'>We
        create an <span class=SpellE>EReference</span> whose type is an <span
        class=SpellE>EGenericType</span> whose <span class=SpellE>eTypeParameter</span>
-       is <i style='mso-bidi-font-style:normal'>E</i>.<o:p></o:p></li>
+       is <i style='mso-bidi-font-style:normal'>E</i>.</li>
   </ol>
   <p class=MsoNormal style='margin-left:.25in'><o:p>&nbsp;</o:p></p>
   </td>
@@ -1575,7 +1576,7 @@
 <p>As you can see, the UML representation is more verbose than the Ecore
 representation. </p>
 
-<p style='margin-left:.5in;text-indent:-.25in;mso-list:l23 level1 lfo6;
+<p style='margin-left:.5in;text-indent:-.25in;mso-list:l15 level1 lfo11;
 tab-stops:list .5in'><![if !supportLists]><span style='font-family:"Courier New";
 mso-fareast-font-family:"Courier New"'><span style='mso-list:Ignore'>o<span
 style='font:7.0pt "Times New Roman"'>&nbsp;&nbsp; </span></span></span><![endif]>The
@@ -1583,14 +1584,14 @@
 owned by <span class=SpellE><i style='mso-bidi-font-style:normal'>MyClass</i></span>.<span
 style='mso-spacerun:yes'>  </span></p>
 
-<p style='margin-left:.5in;text-indent:-.25in;mso-list:l23 level1 lfo6;
+<p style='margin-left:.5in;text-indent:-.25in;mso-list:l15 level1 lfo11;
 tab-stops:list .5in'><![if !supportLists]><span style='font-family:"Courier New";
 mso-fareast-font-family:"Courier New"'><span style='mso-list:Ignore'>o<span
 style='font:7.0pt "Times New Roman"'>&nbsp;&nbsp; </span></span></span><![endif]>The
 signature in this case has one template parameter <i style='mso-bidi-font-style:
 normal'>E</i>.<span style='mso-spacerun:yes'>  </span></p>
 
-<p style='margin-left:.5in;text-indent:-.25in;mso-list:l23 level1 lfo6;
+<p style='margin-left:.5in;text-indent:-.25in;mso-list:l15 level1 lfo11;
 tab-stops:list .5in'><![if !supportLists]><span style='font-family:"Courier New";
 mso-fareast-font-family:"Courier New"'><span style='mso-list:Ignore'>o<span
 style='font:7.0pt "Times New Roman"'>&nbsp;&nbsp; </span></span></span><![endif]>The
@@ -1598,11 +1599,11 @@
 normal'>E</i> and uses that class as its <span class=SpellE>parametered</span>
 element.<span style='mso-spacerun:yes'>  </span></p>
 
-<p><!--[if gte vml 1]><v:shape id="_x0000_i1032" type="#_x0000_t75" style='width:294.75pt;
+<p><!--[if gte vml 1]><v:shape id="_x0000_i1033" type="#_x0000_t75" style='width:294.75pt;
  height:90.75pt'>
  <v:imagedata src="article_files/image011.gif" o:title=""/>
 </v:shape><![endif]--><![if !vml]><img border=0 width=393 height=121
-src="article_files/image011.gif" v:shapes="_x0000_i1032"><![endif]><span
+src="article_files/image011.gif" v:shapes="_x0000_i1033"><![endif]><span
 style='mso-spacerun:yes'>      </span></p>
 
 <p>The class <i style='mso-bidi-font-style:normal'>E</i> is the <span
@@ -1641,16 +1642,16 @@
 
 <h4>Visually</h4>
 
-<p><span style='mso-bidi-font-size:14.0pt'><!--[if gte vml 1]><v:shape id="_x0000_i1033"
+<p><span style='mso-bidi-font-size:14.0pt'><!--[if gte vml 1]><v:shape id="_x0000_i1034"
  type="#_x0000_t75" style='width:279pt;height:88.5pt'>
  <v:imagedata src="article_files/image012.png" o:title=""/>
 </v:shape><![endif]--><![if !vml]><img border=0 width=372 height=118
-src="article_files/image013.jpg" v:shapes="_x0000_i1033"><![endif]></span><span
+src="article_files/image013.jpg" v:shapes="_x0000_i1034"><![endif]></span><span
 style='mso-spacerun:yes'>  </span><span style='mso-bidi-font-size:14.0pt'><!--[if gte vml 1]><v:shape
- id="_x0000_i1034" type="#_x0000_t75" style='width:255.75pt;height:93pt'>
+ id="_x0000_i1035" type="#_x0000_t75" style='width:255.75pt;height:93pt'>
  <v:imagedata src="article_files/image014.png" o:title=""/>
 </v:shape><![endif]--><![if !vml]><img border=0 width=341 height=124
-src="article_files/image015.jpg" v:shapes="_x0000_i1034"><![endif]></span></p>
+src="article_files/image015.jpg" v:shapes="_x0000_i1035"><![endif]></span></p>
 
 <h4><span lang=FR style='mso-ansi-language:FR'>Java<o:p></o:p></span></h4>
 
@@ -1717,26 +1718,26 @@
  <tr style='mso-yfti-irow:0;mso-yfti-lastrow:yes'>
   <td width=216 valign=top style='width:162.1pt;border:solid windowtext 1.0pt;
   mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
-  <p class=MsoNormal><!--[if gte vml 1]><v:shape id="_x0000_i1061" type="#_x0000_t75"
+  <p class=MsoNormal><!--[if gte vml 1]><v:shape id="_x0000_i1036" type="#_x0000_t75"
    style='width:139.5pt;height:182.25pt'>
    <v:imagedata src="article_files/image016.png" o:title=""/>
   </v:shape><![endif]--><![if !vml]><img border=0 width=186 height=243
-  src="article_files/image017.jpg" v:shapes="_x0000_i1061"><![endif]></p>
+  src="article_files/image017.jpg" v:shapes="_x0000_i1036"><![endif]></p>
   </td>
   <td width=612 style='width:459.0pt;border:solid windowtext 1.0pt;border-left:
   none;mso-border-left-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
   padding:0in 5.4pt 0in 5.4pt'>
   <ol style='margin-top:0in' start=1 type=1>
-   <li class=MsoNormal style='mso-list:l22 level1 lfo28;tab-stops:list .5in'>We
+   <li class=MsoNormal style='mso-list:l14 level1 lfo14;tab-stops:list .5in'>We
        create an <span class=SpellE>ETypeParameter</span> for the <span
        class=SpellE>EClass</span> <i style='mso-bidi-font-style:normal'>List</i></li>
-   <li class=MsoNormal style='mso-list:l22 level1 lfo28;tab-stops:list .5in'>We
+   <li class=MsoNormal style='mso-list:l14 level1 lfo14;tab-stops:list .5in'>We
        create an <span class=SpellE>EOperation</span> <span class=GramE><i
        style='mso-bidi-font-style:normal'>add(</i></span><i style='mso-bidi-font-style:
        normal'>)</i> with a parameter <i style='mso-bidi-font-style:normal'>x</i>
        of <span class=SpellE>EGenericType</span> <i style='mso-bidi-font-style:
        normal'>E</i>.</li>
-   <li class=MsoNormal style='mso-list:l22 level1 lfo28;tab-stops:list .5in'>We
+   <li class=MsoNormal style='mso-list:l14 level1 lfo14;tab-stops:list .5in'>We
        create another <span class=SpellE>EOperation</span> <span class=SpellE><span
        class=GramE><i style='mso-bidi-font-style:normal'>iterator</i></span></span><span
        class=GramE><i style='mso-bidi-font-style:normal'>(</i></span><i
@@ -1751,9 +1752,9 @@
        has an <span class=SpellE>eTypeAgrument</span> (<span class=SpellE>EGenericType</span>)
        whose <span class=SpellE>eTypeParameter</span> is set to <i
        style='mso-bidi-font-style:normal'>E</i>.</li>
-   <li class=MsoNormal style='mso-list:l22 level1 lfo28;tab-stops:list .5in'>The
+   <li class=MsoNormal style='mso-list:l14 level1 lfo14;tab-stops:list .5in'>The
        <span class=SpellE><i style='mso-bidi-font-style:normal'>Iterator</i></span>
-       is similarly specified.<o:p></o:p></li>
+       is similarly specified.</li>
   </ol>
   </td>
  </tr>
@@ -1769,11 +1770,11 @@
 class called <span class=SpellE><i style='mso-bidi-font-style:normal'>Iterator_E</i></span>,
 see below.</p>
 
-<h4><!--[if gte vml 1]><v:shape id="_x0000_i1035" type="#_x0000_t75" style='width:297pt;
+<h4><!--[if gte vml 1]><v:shape id="_x0000_i1037" type="#_x0000_t75" style='width:297pt;
  height:267.75pt'>
  <v:imagedata src="article_files/image018.gif" o:title=""/>
 </v:shape><![endif]--><![if !vml]><img border=0 width=396 height=357
-src="article_files/image018.gif" v:shapes="_x0000_i1035"><![endif]></h4>
+src="article_files/image018.gif" v:shapes="_x0000_i1037"><![endif]></h4>
 
 <p>You might be scratching your head about <span class=SpellE><i
 style='mso-bidi-font-style:normal'>Iterator_E</i></span>.<span
@@ -1790,17 +1791,17 @@
 class=GramE><span style='mso-spacerun:yes'>  </span>above</span> has the
 following binding:</p>
 
-<p><span style='mso-spacerun:yes'> </span><!--[if gte vml 1]><v:shape id="_x0000_i1036"
+<p><span style='mso-spacerun:yes'> </span><!--[if gte vml 1]><v:shape id="_x0000_i1038"
  type="#_x0000_t75" style='width:288.75pt;height:24.75pt'>
  <v:imagedata src="article_files/image019.gif" o:title=""/>
 </v:shape><![endif]--><![if !vml]><img border=0 width=385 height=33
-src="article_files/image019.gif" v:shapes="_x0000_i1036"><![endif]>.<span
+src="article_files/image019.gif" v:shapes="_x0000_i1038"><![endif]>.<span
 style='mso-spacerun:yes'>  </span></p>
 
 <p>The formal template parameter for <span class=SpellE><i style='mso-bidi-font-style:
-normal'>Iterator</i></span><i style='mso-bidi-font-style:normal'>&lt;E&gt;</i>
-is bound to the actual parameter <i style='mso-bidi-font-style:normal'>E</i> of
-<i style='mso-bidi-font-style:normal'>List</i>.</p>
+normal'>Iterator</i></span><i style='mso-bidi-font-style:normal'>&lt;E&gt;</i> is
+bound to the actual parameter <i style='mso-bidi-font-style:normal'>E</i> of <i
+style='mso-bidi-font-style:normal'>List</i>.</p>
 
 <p class=MsoNormal><o:p>&nbsp;</o:p></p>
 
@@ -1830,11 +1831,11 @@
 
 <h4>Visually</h4>
 
-<h4><span style='font-weight:normal'><!--[if gte vml 1]><v:shape id="_x0000_i1037"
+<h4><span style='font-weight:normal'><!--[if gte vml 1]><v:shape id="_x0000_i1039"
  type="#_x0000_t75" style='width:740.25pt;height:221.25pt'>
  <v:imagedata src="article_files/image020.png" o:title=""/>
 </v:shape><![endif]--><![if !vml]><img border=0 width=987 height=295
-src="article_files/image021.jpg" v:shapes="_x0000_i1037"><![endif]></span></h4>
+src="article_files/image021.jpg" v:shapes="_x0000_i1039"><![endif]></span></h4>
 
 <h4>Java</h4>
 
@@ -1940,36 +1941,36 @@
 
 <p class=MsoNormal><o:p>&nbsp;</o:p></p>
 
-<p class=MsoNormal><!--[if gte vml 1]><v:shape id="_x0000_i1038" type="#_x0000_t75"
+<p class=MsoNormal><!--[if gte vml 1]><v:shape id="_x0000_i1040" type="#_x0000_t75"
  style='width:137.25pt;height:101.25pt' o:bordertopcolor="this"
  o:borderleftcolor="this" o:borderbottomcolor="this" o:borderrightcolor="this">
  <v:imagedata src="article_files/image022.png" o:title=""/>
 </v:shape><![endif]--><![if !vml]><img border=0 width=183 height=135
-src="article_files/image023.jpg" v:shapes="_x0000_i1038"><![endif]><span
-style='mso-spacerun:yes'>      </span><!--[if gte vml 1]><v:shape id="_x0000_i1039"
+src="article_files/image023.jpg" v:shapes="_x0000_i1040"><![endif]><span
+style='mso-spacerun:yes'>      </span><!--[if gte vml 1]><v:shape id="_x0000_i1041"
  type="#_x0000_t75" style='width:127.5pt;height:76.5pt' o:bordertopcolor="this"
  o:borderleftcolor="this" o:borderbottomcolor="this" o:borderrightcolor="this">
  <v:imagedata src="article_files/image024.png" o:title=""/>
 </v:shape><![endif]--><![if !vml]><img border=0 width=170 height=102
-src="article_files/image025.jpg" v:shapes="_x0000_i1039"><![endif]><span
-style='mso-spacerun:yes'>        </span><!--[if gte vml 1]><v:shape id="_x0000_i1040"
+src="article_files/image025.jpg" v:shapes="_x0000_i1041"><![endif]><span
+style='mso-spacerun:yes'>        </span><!--[if gte vml 1]><v:shape id="_x0000_i1042"
  type="#_x0000_t75" style='width:124.5pt;height:51pt' o:bordertopcolor="this"
  o:borderleftcolor="this" o:borderbottomcolor="this" o:borderrightcolor="this">
  <v:imagedata src="article_files/image026.png" o:title=""/>
 </v:shape><![endif]--><![if !vml]><img border=0 width=166 height=68
-src="article_files/image027.jpg" v:shapes="_x0000_i1040"><![endif]><span
-style='mso-spacerun:yes'>        </span><!--[if gte vml 1]><v:shape id="_x0000_i1041"
+src="article_files/image027.jpg" v:shapes="_x0000_i1042"><![endif]><span
+style='mso-spacerun:yes'>        </span><!--[if gte vml 1]><v:shape id="_x0000_i1043"
  type="#_x0000_t75" style='width:146.25pt;height:53.25pt' o:bordertopcolor="this"
  o:borderleftcolor="this" o:borderbottomcolor="this" o:borderrightcolor="this">
  <v:imagedata src="article_files/image028.png" o:title=""/>
 </v:shape><![endif]--><![if !vml]><img border=0 width=195 height=71
-src="article_files/image029.jpg" v:shapes="_x0000_i1041"><![endif]><span
-style='mso-spacerun:yes'>     </span><!--[if gte vml 1]><v:shape id="_x0000_i1042"
+src="article_files/image029.jpg" v:shapes="_x0000_i1043"><![endif]><span
+style='mso-spacerun:yes'>     </span><!--[if gte vml 1]><v:shape id="_x0000_i1044"
  type="#_x0000_t75" style='width:69pt;height:14.25pt' o:bordertopcolor="this"
  o:borderleftcolor="this" o:borderbottomcolor="this" o:borderrightcolor="this">
  <v:imagedata src="article_files/image030.png" o:title=""/>
 </v:shape><![endif]--><![if !vml]><img border=0 width=92 height=19
-src="article_files/image031.jpg" v:shapes="_x0000_i1042"><![endif]></p>
+src="article_files/image031.jpg" v:shapes="_x0000_i1044"><![endif]></p>
 
 <p><o:p>&nbsp;</o:p></p>
 
@@ -1977,40 +1978,40 @@
 
 <p class=MsoNormal><o:p>&nbsp;</o:p></p>
 
-<p class=MsoNormal><!--[if gte vml 1]><v:shape id="_x0000_i1043" type="#_x0000_t75"
+<p class=MsoNormal><!--[if gte vml 1]><v:shape id="_x0000_i1045" type="#_x0000_t75"
  style='width:279.75pt;height:78pt' o:bordertopcolor="this" o:borderleftcolor="this"
  o:borderbottomcolor="this" o:borderrightcolor="this">
  <v:imagedata src="article_files/image032.png" o:title=""/>
 </v:shape><![endif]--><![if !vml]><img border=0 width=373 height=104
-src="article_files/image033.jpg" v:shapes="_x0000_i1043"><![endif]><span
-style='mso-spacerun:yes'>               </span><!--[if gte vml 1]><v:shape
- id="_x0000_i1044" type="#_x0000_t75" style='width:280.5pt;height:65.25pt'
- o:bordertopcolor="this" o:borderleftcolor="this" o:borderbottomcolor="this"
- o:borderrightcolor="this">
+src="article_files/image033.jpg" v:shapes="_x0000_i1045"><![endif]><span
+style='mso-spacerun:yes'>             </span><span
+style='mso-spacerun:yes'>  </span><!--[if gte vml 1]><v:shape id="_x0000_i1046"
+ type="#_x0000_t75" style='width:280.5pt;height:65.25pt' o:bordertopcolor="this"
+ o:borderleftcolor="this" o:borderbottomcolor="this" o:borderrightcolor="this">
  <v:imagedata src="article_files/image034.png" o:title=""/>
 </v:shape><![endif]--><![if !vml]><img border=0 width=374 height=87
-src="article_files/image035.jpg" v:shapes="_x0000_i1044"><![endif]></p>
+src="article_files/image035.jpg" v:shapes="_x0000_i1046"><![endif]></p>
 
 <p class=MsoNormal><o:p>&nbsp;</o:p></p>
 
 <p class=MsoNormal><o:p>&nbsp;</o:p></p>
 
-<p class=MsoNormal><!--[if gte vml 1]><v:shape id="_x0000_i1045" type="#_x0000_t75"
+<p class=MsoNormal><!--[if gte vml 1]><v:shape id="_x0000_i1047" type="#_x0000_t75"
  style='width:281.25pt;height:102pt'>
  <v:imagedata src="article_files/image036.png" o:title=""/>
 </v:shape><![endif]--><![if !vml]><img border=0 width=375 height=136
-src="article_files/image037.jpg" v:shapes="_x0000_i1045"><![endif]><span
+src="article_files/image037.jpg" v:shapes="_x0000_i1047"><![endif]><span
 style='mso-spacerun:yes'>                </span><!--[if gte vml 1]><v:shape
- id="_x0000_i1046" type="#_x0000_t75" style='width:273pt;height:65.25pt'>
+ id="_x0000_i1048" type="#_x0000_t75" style='width:273pt;height:65.25pt'>
  <v:imagedata src="article_files/image038.png" o:title=""/>
 </v:shape><![endif]--><![if !vml]><img border=0 width=364 height=87
-src="article_files/image039.jpg" v:shapes="_x0000_i1046"><![endif]><span
-style='mso-spacerun:yes'>     </span><!--[if gte vml 1]><v:shape id="_x0000_i1047"
+src="article_files/image039.jpg" v:shapes="_x0000_i1048"><![endif]><span
+style='mso-spacerun:yes'>     </span><!--[if gte vml 1]><v:shape id="_x0000_i1049"
  type="#_x0000_t75" style='width:118.5pt;height:15pt' o:bordertopcolor="this"
  o:borderleftcolor="this" o:borderbottomcolor="this" o:borderrightcolor="this">
  <v:imagedata src="article_files/image040.png" o:title=""/>
 </v:shape><![endif]--><![if !vml]><img border=0 width=158 height=20
-src="article_files/image041.jpg" v:shapes="_x0000_i1047"><![endif]></p>
+src="article_files/image041.jpg" v:shapes="_x0000_i1049"><![endif]></p>
 
 <p><span class=SpellE><i style='mso-bidi-font-style:normal'>ArrayList</i></span>
 is the specialization of the concrete <span class=SpellE><i style='mso-bidi-font-style:
@@ -2022,11 +2023,11 @@
 style='mso-spacerun:yes'>  </span>These are the substitutions for the binding
 of <span class=SpellE><i style='mso-bidi-font-style:normal'>List_E</i></span>: </p>
 
-<p><!--[if gte vml 1]><v:shape id="_x0000_i1048" type="#_x0000_t75" style='width:292.5pt;
+<p><!--[if gte vml 1]><v:shape id="_x0000_i1050" type="#_x0000_t75" style='width:292.5pt;
  height:28.5pt'>
  <v:imagedata src="article_files/image042.png" o:title=""/>
 </v:shape><![endif]--><![if !vml]><img border=0 width=390 height=38
-src="article_files/image043.jpg" v:shapes="_x0000_i1048"><![endif]></p>
+src="article_files/image043.jpg" v:shapes="_x0000_i1050"><![endif]></p>
 
 <p>The class <span class=SpellE><i style='mso-bidi-font-style:normal'>ArrayList_Car</i></span>
 substitutes the actual parameter Car for the exposed template parameter of <i
@@ -2035,11 +2036,11 @@
 style='mso-spacerun:yes'>  </span>These are the substitutions for the <span
 class=SpellE><i style='mso-bidi-font-style:normal'>ArrayList_Car</i></span>:</p>
 
-<p><!--[if gte vml 1]><v:shape id="_x0000_i1049" type="#_x0000_t75" style='width:289.5pt;
+<p><!--[if gte vml 1]><v:shape id="_x0000_i1051" type="#_x0000_t75" style='width:289.5pt;
  height:33pt'>
  <v:imagedata src="article_files/image044.png" o:title=""/>
 </v:shape><![endif]--><![if !vml]><img border=0 width=386 height=44
-src="article_files/image045.jpg" v:shapes="_x0000_i1049"><![endif]></p>
+src="article_files/image045.jpg" v:shapes="_x0000_i1051"><![endif]></p>
 
 <p><o:p>&nbsp;</o:p></p>
 
@@ -2062,11 +2063,11 @@
 
 <h4>Visually</h4>
 
-<p class=MsoNormal><!--[if gte vml 1]><v:shape id="_x0000_i1050" type="#_x0000_t75"
+<p class=MsoNormal><!--[if gte vml 1]><v:shape id="_x0000_i1052" type="#_x0000_t75"
  style='width:226.5pt;height:78pt'>
  <v:imagedata src="article_files/image046.png" o:title=""/>
 </v:shape><![endif]--><![if !vml]><img border=0 width=302 height=104
-src="article_files/image047.jpg" v:shapes="_x0000_i1050"><![endif]></p>
+src="article_files/image047.jpg" v:shapes="_x0000_i1052"><![endif]></p>
 
 <h4>Java</h4>
 
@@ -2131,33 +2132,34 @@
  <tr style='mso-yfti-irow:0;mso-yfti-lastrow:yes'>
   <td width=240 valign=top style='width:180.1pt;border:solid windowtext 1.0pt;
   mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
-  <p class=MsoNormal><!--[if gte vml 1]><v:shape id="_x0000_i1065" type="#_x0000_t75"
+  <p class=MsoNormal><!--[if gte vml 1]><v:shape id="_x0000_i1053" type="#_x0000_t75"
    style='width:153pt;height:79.5pt'>
    <v:imagedata src="article_files/image048.png" o:title=""/>
   </v:shape><![endif]--><![if !vml]><img border=0 width=204 height=106
-  src="article_files/image049.jpg" v:shapes="_x0000_i1065"><![endif]></p>
+  src="article_files/image049.jpg" v:shapes="_x0000_i1053"><![endif]></p>
   </td>
   <td width=767 style='width:575.1pt;border:solid windowtext 1.0pt;border-left:
   none;mso-border-left-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
   padding:0in 5.4pt 0in 5.4pt'>
   <ol style='margin-top:0in' start=1 type=1>
-   <li class=MsoNormal style='mso-list:l21 level1 lfo15;tab-stops:list .5in'><span
+   <li class=MsoNormal style='mso-list:l13 level1 lfo17;tab-stops:list .5in'><span
        class=SpellE><i style='mso-bidi-font-style:normal'>MyClass</i></span>
        has an <span class=SpellE>EOperation</span> called <span class=SpellE><i
        style='mso-bidi-font-style:normal'>someOperation</i></span>.</li>
-   <li class=MsoNormal style='mso-list:l21 level1 lfo15;tab-stops:list .5in'>The
+   <li class=MsoNormal style='mso-list:l13 level1 lfo17;tab-stops:list .5in'>The
        <span class=SpellE>EOperation</span> <span class=SpellE>someOperation</span>
        has an <span class=SpellE>ETypeParameter</span> <i style='mso-bidi-font-style:
        normal'>T</i>.</li>
-   <li class=MsoNormal style='mso-list:l21 level1 lfo15;tab-stops:list .5in'>The
+   <li class=MsoNormal style='mso-list:l13 level1 lfo17;tab-stops:list .5in'>The
        <span class=SpellE>EOperation</span> has a parameter <i
        style='mso-bidi-font-style:normal'>p1</i> whose type is an <span
        class=SpellE>EGenericType</span> whose <span class=SpellE>eTypeParameter</span>
        is <i style='mso-bidi-font-style:normal'>T</i>.</li>
-   <li class=MsoNormal style='mso-list:l21 level1 lfo15;tab-stops:list .5in'>The
-       <span class=SpellE>EOperation</span> has a its type set to an <span
-       class=SpellE>EGenericType</span> whose <span class=SpellE>eTypeParameter</span>
-       is <i style='mso-bidi-font-style:normal'>T</i>.<o:p></o:p></li>
+   <li class=MsoNormal style='mso-list:l13 level1 lfo17;tab-stops:list .5in'>The
+       <span class=SpellE>EOperation</span><span style='mso-spacerun:yes'> 
+       </span>has an <span class=SpellE>EGenericType</span> as its type, whose <span
+       class=SpellE>eTypeParameter</span> is <i style='mso-bidi-font-style:
+       normal'>T</i>.</li>
   </ol>
   </td>
  </tr>
@@ -2170,10 +2172,10 @@
 <p class=MsoNormal><o:p>&nbsp;</o:p></p>
 
 <p class=MsoNormal><span style='font-size:10.0pt;font-family:"Arial Unicode MS"'><!--[if gte vml 1]><v:shape
- id="_x0000_i1051" type="#_x0000_t75" style='width:311.25pt;height:90.75pt'>
+ id="_x0000_i1054" type="#_x0000_t75" style='width:311.25pt;height:90.75pt'>
  <v:imagedata src="article_files/image050.png" o:title=""/>
 </v:shape><![endif]--><![if !vml]><img border=0 width=415 height=121
-src="article_files/image051.jpg" v:shapes="_x0000_i1051"><![endif]></span></p>
+src="article_files/image051.jpg" v:shapes="_x0000_i1054"><![endif]></span></p>
 
 <p><o:p>&nbsp;</o:p></p>
 
@@ -2190,11 +2192,11 @@
 
 <h4>Visually</h4>
 
-<p class=MsoNormal><!--[if gte vml 1]><v:shape id="_x0000_i1052" type="#_x0000_t75"
+<p class=MsoNormal><!--[if gte vml 1]><v:shape id="_x0000_i1055" type="#_x0000_t75"
  style='width:450.75pt;height:255pt'>
  <v:imagedata src="article_files/image052.png" o:title=""/>
 </v:shape><![endif]--><![if !vml]><img border=0 width=601 height=340
-src="article_files/image053.jpg" v:shapes="_x0000_i1052"><![endif]></p>
+src="article_files/image053.jpg" v:shapes="_x0000_i1055"><![endif]></p>
 
 <h4>Java</h4>
 
@@ -2253,26 +2255,27 @@
  <tr style='mso-yfti-irow:0;mso-yfti-lastrow:yes'>
   <td width=228 valign=top style='width:171.1pt;border:solid windowtext 1.0pt;
   mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
-  <p class=MsoNormal><!--[if gte vml 1]><v:shape id="_x0000_i1064" type="#_x0000_t75"
+  <p class=MsoNormal><!--[if gte vml 1]><v:shape id="_x0000_i1056" type="#_x0000_t75"
    style='width:154.5pt;height:102.75pt'>
    <v:imagedata src="article_files/image054.png" o:title=""/>
   </v:shape><![endif]--><![if !vml]><img border=0 width=206 height=137
-  src="article_files/image055.jpg" v:shapes="_x0000_i1064"><![endif]></p>
+  src="article_files/image055.jpg" v:shapes="_x0000_i1056"><![endif]></p>
   </td>
   <td width=779 style='width:584.1pt;border:solid windowtext 1.0pt;border-left:
   none;mso-border-left-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
   padding:0in 5.4pt 0in 5.4pt'>
   <ol style='margin-top:0in' start=1 type=1>
-   <li class=MsoNormal style='mso-list:l0 level1 lfo14;tab-stops:list .5in'>We
+   <li class=MsoNormal style='mso-list:l0 level1 lfo20;tab-stops:list .5in'>We
        create an operation with parameter <i style='mso-bidi-font-style:normal'>p1</i>.</li>
-   <li class=MsoNormal style='mso-list:l0 level1 lfo14;tab-stops:list .5in'>Parameter<i
+   <li class=MsoNormal style='mso-list:l0 level1 lfo20;tab-stops:list .5in'>Parameter<i
        style='mso-bidi-font-style:normal'> p1</i> has as its type an <span
        class=SpellE>EGenericType</span> whose <span class=SpellE>eClassifier</span>
-       is <i style='mso-bidi-font-style:normal'>List&lt;E&gt;.</i><o:p></o:p></li>
-   <li class=MsoNormal style='mso-list:l0 level1 lfo14;tab-stops:list .5in'>The
-       <span class=SpellE>EGenericType</span> of p1 has a type argument (<span
-       class=SpellE>EGenericType</span>) whose <span class=SpellE>eClassifier</span>
-       is set to <i style='mso-bidi-font-style:normal'>Car</i>.<o:p></o:p></li>
+       is <i style='mso-bidi-font-style:normal'>List&lt;E&gt;.</i></li>
+   <li class=MsoNormal style='mso-list:l0 level1 lfo20;tab-stops:list .5in'>The
+       <span class=SpellE>EGenericType</span> of <i style='mso-bidi-font-style:
+       normal'>p1</i> has a type argument (<span class=SpellE>EGenericType</span>)
+       whose <span class=SpellE>eClassifier</span> is set to <i
+       style='mso-bidi-font-style:normal'>Car</i>.</li>
   </ol>
   </td>
  </tr>
@@ -2282,11 +2285,11 @@
 
 <h4>UML</h4>
 
-<h4><!--[if gte vml 1]><v:shape id="_x0000_i1053" type="#_x0000_t75" style='width:5in;
+<h4><!--[if gte vml 1]><v:shape id="_x0000_i1057" type="#_x0000_t75" style='width:5in;
  height:102.75pt'>
  <v:imagedata src="article_files/image056.png" o:title=""/>
 </v:shape><![endif]--><![if !vml]><img border=0 width=480 height=137
-src="article_files/image057.jpg" v:shapes="_x0000_i1053"><![endif]></h4>
+src="article_files/image057.jpg" v:shapes="_x0000_i1057"><![endif]></h4>
 
 <p>The only important thing to point out here is that the bound <span
 class=SpellE><i style='mso-bidi-font-style:normal'>List_Car</i></span> is not
@@ -2327,11 +2330,11 @@
 
 <h4>Visually</h4>
 
-<p class=MsoNormal><!--[if gte vml 1]><v:shape id="_x0000_i1054" type="#_x0000_t75"
+<p class=MsoNormal><!--[if gte vml 1]><v:shape id="_x0000_i1058" type="#_x0000_t75"
  style='width:471pt;height:405.75pt'>
  <v:imagedata src="article_files/image058.png" o:title=""/>
 </v:shape><![endif]--><![if !vml]><img border=0 width=628 height=541
-src="article_files/image059.jpg" v:shapes="_x0000_i1054"><![endif]></p>
+src="article_files/image059.jpg" v:shapes="_x0000_i1058"><![endif]></p>
 
 <h4>Java</h4>
 
@@ -2370,29 +2373,29 @@
  <tr style='mso-yfti-irow:0;mso-yfti-lastrow:yes'>
   <td width=276 valign=top style='width:207.1pt;border:solid windowtext 1.0pt;
   mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
-  <p class=MsoNormal><!--[if gte vml 1]><v:shape id="_x0000_i1062" type="#_x0000_t75"
+  <p class=MsoNormal><!--[if gte vml 1]><v:shape id="_x0000_i1059" type="#_x0000_t75"
    style='width:194.25pt;height:114.75pt'>
    <v:imagedata src="article_files/image060.png" o:title=""/>
   </v:shape><![endif]--><![if !vml]><img border=0 width=259 height=153
-  src="article_files/image061.jpg" v:shapes="_x0000_i1062"><![endif]></p>
+  src="article_files/image061.jpg" v:shapes="_x0000_i1059"><![endif]></p>
   </td>
   <td width=576 style='width:6.0in;border:solid windowtext 1.0pt;border-left:
   none;mso-border-left-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
   padding:0in 5.4pt 0in 5.4pt'>
   <ol style='margin-top:0in' start=1 type=1>
-   <li class=MsoNormal style='mso-list:l9 level1 lfo12;tab-stops:list .5in'>We
-       create an <span class=SpellE>EReference</span> for <span class=SpellE><i
+   <li class=MsoNormal style='mso-list:l3 level1 lfo23;tab-stops:list .5in'>We create
+       an <span class=SpellE>EReference</span> for <span class=SpellE><i
        style='mso-bidi-font-style:normal'>someReference</i></span><i
-       style='mso-bidi-font-style:normal'>.</i><o:p></o:p></li>
-   <li class=MsoNormal style='mso-list:l9 level1 lfo12;tab-stops:list .5in'>We
+       style='mso-bidi-font-style:normal'>.</i></li>
+   <li class=MsoNormal style='mso-list:l3 level1 lfo23;tab-stops:list .5in'>We
        create an <span class=SpellE>EGenericType</span> for the type of <span
        class=SpellE><i style='mso-bidi-font-style:normal'>someReference</i></span>
        whose <span class=SpellE>eClassifier</span> is set to <i
-       style='mso-bidi-font-style:normal'>List&lt;E&gt;</i><o:p></o:p></li>
-   <li class=MsoNormal style='mso-list:l9 level1 lfo12;tab-stops:list .5in'>The
+       style='mso-bidi-font-style:normal'>List&lt;E&gt;</i></li>
+   <li class=MsoNormal style='mso-list:l3 level1 lfo23;tab-stops:list .5in'>The
        generic type of <span class=SpellE><i style='mso-bidi-font-style:normal'>someReference</i></span>
        has an <span class=SpellE>eTypeArgument</span> (an <span class=SpellE>EGenericType</span>)
-       whose upper bound is set to <i style='mso-bidi-font-style:normal'>Car</i>.<o:p></o:p></li>
+       whose upper bound is set to <i style='mso-bidi-font-style:normal'>Car</i>.</li>
   </ol>
   </td>
  </tr>
@@ -2402,11 +2405,11 @@
 
 <h4>UML</h4>
 
-<h4><span style='font-weight:normal'><!--[if gte vml 1]><v:shape id="_x0000_i1055"
+<h4><span style='font-weight:normal'><!--[if gte vml 1]><v:shape id="_x0000_i1060"
  type="#_x0000_t75" style='width:351pt;height:141pt'>
  <v:imagedata src="article_files/image062.png" o:title=""/>
 </v:shape><![endif]--><![if !vml]><img border=0 width=468 height=188
-src="article_files/image063.jpg" v:shapes="_x0000_i1055"><![endif]><o:p></o:p></span></h4>
+src="article_files/image063.jpg" v:shapes="_x0000_i1060"><![endif]><o:p></o:p></span></h4>
 
 <p class=MsoNormal><o:p>&nbsp;</o:p></p>
 
@@ -2416,11 +2419,11 @@
 property for the upper bound set to <i style='mso-bidi-font-style:normal'>Car</i>:
 </p>
 
-<p><!--[if gte vml 1]><v:shape id="_x0000_i1056" type="#_x0000_t75" style='width:204.75pt;
+<p><!--[if gte vml 1]><v:shape id="_x0000_i1061" type="#_x0000_t75" style='width:204.75pt;
  height:36pt'>
  <v:imagedata src="article_files/image064.png" o:title=""/>
 </v:shape><![endif]--><![if !vml]><img border=0 width=273 height=48
-src="article_files/image065.jpg" v:shapes="_x0000_i1056"><![endif]></p>
+src="article_files/image065.jpg" v:shapes="_x0000_i1061"><![endif]></p>
 
 <p><span style='mso-spacerun:yes'> </span>Next, we see that another new class
 is created in order to bind the formal parameter of the generic <i
@@ -2428,11 +2431,11 @@
 style='mso-bidi-font-style:normal'>Wildcard_extends_Car</i></span><i
 style='mso-bidi-font-style:normal'>:<o:p></o:p></i></p>
 
-<p><!--[if gte vml 1]><v:shape id="_x0000_i1057" type="#_x0000_t75" style='width:310.5pt;
+<p><!--[if gte vml 1]><v:shape id="_x0000_i1062" type="#_x0000_t75" style='width:310.5pt;
  height:39pt'>
  <v:imagedata src="article_files/image066.png" o:title=""/>
 </v:shape><![endif]--><![if !vml]><img border=0 width=414 height=52
-src="article_files/image067.jpg" v:shapes="_x0000_i1057"><![endif]></p>
+src="article_files/image067.jpg" v:shapes="_x0000_i1062"><![endif]></p>
 
 <p><o:p>&nbsp;</o:p></p>
 
@@ -2449,11 +2452,11 @@
 
 <h4>Visually</h4>
 
-<p><!--[if gte vml 1]><v:shape id="_x0000_i1058" type="#_x0000_t75" style='width:185.25pt;
+<p><!--[if gte vml 1]><v:shape id="_x0000_i1063" type="#_x0000_t75" style='width:185.25pt;
  height:1in'>
  <v:imagedata src="article_files/image068.png" o:title=""/>
 </v:shape><![endif]--><![if !vml]><img border=0 width=247 height=96
-src="article_files/image069.jpg" v:shapes="_x0000_i1058"><![endif]></p>
+src="article_files/image069.jpg" v:shapes="_x0000_i1063"><![endif]></p>
 
 <p>The interesting part is the bounds information stored in the stereotype (see
 below).</p>
@@ -2509,26 +2512,26 @@
  <tr style='mso-yfti-irow:0;mso-yfti-lastrow:yes'>
   <td width=240 valign=top style='width:180.1pt;border:solid windowtext 1.0pt;
   mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
-  <p class=MsoNormal><!--[if gte vml 1]><v:shape id="_x0000_i1063" type="#_x0000_t75"
+  <p class=MsoNormal><!--[if gte vml 1]><v:shape id="_x0000_i1064" type="#_x0000_t75"
    style='width:145.5pt;height:51pt'>
    <v:imagedata src="article_files/image070.png" o:title=""/>
   </v:shape><![endif]--><![if !vml]><img border=0 width=194 height=68
-  src="article_files/image071.jpg" v:shapes="_x0000_i1063"><![endif]></p>
+  src="article_files/image071.jpg" v:shapes="_x0000_i1064"><![endif]></p>
   </td>
   <td width=767 valign=top style='width:575.1pt;border:solid windowtext 1.0pt;
   border-left:none;mso-border-left-alt:solid windowtext .5pt;mso-border-alt:
   solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
   <ol style='margin-top:0in' start=1 type=1>
-   <li class=MsoNormal style='mso-list:l13 level1 lfo13;tab-stops:list .5in'><i
+   <li class=MsoNormal style='mso-list:l5 level1 lfo26;tab-stops:list .5in'><i
        style='mso-bidi-font-style:normal'>MyClass4</i> has an <span
        class=SpellE>ETypeParameter</span> <i style='mso-bidi-font-style:normal'>P1</i>.</li>
-   <li class=MsoNormal style='mso-list:l13 level1 lfo13;tab-stops:list .5in'>The
+   <li class=MsoNormal style='mso-list:l5 level1 lfo26;tab-stops:list .5in'>The
        <span class=SpellE>ETypeParameter</span> of <i style='mso-bidi-font-style:
        normal'>P1</i> has its <span class=SpellE>eBounds</span> set to an <span
        class=SpellE>EGenericType</span> whose <span class=SpellE>eClassifer</span>
        is <i style='mso-bidi-font-style:normal'>A</i> and another <span
        class=SpellE>EGenericType</span> whose <span class=SpellE>eClassifier</span>
-       is set to <i style='mso-bidi-font-style:normal'>B</i>.<o:p></o:p></li>
+       is set to <i style='mso-bidi-font-style:normal'>B</i>.</li>
   </ol>
   </td>
  </tr>
@@ -2538,11 +2541,11 @@
 
 <h4>UML</h4>
 
-<h4><!--[if gte vml 1]><v:shape id="_x0000_i1059" type="#_x0000_t75" style='width:278.25pt;
+<h4><!--[if gte vml 1]><v:shape id="_x0000_i1065" type="#_x0000_t75" style='width:278.25pt;
  height:52.5pt'>
  <v:imagedata src="article_files/image072.png" o:title=""/>
 </v:shape><![endif]--><![if !vml]><img border=0 width=371 height=70
-src="article_files/image073.jpg" v:shapes="_x0000_i1059"><![endif]><span
+src="article_files/image073.jpg" v:shapes="_x0000_i1065"><![endif]><span
 style='font-weight:normal'><o:p></o:p></span></h4>
 
 <p class=MsoNormal><o:p>&nbsp;</o:p></p>
@@ -2551,11 +2554,11 @@
 have to specify the bounds using the stereotype since multiple bounds on such
 parameters are not possible using UML:</p>
 
-<p><!--[if gte vml 1]><v:shape id="_x0000_i1060" type="#_x0000_t75" style='width:312pt;
+<p><!--[if gte vml 1]><v:shape id="_x0000_i1066" type="#_x0000_t75" style='width:312pt;
  height:36pt'>
  <v:imagedata src="article_files/image074.png" o:title=""/>
 </v:shape><![endif]--><![if !vml]><img border=0 width=416 height=48
-src="article_files/image075.jpg" v:shapes="_x0000_i1060"><![endif]>.</p>
+src="article_files/image075.jpg" v:shapes="_x0000_i1066"><![endif]>.</p>
 
 <p class=MsoNormal><o:p>&nbsp;</o:p></p>
 
@@ -2590,8 +2593,9 @@
 <h2 style='tab-stops:45.8pt 91.6pt 137.4pt 183.2pt 229.0pt 274.8pt 320.6pt 366.4pt 412.2pt 458.0pt 503.8pt 549.6pt 595.4pt 641.2pt 687.0pt 732.8pt'>References</h2>
 
 <p style='tab-stops:45.8pt 91.6pt 137.4pt 183.2pt 229.0pt 274.8pt 320.6pt 366.4pt 412.2pt 458.0pt 503.8pt 549.6pt 595.4pt 641.2pt 687.0pt 732.8pt'><span
-style='mso-spacerun:yes'> </span><span class=GramE>[1] Unified Modeling Language:
-Superstructure, version 2.1.1; formal/2007-02-05.</span> <span class=GramE>OMG.</span></p>
+style='mso-spacerun:yes'> </span><span class=GramE>[1] Unified Modeling
+Language: Superstructure, version 2.1.1; formal/2007-02-05.</span> <span
+class=GramE>OMG.</span></p>
 
 <p style='tab-stops:45.8pt 91.6pt 137.4pt 183.2pt 229.0pt 274.8pt 320.6pt 366.4pt 412.2pt 458.0pt 503.8pt 549.6pt 595.4pt 641.2pt 687.0pt 732.8pt'><span
 style='mso-spacerun:yes'> </span>[2] RTF Issue <a