From 622e9b08ba9782c5d56b353bb868e6b895455f40 Mon Sep 17 00:00:00 2001
From: Georg Lukas <georg@op-co.de>
Date: Mon, 9 Sep 2019 18:09:29 +0200
Subject: [PATCH] XEP-0280: remove error note, add XEP-0333

---
 xep-0280.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/xep-0280.xml b/xep-0280.xml
index 47e8ccb4..10916709 100644
--- a/xep-0280.xml
+++ b/xep-0280.xml
@@ -330,8 +330,8 @@
     <ul>
       <li>it is of type "chat".</li>
       <li>it is of type "normal" and contains a &lt;body&gt; element.</li>
-      <li>it contains payload elements typically used in IM (&xep0184;, &xep0085;).</li>
-      <li>it is of type "error" and it was sent in response to a &MESSAGE; that was eligible for carbons delivery (Note that as this would require message tracking and correlation on the server, it is unlikely to be generally appropriate for most implementations).</li>
+      <li>it contains payload elements typically used in IM (&xep0184;, &xep0085;, &xep0333;).</li>
+      <li>it is of type "error" and it was sent in response to a &MESSAGE; that was eligible for carbons delivery.</li>
       <li>it matches the MUC-related rules outlined below.</li>
     </ul>
     <p>To properly handle messages exchanged with a MUC (or similar service), the server must be able to identify MUC-related messages. This can be accomplished by tracking the clients' presence in MUCs, or by checking for the <tt>&lt;x xmlns="http://jabber.org/protocol/muc#user"&gt;</tt> element in messages. The following rules apply to MUC-related messages: