--- 1/draft-ietf-sipcore-rfc4244bis-callflows-04.txt	2013-07-11 23:14:23.399392996 -0700
+++ 2/draft-ietf-sipcore-rfc4244bis-callflows-05.txt	2013-07-11 23:14:23.483395300 -0700
@@ -5,21 +5,21 @@
 Expires: January 2, 2014                                           Skype
                                                              S. Schubert
                                                                      NTT
                                                            H. van Elburg
                                               Detecon International Gmbh
                                                              C. Holmberg
                                                                 Ericsson
                                                                 Jul 2013
 
 Session Initiation Protocol (SIP) History-Info Header Call Flow Examples
-             draft-ietf-sipcore-rfc4244bis-callflows-04.txt
+             draft-ietf-sipcore-rfc4244bis-callflows-05.txt
 
 Abstract
 
    This document describes use cases and documents call flows which
    require the History-Info header field to capture the Request-URIs as
    a Session Initiation Protocol (SIP) Request is retargeted.  The use
    cases are described along with the corresponding call flow diagrams
    and messaging details.
 
 Status of this Memo
@@ -341,21 +341,21 @@
    Via: SIP/2.0/TCP 192.0.2.3:5060;branch=z9hG4bK4321
    From: Alice <sip:alice@example.com>;tag=sr3dds
    To: Bob <sip:bob@example.com>;tag=55rdds
    Call-Id: 12345600@example.com
    History-Info: <sip:bob@example.com>;index=1
    History-Info: <sip:bob@192.0.2.4?Reason=SIP%3Bcause%3D302>;\
                  index=1.1;rc=1
    History-Info: <sip:office@example.com?Reason=SIP%3Bcause%3D408>;\
                                                            index=1.2;mp=1
    History-Info: <sip:office@192.0.2.5?Reason=SIP%3Bcause%3D408>;\
-                 index=1.2.1;index=1.2.1;rc=1.2
+                 index=1.2.1;rc=1.2
    History-Info: <sip:home@example.com>;index=1.3;mp=1
    History-Info: <sip:home@192.0.2.6>;index=1.3.1;rc=1.3
    CSeq: 1 INVITE
    Content-Length: 0
    F12 486 Busy Here example.com -> alice
 
    SIP/2.0  486 Busy Here
    Via: SIP/2.0/TCP 192.0.2.3:5060;branch=z9hG4bK4321
    From: Alice <sip:alice@example.com>;tag=sr3dds
    To: Bob <sip:bob@example.com>;tag=55rdds
@@ -1267,24 +1267,24 @@
    Call-Id: 12345600@example.com
    CSeq: 1 INVITE
    History-Info: <sip:bob@example.com>;index=1
    History-Info: <sip:bob@192.0.2.5?Reason=SIP%3Bcause%3D302>;\
                       index=1.1;rc=1
    History-Info: <sip:carol@example.com;cause=480?Reason=SIP%3Bcause%3D\
                                                                             408>;index=1.2;mp=1
    History-Info: <sip:carol@192.0.2.4;cause=480?Reason=SIP%3Bcause%3D\
                       408>;index=1.2.1;rc=1.2
    History-Info: <sip:vm@example.com;\
-                      target=sip:bob%40example.com;cause=408>;\
+                      target=sip:bob%40example.com;cause=480>;\
                       index=1.3;mp=1
    History-Info: <sip:vm@192.0.2.6;\
-                      target=sip:bob%40example.com;cause=408>;\
+                      target=sip:bob%40example.com;cause=480>;\
                       index=1.3.1;rc=1.3
    Contact: <sip:vm@192.0.2.6>
    Content-Type: application/sdp
    Content-Length: <appropriate value>
 
    [SDP Not Shown]
 
                   Figure 6: Enterprise Voivemail Example
 
    The VMS can look at the last hi-entry and find the target of the
@@ -1408,21 +1408,21 @@
    Via: SIP/2.0/TCP proxy.example.com:5060;branch=z9hG4bK24s5
    Via: SIP/2.0/TCP 192.0.2.3:5060;branch=z9hG4bK42t2
    Max-Forward: 69
    From: Alice <sip:alice@example.com>;tag=kkaz-
    To: Bob <sip:bob@example.com>
    Supported: histinfo
    Call-Id: 12345600@example.com
    CSeq: 1 INVITE
    History-Info: <sip:bob@example.com>;index=1
    History-Info: <sip:bob@192.0.2.5?Reason=SIP%3Bcause%3D302\
-                                                           %3Btext%3D%22Moved%20Temporarily%22>>\
+                 %3Btext%3D%22Moved%20Temporarily%22>\
                  ;index=1.1;rc=1
    History-Info: <sip:carol@example.com>;index=1.2;mp=1
    History-Info: <sip:carol@192.0.2.4>;index=1.2.1;rc=1.2
    Contact: Alice <sip:alice@192.0.2.3>
    Content-Type: application/sdp
    Content-Length: <appropriate value>
 
    [SDP Not Shown]
 
    F5 180 Ringing Carol -> Example.com
