1.1 --- a/data/dictionary.xml	Fri Aug 16 12:44:48 2013 +0200
     1.2 +++ b/data/dictionary.xml	Fri Aug 16 13:32:45 2013 +0200
     1.3 @@ -1338,7 +1338,32 @@
     1.4  	</concept>
     1.5  	<concept>
     1.6  		<term abbreviation="" completeForm="Java" language="en"/>
     1.7 -		<explanation language="en"><text></text></explanation>
     1.8 +		<explanation language="en">
     1.9 +			<text>
    1.10 +				an object-oriented programming language designed by James Gosling at Sun Microsystems;
    1.11 +				Java source code is compiled into byte code (.class files) which can be executed in JVM on many architectures and operating systems;
    1.12 +				Java is completely free software, there is OpenJDK and standard library distributed under GNU GPL license;
    1.13 +				there is also GNU Classpath – an independent and free software implementation of the standard library;
    1.14 +				Java is popular and well established enterprise-grade software platform
    1.15 +			</text>
    1.16 +		</explanation>
    1.17 +		<tag>computer</tag>
    1.18 +		<tag>java</tag>
    1.19 +	</concept>
    1.20 +	<concept>
    1.21 +		<term abbreviation="JVM" completeForm="Java virtual machine" language="en"/>
    1.22 +		<explanation language="en">
    1.23 +			<text>
    1.24 +				a runtime environment for running Java byte code;
    1.25 +				there is lot of programming languages that can be compiled into the bytecode and executed in JVM e.g.
    1.26 +					Clojure (a Lisp dialect),
    1.27 +					Scala (OOP and functional language),
    1.28 +					Groovy (a scripting language),
    1.29 +					Jython (an implementation of Python),
    1.30 +					JRuby
    1.31 +					or Rhino (JavaScript)
    1.32 +			</text>
    1.33 +		</explanation>
    1.34  		<tag>computer</tag>
    1.35  		<tag>java</tag>
    1.36  	</concept>