Add registrar section; fix another broken link to MAM-PUBSUB
+Servers MUST NOT include the <stanza-id/> element in messages addressed to JIDs that do not have permissions to access the archive, such as a users’s outgoing messages to their contacts. However servers SHOULD include the element as a child of the forwarded message when using &xep0280;
This specification reserves the 'node' attribute of the <query> element for use with pubsub archives. Full details of using - this protocol to query pubsub node archives are documented in [FIXME: number to be assigned to xep-pubsub-mam].
++ This specification reserves the 'node' attribute of the <query> + element for use with pubsub archives. + Its use is defined in &xep0442;. +
This specification defines the following XML namespace:
++ Upon advancement of this specification from a status of Experimental to a + status of Draft, the ®ISTRAR; shall add the foregoing namespace to the + registry located at &DISCOFEATURES; as described in Section 4 of + &xep0053;. +
+
+ urn:xmpp:mam:2
+ Support for Message Archive Management.
+ &xep0313;
+]]>
+ + The ®ISTRAR; shall also add the foregoing namespace to the Jabber/XMPP + Protocol Namespaces Registry located at &NAMESPACES;. +
+
+ urn:xmpp:mam:2
+ &xep0313;
+]]>
+ + This specification defines the following form types: +
++ Upon advancement of this specification from a status of Experimental to a + status of Draft, the ®ISTRAR; shall add the foregoing namespace to the + registry located at &FORMTYPES; as described in &xep0068;. +
+
+ urn:xmpp:mam:2
+ &xep0313;
+ Query for items in a message archive.
+
+