mirror of
https://github.com/moparisthebest/xeps
synced 2024-11-24 18:22:24 -05:00
updated ZRTP and fixed 2 xml bugs
git-svn-id: file:///home/ksmith/gitmigration/svn/xmpp/trunk@655 4b5297f7-1745-476d-ba37-a9c6900126ab
This commit is contained in:
parent
b7605a47af
commit
75ba01987b
22
xep.ent
22
xep.ent
@ -1,14 +1,14 @@
|
||||
<!--
|
||||
<!--
|
||||
This file contains common entities for use in XEPs.
|
||||
It is maintained by the XMPP Extensions Editor:
|
||||
|
||||
It is maintained by the XMPP Extensions Editor:
|
||||
|
||||
http://www.xmpp.org/extensions/editor.shtml
|
||||
|
||||
Please do not add entities to this file; instead,
|
||||
|
||||
Please do not add entities to this file; instead,
|
||||
add them to the relevant XEP (see XEP-0116 for an
|
||||
example) and then ask the XMPP Extensions Editor
|
||||
example) and then ask the XMPP Extensions Editor
|
||||
to add them to this file.
|
||||
|
||||
|
||||
Thanks!
|
||||
-->
|
||||
|
||||
@ -123,7 +123,7 @@
|
||||
|
||||
<!-- legal notice required by the XSF's IPR Policy -->
|
||||
|
||||
<!ENTITY LEGALNOTICE "<legal>This XMPP Extension Protocol is copyright 1999 - 2007 by the <link url='http://www.xmpp.org/xsf/'>XMPP Standards Foundation</link> (XSF) and is in full conformance with the XSF's Intellectual Property Rights Policy <<link url='http://www.xmpp.org/extensions/ipr-policy.shtml'>http://www.xmpp.org/extensions/ipr-policy.shtml</link>>. This material may be distributed only subject to the terms and conditions set forth in the Creative Commons Attribution License (<<link url='http://creativecommons.org/licenses/by/2.5/'>http://creativecommons.org/licenses/by/2.5/</link>>).</legal>" >
|
||||
<!ENTITY LEGALNOTICE "<legal>This XMPP Extension Protocol is copyright 1999 - 2007 by the <link url='http://www.xmpp.org/xsf/'>XMPP Standards Foundation</link> (XSF) and is in full conformance with the XSF's Intellectual Property Rights Policy <<link url='http://www.xmpp.org/extensions/ipr-policy.shtml'>http://www.xmpp.org/extensions/ipr-policy.shtml</link>>. This material may be distributed only subject to the terms and conditions set forth in the Creative Commons Attribution License (<<link url='http://creativecommons.org/licenses/by/2.5/'>http://creativecommons.org/licenses/by/2.5/</link>>).</legal>" >
|
||||
|
||||
<!-- other XSF-related text shortcuts -->
|
||||
|
||||
@ -396,8 +396,8 @@
|
||||
<!ENTITY rfc4347 "<span class='ref'><link url='http://tools.ietf.org/html/rfc4347'>RFC 4347</link></span> <note>RFC 4347: Datagram Transport Layer Security <<link url='http://tools.ietf.org/html/rfc4347'>http://tools.ietf.org/html/rfc4347</link>>.</note>" >
|
||||
<!ENTITY rfc4395 "<span class='ref'><link url='http://tools.ietf.org/html/rfc4395'>RFC 4395</link></span> <note>RFC 4395: Guidelines and Registration Procedures for New URI Schemes <<link url='http://tools.ietf.org/html/rfc4395'>http://tools.ietf.org/html/rfc4395</link>>.</note>" >
|
||||
<!ENTITY rfc4422 "<span class='ref'><link url='http://tools.ietf.org/html/rfc4422'>RFC 4422</link></span> <note>RFC 4422: Simple Authentication and Security Layer (SASL) <<link url='http://tools.ietf.org/html/rfc4422'>http://tools.ietf.org/html/rfc4422</link>>.</note>" >
|
||||
<!ENTITY rfc4480 "<span class='ref'><link url='http://www.rfc-editor.org/rfc/rfc4480.txt'><link url='http://tools.ietf.org/html/rfc4480'>RFC 4480</link></span> <note>RFC 4480: RPID: Rich Presence Extensions to the Presence Information Data Format (PIDF) <<link url='http://www.rfc-editor.org/rfc/rfc4480.txt'>http://www.rfc-editor.org/rfc/rfc4480.txt</link>>.</note>" >
|
||||
<!ENTITY rfc4481 "<span class='ref'><link url='http://www.rfc-editor.org/rfc/rfc4481.txt'><link url='http://tools.ietf.org/html/rfc4481'>RFC 4481</link></span> <note>RFC 4481: Timed Presence Extensions to the Presence Information Data Format (PIDF) to Indicate Status Information for Past and Future Time Intervals <<link url='http://www.rfc-editor.org/rfc/rfc4481.txt'>http://www.rfc-editor.org/rfc/rfc4481.txt</link>>.</note>" >
|
||||
<!ENTITY rfc4480 "<span class='ref'><link url='http://tools.ietf.org/html/rfc4480'>RFC 4480</link></span> <note>RFC 4480: RPID: Rich Presence Extensions to the Presence Information Data Format (PIDF) <<link url='http://tools.ietf.org/html/rfc4480'>http://tools.ietf.org/html/rfc4480</link>>.</note>" >
|
||||
<!ENTITY rfc4481 "<span class='ref'><link url='http://tools.ietf.org/html/rfc4481'>RFC 4481</link></span> <note>RFC 4481: Timed Presence Extensions to the Presence Information Data Format (PIDF) to Indicate Status Information for Past and Future Time Intervals <<link url='http://tools.ietf.org/html/rfc4481'>http://tools.ietf.org/html/rfc4481</link>>.</note>" >
|
||||
<!ENTITY rfc4505 "<span class='ref'><link url='http://tools.ietf.org/html/rfc4505'>RFC 4505</link></span> <note>RFC 4505: The SASL ANONYMOUS Mechanism <<link url='http://tools.ietf.org/html/rfc4505'>http://tools.ietf.org/html/rfc4505</link>>.</note>" >
|
||||
<!ENTITY rfc4566 "<span class='ref'><link url='http://tools.ietf.org/html/rfc4566'>RFC 4566</link></span> <note>RFC 4566: SDP: Session Description Protocol <<link url='http://tools.ietf.org/html/rfc4566'>http://tools.ietf.org/html/rfc4566</link>>.</note>" >
|
||||
<!ENTITY rfc4622 "<span class='ref'><link url='http://tools.ietf.org/html/rfc4622'>RFC 4622</link></span> <note>RFC 4622: Internationalized Resource Identifiers (IRIs) and Uniform Resource Identifiers (URIs) for the Extensible Messaging and Presence Protocol (XMPP) <<link url='http://tools.ietf.org/html/rfc4622'>http://tools.ietf.org/html/rfc4622</link>>.</note>" >
|
||||
@ -425,7 +425,7 @@
|
||||
<!ENTITY tcprobust "<span class='ref'><link url='http://www.ietf.org/internet-drafts/draft-ietf-ietf-tcpm-tcpsecure-06.txt'>Improving TCP's Robustness to Blind In-Window Attacks</link></span> <note>Improving TCP's Robustness to Blind In-Window Attacks <<link url='http://www.ietf.org/internet-drafts/draft-ietf-ietf-tcpm-tcpsecure-06.txt'>http://www.ietf.org/internet-drafts/draft-ietf-ietf-tcpm-tcpsecure-06.txt</link>>. Work in progress.</note>" >
|
||||
<!ENTITY turn "<span class='ref'><link url='http://www.ietf.org/internet-drafts/draft-ietf-behave-turn-02.txt'>TURN</link></span> <note>Obtaining Relay Addresses from Simple Traversal Underneath NAT (STUN) <<link url='http://www.ietf.org/internet-drafts/draft-ietf-behave-turn-02.txt'>http://www.ietf.org/internet-drafts/draft-ietf-behave-turn-02.txt</link>>. Work in progress.</note>" >
|
||||
<!ENTITY unaptr "<span class='ref'><link url='http://www.ietf.org/internet-drafts/draft-daigle-unaptr-02.txt'>U-NAPTR</link></span> <note>Domain-based Application Service Location Using URIs and the Dynamic Delegation Discovery Service <<link url='http://www.ietf.org/internet-drafts/draft-daigle-unaptr-02.txt'>http://www.ietf.org/internet-drafts/draft-daigle-unaptr-02.txt</link>>. Work in progress.</note>" >
|
||||
<!ENTITY zrtp "<span class='ref'><link url='http://www.ietf.org/internet-drafts/draft-zimmermann-avt-zrtp-01.txt'>ZRTP</link></span> <note>ZRTP: Extensions to RTP for Diffie-Hellman Key Agreement for SRTP <<link url='http://www.ietf.org/internet-drafts/draft-zimmermann-avt-zrtp-01.txt'>http://www.ietf.org/internet-drafts/draft-zimmermann-avt-zrtp-01.txt</link>>. Work in progress.</note>" >
|
||||
<!ENTITY zrtp "<span class='ref'><link url='http://www.ietf.org/internet-drafts/draft-zimmermann-avt-zrtp-03.txt'>ZRTP</link></span> <note>ZRTP: Media Path Key Agreement for Secure RTP <<link url='http://www.ietf.org/internet-drafts/draft-zimmermann-avt-zrtp-03.txt'>http://www.ietf.org/internet-drafts/draft-zimmermann-avt-zrtp-03.txt</link>>. Work in progress.</note>" >
|
||||
|
||||
<!-- IANA registries -->
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user