diff -r 46c6450d8294 -r fb321689b3ef data/dictionary.xml
--- a/data/dictionary.xml	Tue Aug 13 15:22:32 2013 +0200
+++ b/data/dictionary.xml	Tue Aug 13 15:48:02 2013 +0200
@@ -1654,32 +1654,58 @@
 	<concept>
 		<term abbreviation="JMX" completeForm="Java management extensions" language="en"/>
 		<term abbreviation="MBean" completeForm="managed bean" language="en"/>
-		<explanation language="en"><text>
+		<explanation language="en">
+			<text>
 				a Java technology for monitoring and managing applications or devices;
 				similar to SNMP;
 				managed objects (MBeans) can emit events, can be asked for values (e.g. counters) or an action (method) can be called on them;
 				this native Java technology can be also adapted/translated to other protocols like SNMP or WS/SOAP and integrated with the non-Java world;
 				thanks to this abstraction, the managed object can implement only simple Java interface and don't have to deal with other protocols (which is job of generic adaptors)
-			</text></explanation>
+			</text>
+		</explanation>
 		<tag>computer</tag>
 		<tag>java</tag>
 	</concept>
 	<concept>
 		<term abbreviation="JMS" completeForm="Java message service" language="en"/>
 		<explanation language="en">
-			<text></text>
+			<text>
+				a Java Message Oriented Middleware (MOM) API;
+				allows JEE components to create, send, receive and read messages;
+				supports both point-to-point and publish-subscribe messaging models;
+				is defined in  JSR 914;
+				examples of JMS implementations: Apache ActiveMQ, OpenJMS, HornetQ
+			</text>
 		</explanation>
 		<tag>computer</tag>
 		<tag>java</tag>
 		<tag>messaging</tag>
 	</concept>
 	<concept>
+		<term abbreviation="MOM" completeForm="message-oriented middleware" language="en"/>
+		<explanation language="en">
+			<text>
+				a software (or even hardware) infrastructure for sending and receiving messages;
+				can also offer routing and transformation features;
+				for Java the MOM API is standardized as JMS
+			</text>
+		</explanation>
+		<tag>computer</tag>
+		<tag>messaging</tag>
+	</concept>
+	<concept>
 		<term abbreviation="JCA" completeForm="Java connector architecture" language="en"/>
 		<explanation language="en"><text></text></explanation>
 		<tag>computer</tag>
 		<tag>java</tag>
 	</concept>
 	<concept>
+		<term abbreviation="OSGi" completeForm="Open Services Gateway initiative" language="en"/>
+		<explanation language="en"><text></text></explanation>
+		<tag>computer</tag>
+		<tag>java</tag>
+	</concept>
+	<concept>
 		<term abbreviation="VPN" completeForm="virtual private network" language="en"/>
 		<explanation language="en"><text></text></explanation>
 		<tag>computer</tag>