@@ -1431,22 +1431,22 @@
    Via: SIP/2.0/TCP proxy.example.com:5060;branch=z9hG4bK24s5;\
                    received=192.0.2.101
    Via: SIP/2.0/TCP 192.0.2.3:5060;branch=z9hG4bK42t2
    From: Alice <sip:alice@example.com>;tag=kkaz-
    To: Bob <sip:bob@example.com>;tag=setss3x
    Supported: histinfo
    Call-Id: 12345600@example.com
    CSeq: 1 INVITE
    History-Info: <sip:bob@example.com>;index=1
    History-Info: <sip:bob@192.0.2.5?Reason=SIP%3Bcause%3D302\
-                                                           %3Btext%3D%22Moved%20Temporarily%22>">\
-                 ;index=1.1;rc=1
+                 %3Btext%3D%22Moved%20Temporarily%22>;\
+                 index=1.1;rc=1
    History-Info: <sip:carol@example.com>;index=1.2;mp=1
    History-Info: <sip:carol@192.0.2.4>;index=1.2.1;rc=1.2
    Contact: <sip:carol@192.0.2.4>
    Content-Type: application/sdp
    Content-Length: <appropriate value>
 
    [SDP Not Shown]
 
    F6 INVITE Example.com -> VM
 
@@ -1454,57 +1454,57 @@
    Via: SIP/2.0/TCP proxy.example.com:5060;branch=z9hG4bKbbg4
    Via: SIP/2.0/TCP 192.0.2.3:5060;branch=z9hG4bK42t2
    Max-Forward: 69
    From: Alice <sip:alice@example.com>;tag=kkaz-
    To: Bob <sip:bob@example.com>
    Supported: histinfo
    Call-Id: 12345600@example.com
    CSeq: 1 INVITE
    History-Info: <sip:bob@example.com>;index=1
    History-Info: <sip:bob@192.0.2.5?Reason=SIP%3Bcause%3D302\
-                                                           %3Btext%3D%22Moved%20Temporarily%22>>\
-                 ;index=1.1;rc=1
-   History-Info: <sip:carol@example.com?Reason=SIP%3Bcause%3D408>;\
+                 %3Btext%3D%22Moved%20Temporarily%22>;\
+                 index=1.1;rc=1
+   History-Info: <sip:carol@example.com>;\
                       index=1.2;mp=1
-   History-Info: <sip:carol@192.0.2.4>;index=1.2.1;rc=1.2
-   History-Info: <sip:vm@example.com;target=sip:carol%40example.com>\
-                                                                           ;
-   index=1.2.2;mp=1.2
-   History-Info: <sip:vm@192.0.2.5;target=sip:carol%40example.com>\
-                                                                           ;cause=408;index=1.2.2.1;rc=1.3
+   History-Info: <sip:carol@192.0.2.4?Reason=SIP%3Bcause%3D408>;\
+                 index=1.2.1;rc=1.2
+   History-Info: <sip:vm@example.com;target=sip:carol%40example.com;\
+                 cause=408>;index=1.2.2;mp=1.2
+   History-Info: <sip:vm@192.0.2.5;target=sip:carol%40example.com;\
+                 cause=408>;index=1.2.2.1;rc=1.2.2
    Contact: Alice <sip:alice@192.0.2.3>
    Content-Type: application/sdp
    Content-Length: <appropriate value>
 
    [SDP Not Shown]
    F7 200 OK VM -> Example.com
 
    SIP/2.0 200 OK
    Via: SIP/2.0/TCP proxy.example.com:5060;branch=z9hG4bKbbg4
    Via: SIP/2.0/TCP 192.0.2.3:5060;branch=z9hG4bK42t2
    From: Alice <sip:alice@example.com>;tag=kkaz-
    To: Bob <sip:bob@example.com>;tag=3dweggs
    Supported: histinfo
    Call-Id: 12345600@example.com
    CSeq: 1 INVITE
    History-Info: <sip:bob@example.com>;index=1
    History-Info: <sip:bob@192.0.2.5?Reason=SIP%3Bcause%3D302\
-                                                           %3Btext%3D%22Moved%20Temporarily%22>\
-                 ;index=1.1;rc=1
-   History-Info: <sip:carol@example.com?Reason=SIP%3Bcause%3D408>;\
+                 %3Btext%3D%22Moved%20Temporarily%22>;\
+                 index=1.1;rc=1
+   History-Info: <sip:carol@example.com>;\
                       index=1.2;mp=1
    History-Info: <sip:carol@192.0.2.4?Reason=SIP%3Bcause%3D408>;\
                                                                             index=1.2.1;rc=1.2
-   History-Info: <sip:vm@example.com;target=sip:carol%40example.com>;\
-                       index=1.2.2;mp=1.2
-   History-Info: <sip:vm@192.0.2.5;target=sip:carol%40example.com>;\
-                       index=1.2.2.1;rc=1.2.2
+   History-Info: <sip:vm@example.com;target=sip:carol%40example.com;\
+                 cause=408>;index=1.2.2;mp=1.2
+   History-Info: <sip:vm@192.0.2.5;target=sip:carol%40example.com;\
+                 cause=408>;index=1.2.2.1;rc=1.2.2
    Contact: <sip:carol@192.0.2.5>
    Content-Type: application/sdp
    Content-Length: <appropriate value>
 
    [SDP Not Shown]
 
                    Figure 7: Consumer Voivemail Example
 
    The VMS can look at the last hi-entry and find the target of the
    mailbox by looking for the "target" URI parameter in the hi-entry and