--- 1/draft-ietf-cdi-model-01.txt	2007-12-18 18:42:22.000000000 +0100
+++ 2/draft-ietf-cdi-model-02.txt	2007-12-18 18:42:22.000000000 +0100
@@ -1,23 +1,23 @@
 
 Network Working Group                                             M. Day
 Internet-Draft                                                     Cisco
-Expires: August 23, 2002                                         B. Cain
+Expires: November 1, 2002                                        B. Cain
                                                                 Storigen
                                                             G. Tomlinson
                                                                CacheFlow
                                                               P. Rzewski
                                                                  Inktomi
-                                                       February 22, 2002
+                                                             May 3, 2002
 
                A Model for Content Internetworking (CDI)
-                      draft-ietf-cdi-model-01.txt
+                      draft-ietf-cdi-model-02.txt
 
 Status of this Memo
 
    This document is an Internet-Draft and is in full conformance with
    all provisions of Section 10 of RFC2026.
 
    Internet-Drafts are working documents of the Internet Engineering
    Task Force (IETF), its areas, and its working groups.  Note that
    other groups may also distribute working documents as Internet-
    Drafts.
@@ -26,21 +26,21 @@
    and may be updated, replaced, or obsoleted by other documents at any
    time.  It is inappropriate to use Internet-Drafts as reference
    material or to cite them other than as "work in progress."
 
    The list of current Internet-Drafts can be accessed at http://
    www.ietf.org/ietf/1id-abstracts.txt.
 
    The list of Internet-Draft Shadow Directories can be accessed at
    http://www.ietf.org/shadow.html.
 
-   This Internet-Draft will expire on August 23, 2002.
+   This Internet-Draft will expire on November 1, 2002.
 
 Copyright Notice
 
    Copyright (C) The Internet Society (2002).  All Rights Reserved.
 
 Abstract
 
    Content [distribution] internetworking (CDI) is the technology for
    interconnecting content networks, sometimes previously called
    "content peering" or "CDN peering." A common vocabulary helps the
@@ -685,37 +685,38 @@
 
 6. Security Considerations
 
    This document defines terminology and concepts for content
    internetworking.  The terminology itself does not introduce any
    security-related issues.  The implementation of content
    internetworking concepts does raise some security-related issues,
    which we identify in broad categories below.  Other CDI documents
    will address their specific security-related issues in more detail.
 
-   Secure relationship establishment: content internetworking must
-   provide means to ensure that content networks are internetworking
-   only with other content networks as intended.  It must be possible to
-   prevent unauthorized internetworking or spoofing of another network's
+   Secure relationship establishment: CONTENT INTERNETWORKING GATEWAYS
+   must ensure that CONTENT NETWORKS are internetworking only with other
+   CONTENT NETWORKS as intended.  It must be possible to prevent
+   unauthorized internetworking or spoofing of another CONTENT NETWORK's
    identity.
 
-   Secure content transfer: content internetworking must support
-   content-network mechanisms that ensure both the integrity of content
-   and the integrity of the delivery process, even when the delivering
-   network is not the originating network.  Content internetworking must
-   allow for mechanisms to prevent theft or corruption of content.
+   Secure content transfer: CONTENT INTERNETWORKING GATEWAYS must
+   support CONTENT NETWORK mechanisms that ensure both the integrity of
+   CONTENT and the integrity of both DISTRIBUTION and DELIVERY, even
+   when both ORIGINATING and ENLISTED networks are involved.  CONTENT
+   INTERNETWORKING GATEWAYS must allow for mechanisms to prevent theft
+   or corruption of CONTENT.
 
-   Secure meta-content transfer: content internetworking must support
-   the movement of accurate, reliable, auditable information about costs
-   and performance between content networks.  Content internetworking
-   must allow for mechanisms to prevent the diversion or corruption of
-   accounting data and similar meta-content.
+   Secure meta-content transfer: CONTENT INTERNETWORKING GATEWAYS must
+   support the movement of accurate, reliable, auditable ACCOUNTING
+   information between CONTENT NETWORKS.  CONTENT INTERNETWORKING
+   GATEWAYS must allow for mechanisms to prevent the diversion or
+   corruption of ACCOUNTING data and similar meta-content.
 
 7. Acknowledgements
 
    The authors acknowledge the contributions and comments of Fred
    Douglis (AT&T), Don Gilletti (CacheFlow), Markus Hoffmann (Lucent),
    Barron Housel (Cisco), Barbara Liskov (Cisco), John Martin (Network
    Appliance), Nalin Mistry (Nortel Networks) Raj Nair (Cisco), Hilarie
    Orman (Volera), Doug Potter (Cisco), and Oliver Spatscheck (AT&T).
 
    [Note to RFC Editor: The last normative reference is [3], all