Merge pull request #1264 from umple/ManualPageUpdates2

Fix bug in Umple tools manual page

build/reference/0102umpleTools.txt

@@ -12,10 +12,7 @@ and compile .ump files.</p>
 
 <li><b>Eclipse.</b> To use Umple with Eclipse, you need to load an Umple 
 Eclipse plugin. This can be obtained from our <a 
-href="https://github.com/umple/Umple/releases/tag/v.1.22.0.5146>downloads site</a>. 
-Note there is a plain plugin and a plugin enhanced with the XText 
-technology that gives context-assist to help you program or model with 
-fewer errors.</li>
+href="http://dl.umple.org">downloads site</a>.</li>
 
 <br />
 
@@ -30,7 +27,7 @@ can be run locally on your machine by using a Docker image. <a href="https://hub
 
 <li><b>Command-line based compiler</b> You can always use Umple from the 
 command line, typically from an ant script. Simply <a
-href="https://github.com/umple/Umple/releases/tag/v.1.22.0.5146">download the latest 
+href="https://github.com/umple/umple/releases/latest">download the latest 
 officially released version of the umple jar</a>, and run it as "java -jar umple.jar *.ump".</li>
 
 <br />

build/reference/0122structureOfUmpleCode.txt

@@ -6,19 +6,33 @@ noreferences
 
 <p><b>Organizing the contents of an Umple (.ump) file</b></p>
 
-<p>An Umple file will contain a number of <a href="TypesofDirectives.html">directives</a>. These can be:
+<p>An Umple file will contain a number of <a href="TypesofDirectives.html">top level items we call directives</a>. These can be:
 
 <ul>
 
-<li><b>Entitles</b> such as <a href="ClassDefinition.html">classes</a> or 
-<a href="interfaceDefinition.html">interfaces</a>. These look very similar to 
+<li><b>Entities</b> such as <a href="ClassDefinition.html">classes</a> or 
+<a href="interfaceDefinition.html">interfaces</a>. These first two kinds of entities look very similar to 
 the definitions of classes or interfaces in Java. Indeed they can be 
 identical to what you would find in a Java (or PHP or Ruby) file. However, 
 the key difference is that they can also contain Umple code for UML 
 constructs such as <a href="AssociationDefinition.html">associations</a>, <a href="AttributeDefinition.html">attributes</a> and <a href="BasicStateMachines.html">state machines</a>. Another 
 difference is that in Umple, you can have multiple definitions of the same 
-class; the contents of the second and subsequent definition are 
-<i>added</i> to the overall definition of the class.</li>
+entity; the contents of the second and subsequent definition are 
+<i>added</i> to the overall definition of the class.
+<p>
+The specific entities you can create include the following</p>
+  <ul>
+    <li><a href="ClassDefinition.html">Classes</a></li>  
+    <li><a href="interfaceDefinition.html">Interfaces</a></li>
+    <li><a href="Traits.html">Traits: Re-usable building blocks of classes</a></li>
+    <li><a href="InterfacingtoExternalCode.html">External definitions of classes</a></li>
+    <li><a href="IndependentlyDefinedAssociations.html">Standalone associations</a></li>
+    <li><a href="AssociationClassDefinition.html">Association classes</a></li>
+    <li>Standalone <a href="BasicStateMachines.html">state machines</a></li>
+    <li><a href="EnumerationDefinition.html">Global enumerations</a></li>    
+  </ul>
+
+</li>
 
 <br />