Subject: [Fwd: ABNF DIFF - pass 1]

From: Doug Royer <[email-masked]>
Date: Tue, 07 Sep 2004 12:12:27 -0600

[resend]

Attached is the 1st pass at fixing the ABNF.

In a day or two I'll update it with the changes posted during the last IETF.

-- 

Doug Royer                     |   http://INET-Consulting.com
-------------------------------|-----------------------------
[email-masked]                 | Office: (208)520-4044
http://Royer.com/People/Doug   | Fax:    (866)594-8574
                               | Cell:   (208)520-4044

              We Do Standards - You Need Standards

Index: cap.xml
===================================================================
RCS file: /home/cvs/INET-Consulting/ietf/CAP-draft/cap/cap.xml,v
retrieving revision 1.4
diff -r1.4 cap.xml
520a521,526
>  methodp     = ; As defined in [iCAL]
> 
>  prodid      = ; As defined in [iCAL]
> 
>  calscale    = ; As defined in [iCAL]
> 
530a537
537a545,546
> component = ; As defined in [iCAL]
> 
558a568,575
>  emailprop   = ; As definded in [iCAL]
> 
>  procprop    = ; As definded in [iCAL]
> 
>  dispprop    = ; As definded in [iCAL]
> 
>  audioprop   = ; As definded in [iCAL]
> 
572c589
<  other-params = *(";" xparam) *(";" iana-params) *(";" other-param)
---
>  other-params = *(";" xparam) *(";" iana-params) *(";" other-params)
599a617,620
> trigrel    = ; As defined in [iCAL]
> 
> trigabs    = ; As defined in [iCAL]
> 
1601a1623
1602a1625
2567a2591,2592
> dot-atom-text = ; As defined in [iCAL]
> 
2808a2834,2835
> boolean            = ; As defined in [iCAL]
> 
3173c3200
< CALID   = "CALID" other-params ":" relcalid CRLF
---
> calid   = "CALID" other-params ":" relcalid CRLF
3339c3366
< car-level        = "CAR-LEVEL" ":" other-params : car-level-values
---
> car-level        = "CAR-LEVEL" ":" other-params ":" car-level-values
3407c3434
<                ' "VRIGHT" must be supplied.
---
>                ; "VRIGHT" must be supplied.
3625c3652
< language = Text identifying a locale, as defined in [CHARPOL]
---
> language = ; Text identifying a locale, as defined in [CHARPOL]
3694a3722,3723
> txidprefix         = ; As defined in [iCAL]
> 
3739,3740c3768,3769
< def-vcars      = "DEFAULT-VCARS" other-params ":" text
<                  *( "," text ) CRLF
---
> defautl-vcars      = "DEFAULT-VCARS" other-params ":" text
>                      *( "," text ) CRLF
4036a4066,4067
> date-time = ; As defined in [iCAL]
> 
4076c4107
< mname = "MULTIPART" other-params ":" text *( "," text) CRLF
---
> multipart = "MULTIPART" other-params ":" text *( "," text) CRLF
4206c4237
< perm      = "PERMISSION" other-params ":" permvalue CRLF
---
> permmission  = "PERMISSION" other-params ":" permvalue CRLF
4566c4597
< restrict      = "RESTRICTION" other-params ":" cal-query CRLF
---
> restriction      = "RESTRICTION" other-params ":" cal-query CRLF
4752c4783
< transp   = "TRANSP" other-params ":" transvalue CRLF
---
> transp      = "TRANSP" other-params ":" transvalue CRLF
4754,4766c4785,4796
< transvalue
<          = "OPAQUE" ;Blocks or opaque on busy time searches.
<          / "TRANSPARENT"    ;Transparent on busy time searches.
< 
<          / "TRANSPARENT-NOCONFLICT" ; Transparent on busy time
<          ; searches and no other OPAQUE or OPAQUE-NOCONFLICT objects
<          ; can overlap it.
< 
<          / "OPAQUE-NOCONFLICT"  ; Opaque on busy time
<          ; searches and no other OPAQUE or OPAQUE-NOCONFLICT objects
<          ; can overlap it.
<          ;
<          ;Default value is OPAQUE
---
> transvalue  = "OPAQUE" ;Blocks or opaque on busy time searches.
>             / "TRANSPARENT"    ;Transparent on busy time searches.
> 
>             / "TRANSPARENT-NOCONFLICT" ; Transparent on busy time
>             ; searches and no other OPAQUE or OPAQUE-NOCONFLICT objects
>             ; can overlap it.
> 
>             / "OPAQUE-NOCONFLICT"  ; Opaque on busy time
>             ; searches and no other OPAQUE or OPAQUE-NOCONFLICT objects
>             ; can overlap it.
>             ;
>             ; Default value is OPAQUE
4841a4872,4877
> icalobject = ; As defined in [iCAL]
> 
> created    = ; As defined in [iCAL]
> 
> related-to = ; As defined in [iCAL]
> 
4966a5003,5004
> vagendac     = ; As defined in [iCAL].
> 
5337c5375,5377
< option-value     = paramtext	; As defined in [iCAL]
---
> option-value     = "OPTION" "=" paramtext
> 
> paramtext	; As defined in [iCAL]
5534c5574
< 		 request-status
---
> 		 rstatus
5590c5630
<                    request-status
---
>                    rstatus
5668c5708
<                  request-status
---
>                  rstatus
5681c5721
<                ; x-component = x-id
---
>                ; x-comp = x-id
5685a5726,5731
> tzid          = ; As defined in [iCAL]
> 
> sequence      = ; As defined in [iCAL]
> 
> uid           = ; As defined in [iCAL]
> 
5697c5743
<                  other-props
---
>                  other-props )
5743c5789,5799
<                / iana-comp / x-component
---
>                / iana-comp / x-comp
> 
> freebusyc    = ; As defined in [iCAL]
> 
> eventc       = ; As defined in [iCAL]
> 
> journalc     = ; As defined in [iCAL]
> 
> timezonec    = ; As defined in [iCAL]
> 
> todoc        = ; As defined in [iCAL]
5962c6018
<                  request-status
---
>                  rstatus
5974c6030
<                 ; x-component = x-id
---
>                 ; x-comp = x-id
6084c6140
<               request-status
---
>               rstatus
6736c6792
<                         request-status
---
>                         rstatus
6748c6804
<                       ; x-component = x-id
---
>                       ; x-comp = x-id
7093c7149
<                         / other-params
---
>                         / other-params )
7095c7151
<       setlocal-option   = option-param newlocale
---
>       setlocale-option   = option-param newlocale
7103,7104d7158
<                         )
< 
7132c7186
<                            request-status
---
>                            rstatus