--- 1/draft-ietf-ccamp-rwa-info-23.txt	2014-12-04 16:14:46.586943466 -0800
+++ 2/draft-ietf-ccamp-rwa-info-24.txt	2014-12-04 16:14:46.634944634 -0800
@@ -1,25 +1,25 @@
 Network Working Group                                            Y. Lee
 Internet Draft                                                   Huawei
 Intended status: Informational                             G. Bernstein
-Expires: February 2015                                Grotto Networking
+Expires: June 2015                                    Grotto Networking
                                                                   D. Li
                                                                  Huawei
                                                              W. Imajuku
                                                                     NTT
 
-                                                      November 27, 2014
+                                                       December 4, 2014
 
     Routing and Wavelength Assignment Information Model for Wavelength
                          Switched Optical Networks
 
-                     draft-ietf-ccamp-rwa-info-23.txt
+                     draft-ietf-ccamp-rwa-info-24.txt
 
 Status of this Memo
 
    This Internet-Draft is submitted to IETF in full conformance with
    the provisions of BCP 78 and BCP 79.
 
    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.
@@ -28,21 +28,21 @@
    months 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 February 27, 2015.
+   This Internet-Draft will expire on June 4, 2015.
 
 Copyright Notice
 
    Copyright (c) 2014 IETF Trust and the persons identified as the
    document authors.  All rights reserved.
 
    This document is subject to BCP 78 and the IETF Trust's Legal
    Provisions Relating to IETF Documents
    (http://trustee.ietf.org/license-info) in effect on the date of
    publication of this document. Please review these documents
@@ -126,25 +126,27 @@
    applicable only to WSON technology.
 
 2. Terminology
 
    Refer to [RFC6163] for Reconfigurable Optical Add/Drop Multiplexer
    (ROADM), RWA, Wavelength Conversion, Wavelength Division
    Multiplexing (WDM) and WSON.
 
 3. Routing and Wavelength Assignment Information Model
 
-   The WSON RWA information model in this document is grouped into four
-   categories regardless of whether they stem from a switching
-   subsystem or from a line subsystem. A switching subsystem refers to
-   WSON nodes such as ROADM or Optical Add/Drop Multiplexer (OADM) and
-   a line subsystem refers to devices such as WDM or Optical Amplifier:
+   The WSON RWA information model in this document comprises four
+   categories of information. The categories are independent of whether
+   the information comes from a switching subsystem or from a line
+   subsystem -- a switching subsystem refers to WSON nodes such as
+   ROADM or Optical Add/Drop Multiplexer (OADM), and a line subsystem
+   refers to devices such as WDM or Optical Amplifier. The categories
+   are these:
 
    o  Node Information
 
    o  Link Information
 
    o  Dynamic Node Information
 
    o  Dynamic Link Information
 
    Note that this is roughly the categorization used in [G.7715]
@@ -898,20 +900,24 @@
              (GMPLS)", RFC 4203, October 2005.
 
    [RFC4328] Papadimitriou, D., Ed., "Generalized Multi-Protocol Label
              Switching (GMPLS) Signaling Extensions for G.709 Optical
              Transport Networks Control", RFC 4328, January 2006.
 
    [RFC5307] Kompella, K., Ed., and Y. Rekhter, Ed., "IS-IS Extensions
              in Support of Generalized Multi-Protocol Label Switching
              (GMPLS)", RFC 5307, October 2008.
 
+   [RFC6163] Y. Lee, G. Bernstein, W. Imajuku, "Framework for GMPLS and
+             PCE Control of Wavelength Switched Optical Networks", RFC
+             6163, April 2011.
+
    [RFC7308] E. Osborne, "Extended Administrative Groups in MPLS
              Traffic Engineering (MPLS-TE)", RFC 7308, July 2014.
 
    11.2. Informative References
 
    [OFC08]  P. Roorda and B. Collings, "Evolution to Colorless and
              Directionless ROADM Architectures," Optical Fiber
              communication/National Fiber Optic Engineers Conference,
              2008. OFC/NFOEC 2008. Conference on, 2008, pp. 1-3.
 
@@ -920,24 +926,20 @@
 
    [Switch] G. Bernstein, Y. Lee, A. Gavler, J. Martensson, "Modeling
              WDM Wavelength Switching Systems for Use in GMPLS and
              Automated Path Computation", Journal of Optical
              Communications and Networking, vol. 1, June, 2009, pp.
              187-195.
 
    [RFC5920] L. Fang, Ed., "Security Framework for MPLS and GMPLS
              Networks", RFC 5920, July 2010.
 
-   [RFC6163] Y. Lee, G. Bernstein, W. Imajuku, "Framework for GMPLS and
-             PCE Control of Wavelength Switched Optical Networks", RFC
-             6163, April 2011.
-
 12. Contributors
 
    Diego Caviglia
    Ericsson
    Via A. Negrone 1/A 16153
    Genoa Italy
 
    Phone: +39 010 600 3736
    Email: diego.caviglia@(marconi.com, ericsson.com)