16c16
<   from Schedule import Appointment, Meeting, Task, Event;
---
>   from Schedule import Appointment;
18,19c18
<   export Options, RegularUserOptions, Scheduling, SchedulingDefaults,
<         AdministrativeOptions;
---
>   export Options, Scheduling, SchedulingDefaults;
21,23c20
<   object Options is user:RegularUserOptions and AdministrativeOptions;
< 
<   object RegularUserOptions is
---
>   object Options is
25c22
<         RegularUserAdministrative;
---
>         Administrative;
29,36c26
<   end RegularUserOptions;
< 
<   object AdministrativeOptions is
<     components: TimesAndDates and Fonts and AdministrativeAdministrative;
<     description: (*
< 
<     *);
<   end AdministrativeOptions;
---
>   end Options;
39c29
<     components: TimeFormat and DateDisplayFormat and DateInputFormat;
---
>     components: TimeDisplayFormat and DateDisplayFormat and DateSample;
45,62c35,36
<   object TimeFormat is
<     components: TwelveOrTwentyFourHour and ShowAM and ShowPM and
<         LeadingZeroForHour and ZeroZeroSuffixOnHour;
<     description: (*
<     *);
<   end TimeFormat;
< 
<   object TwelveOrTwentyFourHour is 'TwelveHour' or 'TwentyFourHour'
<     description: (* *);
<   end TwelveOrTwentyFourHour;
< 
<   object ShowAM is boolean
<     description: (*
< 
<     *);
<   end ShowAM;
< 
<   object ShowPM is boolean
---
>   object TimeDisplayFormat is
>     components: 'TwelveHour' or 'TwentyFourHour';
64d37
< 
66,78c39
<   end ShowPM;
< 
<   object LeadingZeroForHour is boolean
<     description: (*
< 
<     *);
<   end LeadingZeroForHour;
< 
<   object ZeroZeroSuffixOnHour is boolean
<     description: (*
< 
<     *);
<   end ZeroZeroSuffixOnHour;
---
>   end TimeDisplayFormat;
81,84c42,44
<     components: item1:DateDisplayFormatItem and sep1:Separator and
<                 item2:DateDisplayFormatItem and sep2:Separator and
<                 item3:DateDisplayFormatItem and sep3:Separator and
<                 item4:DateDisplayFormatItem;
---
>     components: prefix:Prefix and p1:Position and s1:Separator and
>         p2:Position and s2:Separator and p3:Position and s3:Separator and
>         p4:Position and s4:Separator;
92c52
<   object DateDisplayFormatItem is
---
>   object Position is
94,103c54,56
<         'DayOfWeekOneOrTwoChar' or 'MonthFullName' or 'MonthShortName' or
<         'MonthNumber' or 'DateNumber' or 'YearFourDigits' or 'YearTwoDigits';
<     description: (*
< 
<     *);
<   end DateDisplayFormatItem;
< 
<   object DateInputFormat is
<     components: item1:DateInputItem and sep1:Separator and
<         item2:DateInputItem and sep2:Separator and item3:DateInputItem;
---
>         'DayOfWeekOneOrTwoChar' or 'DateNumber' or 'MonthFullName' or
>         'MonthShortName' or 'MonthNumber' or 'YearFourDigits' or
>         'YearTwoDigits';
107c60
<   end DateInputFormat;
---
>   end Position;
109,114c62
<   object DateInputItem is
<     components: 'DateNumberIndicator' or 'MonthIndicator' or 'YearIndicator';
<     description: (*
< 
<     *);
<   end DateInputItem;
---
>   obj DateSample is string;
148,183c96,97
<   object Scheduling
<     components: defaults:SchedulingDefaults and SchedulingOverlaps and
<         SchedulingMeetings and SchedulingReminders;
<     description: (*
< 
<     *);
<   end Scheduling;
< 
<   obj SchedulingDefaults
<     components: appt:Appointment and mtg:Meeting and task:Task and
<         event:Event;
<     description: (*
< 
<     *);
<   end SchedulingDefaults;
< 
<   object SchedulingOverlaps is
<     components: ;
<     description: (*
< 
<     *);
<   end SchedulingOverlaps;
< 
<   object SchedulingMeetings is
<     components: ;
<     description: (*
< 
<     *);
<   end SchedulingMeetings;
< 
<   object SchedulingReminders is
<     components: ;
<     description: (*
< 
<     *);
<   end SchedulingReminders;
---
>   obj Scheduling is defaults:SchedulingDefaults and ... ;
>   obj SchedulingDefaults is appt:Appointment and ... ;
186d99
<     components: ;
192,198c105
<   obj RegularUserAdministrative
<     description: (*
<         Administrative options for the regular user are ...
<     *);
<   end;
< 
<   obj AdministrativeAdministrative
---
>   obj Administrative
200c107
<         Administrative options for the administrator are ...
---
>         Administrative options include ...