From dd00810c0ef7b7b45a47ad2564186e464b64613e Mon Sep 17 00:00:00 2001
From: Peter Saint-Andre <stpeter@jabber.org>
Date: Fri, 9 May 2008 21:17:30 +0000
Subject: [PATCH] 02: Retracted in favor of XEP-0161

git-svn-id: file:///home/ksmith/gitmigration/svn/xmpp/trunk@1833 4b5297f7-1745-476d-ba37-a9c6900126ab
---
 xep-0236.xml | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/xep-0236.xml b/xep-0236.xml
index 6120e530..e48e2891 100644
--- a/xep-0236.xml
+++ b/xep-0236.xml
@@ -7,10 +7,10 @@
 <xep>
 <header>
   <title>Abuse Reporting</title>
-  <abstract>This specification defines an XMPP protocol extension for reporting abusive traffic between two XMPP servers.</abstract>
+  <abstract>This specification defines an XMPP protocol extension for reporting abusive traffic sent over an XMPP network. Note: This specification has been retracted in favor of XEP-0161, which now contains the content originally published in this specification.</abstract>
   &LEGALNOTICE;
   <number>0236</number>
-  <status>Experimental</status>
+  <status>Retracted</status>
   <type>Standards Track</type>
   <sig>Standards</sig>
   <approver>Council</approver>
@@ -22,6 +22,12 @@
   <supersededby/>
   <shortname>NOT YET ASSIGNED</shortname>
   &stpeter;
+  <revision>
+    <version>0.2</version>
+    <date>2008-05-09</date>
+    <initials>psa</initials>
+    <remark><p>Retracted in favor of XEP-0161, which now contains the content originally published in this specification.</p></remark>
+  </revision>
   <revision>
     <version>0.1</version>
     <date>2008-03-05</date>
@@ -49,7 +55,7 @@
 </header>
 
 <section1 topic='Introduction' anchor='intro'>
-  <p>Unfortunately, not all XMPP entities are well-behaved. Currently, if an XMPP entity sends abusive stanzas over a server-to-server connection, there is no way for the receiving server to inform the sending server that the sender is generating abusive traffic. In practice, the receiving server may need to terminate the server-to-server connection (again without explicitly informing the sending server about the reason for the termination) rather than continue to accept the abusive traffic.</p>
+  <p>Unfortunately, not all XMPP entities are well-behaved. Currently, if an XMPP entity (the "attacker") sends abusive stanzas to another XMPP entity (the "victim"), there is no way for the victim or the victim's server to inform the attacker's server that the attacker is generating abusive traffic. In practice, the victim's server may need to terminate the server-to-server connection (currently without explicitly informing the attacker's server about the reason for the termination) rather than continue to accept the abusive traffic.</p>
   <p>This situation is far from desirable. Therefore, this specification defines three small XMPP protocol functions that can help to improve the reliability of server-to-server connections:</p>
   <ol>
     <li>A method by which the receiving server can send an abuse report to the sending server, including the JID(s) of the sender(s).</li>