From c2d057f4b2e4ee9dcaec1e8898ba3bbdcded5d1e Mon Sep 17 00:00:00 2001
From: Florian Schmaus <flo@geekplace.eu>
Date: Mon, 24 Jun 2013 21:27:43 +0000
Subject: [PATCH] SMACK-431 Reworded Entity Caps documentation, added missing
 frame link

git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/branches/smack_3_3_1@13692 b35dd754-fafc-0310-a699-88a17e54d16e
---
 documentation/extensions/caps.html  | 2 +-
 documentation/extensions/intro.html | 7 ++++++-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/documentation/extensions/caps.html b/documentation/extensions/caps.html
index eb94e4bc1..71e0e2f77 100644
--- a/documentation/extensions/caps.html
+++ b/documentation/extensions/caps.html
@@ -15,7 +15,7 @@ This section details the usage of Smacks implementation of Entity Capabilities.
 
 <b>Description</b><p>
 
-Entity Capabilities is an extension to the Service Discovery (<a href="http://xmpp.org/extensions/xep-0030.html">XEP-0030</a>), which, in order to minimize network impact, caches the capabilities information of XMPP entities.
+Entity Capabilities is a XMPP Protocol extension, which, in order to minimize network impact, caches the capabilities of XMPP entities. Those capabilities are determined with the help of the Service Discovery Protocol (<a href="http://xmpp.org/extensions/xep-0030.html">XEP-0030</a>).
 
 </p>
 
diff --git a/documentation/extensions/intro.html b/documentation/extensions/intro.html
index 03dae469c..227c2a14f 100644
--- a/documentation/extensions/intro.html
+++ b/documentation/extensions/intro.html
@@ -75,6 +75,11 @@
             <td><a href="http://www.xmpp.org/extensions/xep-0060.html">XEP-0060</a></td>
             <td>Generic publish and subscribe functionality.</td>
         </tr>		
+        <tr>
+            <td><a href="caps.html">Entity Capabilities</a></td>
+            <td><a href="http://www.xmpp.org/extensions/xep-0115.html">XEP-0115</a></td>
+            <td>Generic publish and subscribe functionality.</td>
+        </tr>
     </table>
 </body>
-</html>
\ No newline at end of file
+</html>