diff -r fb321689b3ef -r e0ab25b052a7 data/dictionary.xml
--- a/data/dictionary.xml	Tue Aug 13 15:48:02 2013 +0200
+++ b/data/dictionary.xml	Tue Aug 13 16:37:38 2013 +0200
@@ -1591,7 +1591,7 @@
 		<tag>computer</tag>
 	</concept>
 	<concept>
-		<term abbreviation="VLAN" completeForm="virtual local area network " language="en"/>
+		<term abbreviation="VLAN" completeForm="virtual local area network" language="en"/>
 		<explanation language="en"><text></text></explanation>
 		<tag>computer</tag>
 		<tag>security</tag>
@@ -1670,9 +1670,10 @@
 		<term abbreviation="JMS" completeForm="Java message service" language="en"/>
 		<explanation language="en">
 			<text>
-				a Java Message Oriented Middleware (MOM) API;
+				a Java API for message-oriented middleware (MOM);
 				allows JEE components to create, send, receive and read messages;
 				supports both point-to-point and publish-subscribe messaging models;
+				can be adapted/translated to many other protocols like SMTP, AMQP, XMPP or SOAP;
 				is defined in  JSR 914;
 				examples of JMS implementations: Apache ActiveMQ, OpenJMS, HornetQ
 			</text>
@@ -1694,6 +1695,30 @@
 		<tag>messaging</tag>
 	</concept>
 	<concept>
+		<term abbreviation="AMQP" completeForm="advanced message queuing protocol" language="en"/>
+		<explanation language="en">
+			<text>
+				an open and standard binary protocol for message-oriented middleware (MOM);
+				is vendor and platform independent;
+				whereas JMS defines programming API and is Java specific, the AMQP defines the wire-level protocol;
+				so JMS (or other language/platform specific API) can be used inside the system and AMQP can be used for interconnection of systems in heterogenous environment;
+				example of implementation: Apache ActiveMQ
+			</text>
+		</explanation>
+		<tag>computer</tag>
+		<tag>messaging</tag>
+	</concept>
+	<concept>
+		<term abbreviation="" completeForm="wire-level protocol" language="en"/>
+		<explanation language="en">
+			<text>
+				the format of data sent over the network as stream of bytes;
+				an application layer protocol
+			</text>
+		</explanation>
+		<tag>computer</tag>
+	</concept>
+	<concept>
 		<term abbreviation="JCA" completeForm="Java connector architecture" language="en"/>
 		<explanation language="en"><text></text></explanation>
 		<tag>computer</tag>