From 66e83acd476bb9df80903bde27af1f4af306092d Mon Sep 17 00:00:00 2001
From: Georg Lukas <georg@op-co.de>
Date: Wed, 15 Feb 2017 09:24:11 +0100
Subject: [PATCH] XEP-0280: remove 'forking', improve error handling text

---
 xep-0280.xml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/xep-0280.xml b/xep-0280.xml
index dab6daf4..20f3d764 100644
--- a/xep-0280.xml
+++ b/xep-0280.xml
@@ -418,17 +418,17 @@
   <section2 topic='Handling of Errors' anchor='bizrules-errors'>
     <p>The following rules prevent some of the half-failure modes that have been an issue in other prototocols:</p>
     <ul>
-      <li>When a receiving server attempts to deliver a forked message, and that message bounces with an error for any reason, the receiving server MUST NOT forward that error back to the original sender.</li>
-      <li>The receiving server SHOULD use the sent element in the bounce to determine that an error is from a forked message.</li>
+      <li>When a server attempts to deliver a (locally generated) carbon copy, and that carbon copy bounces with an error for any reason, the server MUST NOT forward that error back to the original sender.</li>
+      <li>The server can use the &lt;sent/&gt; or &lt;received/&gt; element in the bounce to determine that an error is from a carbon-copied message.</li>
     </ul>
   </section2>
   <section2 topic='Auto-responses' anchor='bizrules-autoresponses'>
     <p>Clients that automatically respond to messages for any reason (e.g., when in the "dnd" presence show state) MUST take adequate care when enabling Carbons in order to prevent storms or loops.</p>
-    <p>Carbon copies of messages MUST NOT be auto-replied to under any circumstances.</p>
-    <p>Forked inbound messages MUST NOT be auto-replied to unless the client has some way of ensuring no more than one auto-reply is sent from all of its user's resources.</p>
+    <p>Forwarded outbound messages MUST NOT be auto-replied to under any circumstances.</p>
+    <p>Forwarded inbound messages MUST NOT be auto-replied to unless the client has some way of ensuring no more than one auto-reply is sent from all of its user's resources.</p>
   </section2>
   <section2 topic='Mobile Considerations' anchor='bizrules-mobile'>
-    <p>Enabling this protocol on mobile devices needs to be undertaken with care. This protocol can result in additional bandwidth and power usage, possibly decreasing battery lifetime and increasing monetary costs.  Additional mechanisms for controlling the Carbon-copying or forking of individual conversations might need to be added to deal with mobile clients in the future.</p>
+    <p>Enabling this protocol on mobile devices needs to be undertaken with care. This protocol can result in additional bandwidth and power usage, possibly decreasing battery lifetime and increasing monetary costs.  Additional mechanisms for controlling the Carbon-copying of individual conversations might need to be added to deal with mobile clients in the future.</p>
   </section2>
 </section1>
 <section1 topic='Security Considerations' anchor='security'>