Index: amqp.xml
===================================================================
--- amqp.xml	(revision 143)
+++ amqp.xml	(working copy)
@@ -1519,7 +1519,7 @@
     </method>
   </class>
 
-  <!-- ==  CHANNEL  ========================================================== -->
+  <!-- ==  SESSION  ========================================================== -->
 
   <class name="channel" handler="channel" index="20" label="work with channels">
     <doc>
@@ -1531,17 +1531,19 @@
       channel       = open-channel
                       *use-channel
                       close-channel
-      open-channel  = C:OPEN S:OPEN-OK
-                    / C:RESUME S:OK
+      open-channel  = C:OPEN S:ATTACHED
+                    / C:RESUME S:ATTACHED
       use-channel   = C:FLOW S:FLOW-OK
                     / S:FLOW C:FLOW-OK
                     / S:PING C:OK
                     / C:PONG S:OK
                     / C:PING S:OK
                     / S:PONG C:OK
-                    / functional-class
-      close-channel = C:CLOSE S:CLOSE-OK
-                    / S:CLOSE C:CLOSE-OK
+      close-channel = C:SUSPEND S:DETACHED
+                    / C:CLOSE S:CLOSED
+                    / S:CLOSED
+                    / S:CLOSE C:CLOSED
+                    / C:CLOSED
     </doc>
 
     <chassis name="server" implement="MUST" />
@@ -1733,14 +1735,6 @@
       <chassis name="client" implement="MUST" />
       <response name="ok" />
     </method>
-
-    <method name="ok" index="80" label="[WORK IN PROGRESS] signals normal completion">
-      <doc>
-        [WORK IN PROGRESS] Signals normal completion of a method.
-      </doc>
-      <chassis name="server" implement="MUST" />
-      <chassis name="client" implement="MUST" />
-    </method>
   </class>
 
   <!-- ==  ACCESS  =========================================================== -->