From 50e058ee0312b832c8ae45930fe7f935b1031477 Mon Sep 17 00:00:00 2001
From: Sam Whited <sam@samwhited.com>
Date: Sun, 30 Aug 2015 11:05:33 -0500
Subject: [PATCH] Support OTRv3 only and remove feature subelements

---
 inbox/otrdisco.xml | 24 +++++++++++++++---------
 1 file changed, 15 insertions(+), 9 deletions(-)

diff --git a/inbox/otrdisco.xml b/inbox/otrdisco.xml
index be091d1e..d9dd19b5 100644
--- a/inbox/otrdisco.xml
+++ b/inbox/otrdisco.xml
@@ -61,18 +61,24 @@
 		<p>
 			If an entity supports OTR it MUST advertise the fact by returning a
 			feature of 'urn:xmpp:otr:0' &VNOTE; in response to a &xep0030;
-			information request. It MUST also include '&lt;version&gt;' elements for
-			each version of the OTR protocol that is supported. Eg. an entity which
-			supports OTR versions 2 and 3 might include the following feature in its
-			disco info list:
-
+			information request. This indicates support for OTRv3 as defined by
+			<i><link url='https://otr.cypherpunks.ca/Protocol-v3-4.0.0.html'>
+				Off-the-Record Messaging Protocol version 3
+			</link></i>
+			<note>
+				(Accessed 2015-08-30). "Off-the-Record Messaging Protocol version 3"
+				&lt;<link url='https://otr.cypherpunks.ca/Protocol-v3-4.0.0.html'>
+					https://otr.cypherpunks.ca/Protocol-v3-4.0.0.html
+				</link>&gt;
+			</note>.
 			<example caption='Disco response'><![CDATA[
-<feature var='urn:xmpp:otr:0'>
-	<version>2</version>
-	<version>3</version>
-</feature>
+<feature var='urn:xmpp:otr:0' />
 			]]></example>
 		</p>
+		<p>
+			If older versions of OTR are required, they may be discovered out of band
+			using OTRs built in mechanism which is beyond the scope of this document.
+		</p>
 	</section1>
 	<section1 topic='Security Considerations' anchor='security'>
 		<p>