[TYPO3-core] RFC: #7370: Remove page doktype 5 (not in menu) and merge Normal with Advanced

Mon Feb 4 00:01:35 CET 2008

Hi,

This is a SVN patch request.

Problem:
 Reason for 1)
the fields are needed for most pages, eg Metadata should be available all 
the time. With having tabs in page properties now it isn't a "moster form"

Reason for 2)
As there is the field "hide in menu" this page type is not necessary

Solution:

 (This is extracted from a former patch from me reworked for trunk version.)

This patch does following:

1) remove page type "Advanced" and use "Advanced" options for page type 
"Normal"
2) remove page type "Not in menu"

It is still possible to use this types in compatibility modus.
Update classes are included, that does the necessary updates in database
for 1) change doktype 2 => 1
for 2) change doctype 5 => 1 and set nav_hide = 1

vg  Steffen

begin 666 remove_doktypes_pages.diff
M26YD97 at Z('1Y<&\S+W-Y<V5X="]C;7,O97AT7W1A8FQE<RYP:' -"CT]/3T]
M/3T]/3T]/3T]/3T]/3T]/3T]/3T]/3T]/3T]/3T]/3T]/3T]/3T]/3T]/3T]
M/3T]/3T]/3T]/3T]/3T]/3T-"BTM+2!T>7!O,R]S>7-E>'0O8VUS+V5X=%]T
M86)L97,N<&AP"2AR979I<VEO;B S,#0R*0T**RLK('1Y<&\S+W-Y<V5X="]C
M;7,O97AT7W1A8FQE<RYP:' )*'=O<FMI;F<@8V]P>2D-"D! ("TT,"PY("LT
M,"PV($! #0H@"0DG-"<@/3X at 87)R87DH"B )"0DG:6-O;B<@/3X@)W!A9V5S
M7W-H;W)T8W5T+F=I9B<*( D)*2P*+0D))S4G(#T^(&%R<F%Y* HM"0D))VEC
M;VXG(#T^("=P86=E<U]N;W1I;FUE;G4N9VEF)PHM"0DI+ H@"0DG-B<@/3X@
M87)R87DH"B )"0DG='EP92<@/3X@)W=E8B<L"B )"0DG:6-O;B<@/3X@)V)E
M7W5S97)S7W-E8W1I;VXN9VEF)RP*0$ @+38V+#@@*S8S+#8 at 0$ -"B )"3$L
M"B )"3 L"B )"6%R<F%Y* HM"0D)87)R87DH)TQ,3#I%6%0Z8VUS+VQO8V%L
M;&%N9U]T8V$N>&UL.G!A9V5S+F1O:W1Y<&4N22XP)RP@)S(G+" G:2]P86=E
M<RYG:68G*2P*+0D)"6%R<F%Y*"=,3$PZ15A4.F-M<R]L;V-A;&QA;F=?=&-A
M+GAM;#IP86=E<RYD;VMT>7!E+DDN,R<L("<U)RP@)VDO<&%G97-?;F]T:6YM
M96YU+F=I9B<I+ H@"0D)87)R87DH)TQ,3#I%6%0Z8VUS+VQO8V%L;&%N9U]T
M8V$N>&UL.G!A9V5S+F1O:W1Y<&4N22XT)RP@)S8G+" G:2]B95]U<V5R<U]S
M96-T:6]N+F=I9B<I+ H@"0D)87)R87DH)TQ,3#I%6%0Z8VUS+VQO8V%L;&%N
M9U]T8V$N>&UL.G!A9V5S+F1O:W1Y<&4N9&EV+FQI;FLG+" G+2UD:78M+2<I
M+ H@"0D)87)R87DH)TQ,3#I%6%0Z8VUS+VQO8V%L;&%N9U]T8V$N>&UL.G!A
M9V5S+F1O:W1Y<&4N22XR)RP@)S0G+" G:2]P86=E<U]S:&]R=&-U="YG:68G
M*2P*0$ @+30X-"PQ-R K-#<Y+#@@0$ -"B *( D)+R\@5&]T86QL>2!O=F5R
M<FED:6YG(&%L;"!T>7!E+7-E='1I;F=S. at H@"2140T%;)W!A9V5S)UU;)W1Y
M<&5S)UT@/2!A<G)A>2 H"BT)"0DO+R!S=&%N9&%R9 HK"0D)"2\O(&YO<FUA
M; H@"0DG,2<@/3X at 87)R87DH)W-H;W=I=&5M)R ]/@HM"0D)"2=D;VMT>7!E
M.SLR.V)U='1O;CLQ+3$M,2P@:&ED9&5N+"!N879?:&ED92P@=&ET;&4[.S,[
M.S(M,BTR+"!S=6)T:71L92P*+0D)"2TM9&EV+2T[3$Q,.D585#IC;7,O;&]C
M86QL86YG7W1C82YX;6PZ<&%G97,N=&%B<RYA8V-E<W,L"BT)"0D)<W1A<G1T
M:6UE+"!E;F1T:6UE+"!F95]G<F]U<"P at 97AT96YD5&]3=6)P86=E<RP*+0D)
M"2TM9&EV+2T[3$Q,.D585#IC;7,O;&]C86QL86YG7W1C82YX;6PZ<&%G97,N
M=&%B<RYO<'1I;VYS+ HM"0D)"5138V]N9FEG.SLV.VYO=W)A<#LT+30M-"P@
M<W1O<F%G95]P:60[.S<L(&PQ.&Y?8V9G+ HM"0D)+2UD:78M+3M,3$PZ15A4
M.F-M<R]L;V-A;&QA;F=?=&-A+GAM;#IP86=E<RYT86)S+F5X=&5N9&5D+ HM
M"0DG*2P*+0D)"2\O(&%D=F%N8V5D"BT)"2<R)R ]/B!A<G)A>2 at G<VAO=VET
M96TG(#T^"B )"0D))V1O:W1Y<&4[.S([8G5T=&]N.S$M,2TQ+"!H:61D96XL
M(&YA=E]H:61E+"!T:71L93L[,SL[,BTR+3(L('-U8G1I=&QE+"!N879?=&ET
M;&4L"B )"0DM+61I=BTM.TQ,3#I%6%0Z8VUS+VQO8V%L;&%N9U]T8V$N>&UL
M.G!A9V5S+G1A8G,N;65T861A=&$L"B )"0D)86)S=')A8W0[.S4[.S,M,RTS
M+"!K97EW;W)D<RP at 9&5S8W)I<'1I;VXL"D! ("TU.#<L." K-3<S+#4W($! 
M#0H@"2DI.PH@"B **PD)+R\@9F]R('5S96%G92!O9B!C;VUP870@;6]D=7,@
M=VET:"!V97)S:6]N(#,N." **PD)+R\@<&%G971Y<&4@,B H861V86YC960I
M(&%N9" U("AN;W0@:6X@;65N=2D at 87)E(&%D9&5D('1O(%1#02!A9V%I;@HK
M"6EF("@A=#-L:6)?9&EV.CIC;VUP871?=F5R<VEO;B at G-"XR)RDI('L**PD)
M"BL)"0HK"0DO+R!R979E<G0 at 9&]K='EP92!S971T:6YG<PHK"0DD4$%'15-?
M5%E015,@/2!T,VQI8E]D:78Z.F%R<F%Y7VUE<F=E*&%R<F%Y* HK"0D))S4G
M(#T^(&%R<F%Y* HK"0D)"2=I8V]N)R ]/B G<&%G97-?;F]T:6YM96YU+F=I
M9B<**PD)"2D**PD)*2PD4$%'15-?5%E015,I.PHK"0D**PD)+R\@365R9VEN
M9R!I;B!#35, at 9&]K='EP97,Z"BL)"6%R<F%Y7W-P;&EC92@**PD)"2140T%;
M)W!A9V5S)UU;)V-O;'5M;G,G75LG9&]K='EP92==6R=C;VYF:6<G75LG:71E
M;7,G72P**PD)"3(L"BL)"0DP+ HK"0D)87)R87DH"BL)"0D)87)R87DH)TQ,
M3#I%6%0Z8VUS+VQO8V%L;&%N9U]T8V$N>&UL.G!A9V5S+F1O:W1Y<&4N22XP
M)RP@)S(G+" G:2]P86=E<RYG:68G*2P**PD)"0EA<G)A>2 at G3$Q,.D585#IC
M;7,O;&]C86QL86YG7W1C82YX;6PZ<&%G97,N9&]K='EP92Y)+C,G+" G-2<L
M("=I+W!A9V5S7VYO=&EN;65N=2YG:68G*2P**PD)"2D**PD)*3L**PD)"BL)
M"0HK"0DD5$-!6R=P86=E<R==6R=T>7!E<R==6S%=(#T at 87)R87DH"BL)"0D)
M+R\@<W1A;F1A<F0**PD)"2=S:&]W:71E;2<@/3X**PD)"0D))V1O:W1Y<&4[
M.S([8G5T=&]N.S$M,2TQ+"!H:61D96XL(&YA=E]H:61E+"!T:71L93L[,SL[
M,BTR+3(L('-U8G1I=&QE+ HK"0D)"2TM9&EV+2T[3$Q,.D585#IC;7,O;&]C
M86QL86YG7W1C82YX;6PZ<&%G97,N=&%B<RYA8V-E<W,L"BL)"0D)"7-T87)T
M=&EM92P at 96YD=&EM92P at 9F5?9W)O=7 L(&5X=&5N9%1O4W5B<&%G97,L"BL)
M"0D)+2UD:78M+3M,3$PZ15A4.F-M<R]L;V-A;&QA;F=?=&-A+GAM;#IP86=E
M<RYT86)S+F]P=&EO;G,L"BL)"0D)"5138V]N9FEG.SLV.VYO=W)A<#LT+30M
M-"P@<W1O<F%G95]P:60[.S<L(&PQ.&Y?8V9G+ HK"0D)"2TM9&EV+2T[3$Q,
M.D585#IC;7,O;&]C86QL86YG7W1C82YX;6PZ<&%G97,N=&%B<RYE>'1E;F1E
M9"P**PD))RD["BL)"0HK"0DD5$-!6R=P86=E<R==6R=T>7!E<R==6S)=(#T@
M87)R87DH"BL)"0D)+R\@861V86YC960)"BL)"0DG<VAO=VET96TG(#T^"BL)
M"0D)"2=D;VMT>7!E.SLR.V)U='1O;CLQ+3$M,2P@:&ED9&5N+"!N879?:&ED
M92P@=&ET;&4[.S,[.S(M,BTR+"!S=6)T:71L92P@;F%V7W1I=&QE+ HK"0D)
M"2TM9&EV+2T[3$Q,.D585#IC;7,O;&]C86QL86YG7W1C82YX;6PZ<&%G97,N
M=&%B<RYM971A9&%T82P**PD)"0D)86)S=')A8W0[.S4[.S,M,RTS+"!K97EW
M;W)D<RP at 9&5S8W)I<'1I;VXL"BL)"0D)+2UD:78M+3M,3$PZ15A4.F-M<R]L
M;V-A;&QA;F=?=&-A+GAM;#IP86=E<RYT86)S+F9I;&5S+ HK"0D)"0EM961I
M82P**PD)"0DM+61I=BTM.TQ,3#I%6%0Z8VUS+VQO8V%L;&%N9U]T8V$N>&UL
M.G!A9V5S+G1A8G,N86-C97-S+ HK"0D)"0ES=&%R='1I;64L(&5N9'1I;64L
M(&9E7VQO9VEN7VUO9&4L(&9E7V=R;W5P+"!E>'1E;F14;U-U8G!A9V5S+ HK
M"0D)"2TM9&EV+2T[3$Q,.D585#IC;7,O;&]C86QL86YG7W1C82YX;6PZ<&%G
M97,N=&%B<RYO<'1I;VYS+ HK"0D)"0E44V-O;F9I9SL[-CMN;W=R87 [-BTV
M+38L('-T;W)A9V5?<&ED.SLW+"!L,3AN7V-F9RP@;6]D=6QE+"!C;VYT96YT
M7V9R;VU?<&ED+ HK"0D)"2TM9&EV+2T[3$Q,.D585#IC;7,O;&]C86QL86YG
M7W1C82YX;6PZ<&%G97,N=&%B<RYE>'1E;F1E9"P**PD))RD["BL)?0H@"BT*
M("\O("HJ*BHJ*BHJ*BHJ*BHJ*BHJ*BHJ*BHJ*BHJ*BHJ*BHJ*BHJ*BHJ*BHJ
M*BHJ*BHJ*BHJ*BHJ*BHJ*BHJ*BHJ*BHJ*@H at +R\@5&AI<R!I<R!T:&4@<W1A
M;F1A<F0 at 5'EP;U-C<FEP="!C;VYT96YT('1A8FQE+"!T=%]C;VYT96YT"B O
M+R J*BHJ*BHJ*BHJ*BHJ*BHJ*BHJ*BHJ*BHJ*BHJ*BHJ*BHJ*BHJ*BHJ*BHJ
M*BHJ*BHJ*BHJ*BHJ*BHJ*BHJ*BHJ*BH*0$ @+3<Y,2PU("LX,C8L-"! 0 T*
M( D))V1Y;F%M:6-#;VYF:6=&:6QE)R ]/B!T,VQI8E]E>'1-9VTZ.F5X=%!A
M=&@H)%]%6%1+15DI+B=T8FQ?8VUS+G!H<"<*( DI"B I.PHM"B _/@I);F1E
M>#H@='EP;S,O<WES97AT+VEN<W1A;&Q?;VQD+V5X=%]L;V-A;&-O;F8N<&AP
M#0H]/3T]/3T]/3T]/3T]/3T]/3T]/3T]/3T]/3T]/3T]/3T]/3T]/3T]/3T]
M/3T]/3T]/3T]/3T]/3T]/3T]/3T]/3T]#0HM+2T@='EP;S,O<WES97AT+VEN
M<W1A;&Q?;VQD+V5X=%]L;V-A;&-O;F8N<&AP"2AR979I<VEO;B S,#0R*0T*
M*RLK('1Y<&\S+W-Y<V5X="]I;G-T86QL7V]L9"]E>'1?;&]C86QC;VYF+G!H
M< DH=V]R:VEN9R!C;W!Y*0T*0$ @+3$L,3$@*S$L,3(@0$ -"B \/W!H< H@
M:68@*"%D969I;F5D("@G5%E03S-?34]$12<I*2 )9&EE("@G06-C97-S(&1E
M;FEE9"XG*3L*( HK"2\O(')E;6]V92!P86=E='EP92 B;F]T(&EN(&UE;G4B
M(@H@<F5Q=6ER95]O;F-E*'0S;&EB7V5X=$UG;3HZ97AT4&%T:"@G:6YS=&%L
M;%]O;&0G*2XG=7!D871E<R]C;&%S<RYT>%]C;W)E=7!D871E<U]C;VUP871V
M97)S:6]N+G!H<"<I.PH@)%194$\S7T-/3D9?5D%24ULG4T-?3U!424].4R==
M6R=E>'0O:6YS=&%L;"==6R=U<&1A=&4G75LG8VAA;F=E0V]M<&%T:6)I;&ET
M>59E<G-I;VXG72 ]("=T>%]C;W)E=7!D871E<U]C;VUP871V97)S:6]N)SL*
M( HM"2\O(&YO="!U<V5D('EE= HM+R]R97%U:7)E7V]N8V4H=#-L:6)?97AT
M36=M.CIE>'10871H*"=I;G-T86QL)RDN)W5P9&%T97,O8VQA<W,N='A?8V]R
M975P9&%T97-?;F]T:6YM96YU+G!H<"<I.PHM+R\D5%E03S-?0T].1E]605)3
M6R=30U]/4%1)3TY3)UU;)V5X="]I;G-T86QL)UU;)W5P9&%T92==6R=N;W1)
M;DUE;G5?9&]C='EP95]C;VYV97)S:6]N)UT@/2 G='A?8V]R975P9&%T97-?
M;F]T:6YM96YU)SL**PDO+R!R96UO=F4@<&%G971Y<&4@(F%D=F%N8V5D(@HK
M<F5Q=6ER95]O;F-E*'0S;&EB7V5X=$UG;3HZ97AT4&%T:"@G:6YS=&%L;%]O
M;&0G*2XG=7!D871E<R]C;&%S<RYT>%]C;W)E=7!D871E<U]M97)G96%D=F%N
M8V5D+G!H<"<I.PHK)%194$\S7T-/3D9?5D%24ULG4T-?3U!424].4R==6R=E
M>'0O:6YS=&%L;"==6R=U<&1A=&4G75LG;65G96%D=F%N8V5D7V1O8W1Y<&5?
M8V]N=F5R<VEO;B==(#T@)W1X7V-O<F5U<&1A=&5S7VUE<F=E861V86YC960G
M.PH@"BT_/@T*7"!.;R!N97=L:6YE(&%T(&5N9"!O9B!F:6QE#0HK/SX*26YD
M97 at Z('1Y<&\S+W-Y<V5X="]I;G-T86QL7V]L9"]U<&1A=&5S+V-L87-S+G1X
M7V-O<F5U<&1A=&5S7VUE<F=E861V86YC960N<&AP#0H]/3T]/3T]/3T]/3T]
M/3T]/3T]/3T]/3T]/3T]/3T]/3T]/3T]/3T]/3T]/3T]/3T]/3T]/3T]/3T]
M/3T]/3T]/3T]#0HM+2T@='EP;S,O<WES97AT+VEN<W1A;&Q?;VQD+W5P9&%T
M97,O8VQA<W,N='A?8V]R975P9&%T97-?;65R9V5A9'9A;F-E9"YP:' )*')E
M=FES:6]N(# I#0HK*RL@='EP;S,O<WES97AT+VEN<W1A;&Q?;VQD+W5P9&%T
M97,O8VQA<W,N='A?8V]R975P9&%T97-?;65R9V5A9'9A;F-E9"YP:' )*')E
M=FES:6]N(# I#0I 0" M,"PP("LQ+#<X($! #0HK/#]P:' **R\J*BHJ*BHJ
M*BHJ*BHJ*BHJ*BHJ*BHJ*BHJ*BHJ*BHJ*BHJ*BHJ*BHJ*BHJ*BHJ*BHJ*BHJ
M*BHJ*BHJ*BHJ*BH**RH@($-O<'ER:6=H="!N;W1I8V4**RH**RH@("AC*2 R
M,# X(%-T969F96X at 2V%M<&5R(#QI;F9O0'-K+71Y<&\S+F1E/@HK*B @06QL
M(')I9VAT<R!R97-E<G9E9 HK*@HK*B @5&AI<R!S8W)I<'0@:7,@<&%R="!O
M9B!T:&4 at 5%E03S,@<')O:F5C="X at 5&AE(%194$\S('!R;VIE8W0@:7,**RH@
M(&9R964@<V]F='=A<F4[('EO=2!C86X@<F5D:7-T<FEB=71E(&ET(&%N9"]O
M<B!M;V1I9GD**RH@(&ET('5N9&5R('1H92!T97)M<R!O9B!T:&4 at 1TY5($=E
M;F5R86P at 4'5B;&EC($QI8V5N<V4 at 87,@<'5B;&ES:&5D(&)Y"BLJ("!T:&4@
M1G)E92!3;V9T=V%R92!&;W5N9&%T:6]N.R!E:71H97(@=F5R<VEO;B R(&]F
M('1H92!,:6-E;G-E+"!O<@HK*B @*&%T('EO=7(@;W!T:6]N*2!A;GD@;&%T
M97(@=F5R<VEO;BX**RH**RH@(%1H92!'3E4 at 1V5N97)A;"!0=6)L:6, at 3&EC
M96YS92!C86X at 8F4@9F]U;F0 at 870**RH@(&AT=' Z+R]W=W<N9VYU+F]R9R]C
M;W!Y;&5F="]G<&PN:'1M;"X**RH@($$@8V]P>2!I<R!F;W5N9"!I;B!T:&4@
M=&5X=&9I;&4 at 1U!,+G1X="!A;F0@:6UP;W)T86YT(&YO=&EC97,@=&\@=&AE
M(&QI8V5N<V4**RH@(&9R;VT@=&AE(&%U=&AO<B!I<R!F;W5N9"!I;B!,24-%
M3E-%+G1X="!D:7-T<FEB=71E9"!W:71H('1H97-E('-C<FEP=',N"BLJ"BLJ
M"BLJ("!4:&ES('-C<FEP="!I<R!D:7-T<FEB=71E9"!I;B!T:&4@:&]P92!T
M:&%T(&ET('=I;&P at 8F4@=7-E9G5L+ HK*B @8G5T(%=)5$A/550 at 04Y9(%=!
M4E)!3E19.R!W:71H;W5T(&5V96X@=&AE(&EM<&QI960@=V%R<F%N='D@;V8*
M*RH@($U%4D-(04Y404))3$E462!O<B!&251.15-3($9/4B!!(%!!4E1)0U5,
M05(@4%524$]312X@(%-E92!T:&4**RH@($=.52!'96YE<F%L(%!U8FQI8R!,
M:6-E;G-E(&9O<B!M;W)E(&1E=&%I;',N"BLJ"BLJ("!4:&ES(&-O<'ER:6=H
M="!N;W1I8V4 at 35535"!!4%!%05(@:6X at 86QL(&-O<&EE<R!O9B!T:&4@<V-R
M:7!T(0HK*BHJ*BHJ*BHJ*BHJ*BHJ*BHJ*BHJ*BHJ*BHJ*BHJ*BHJ*BHJ*BHJ
M*BHJ*BHJ*BHJ*BHJ*BHJ*BHJ*BHJ*BHJ+PHK+RHJ"BL@*B!#;VYT86EN<R!T
M:&4@=7!D871E(&-L87-S(&9O<B!M97)G:6YG(&%D=F%N8V5D(&%N9"!N;W)M
M86P@<&%G971Y<&4N"BL@*@HK("H at 0&%U=&AO<@E3=&5F9F5N($MA;7!E<B \
M:6YF;T!S:RUT>7!O,RYD93X**R J+PHK8VQA<W,@='A?8V]R975P9&%T97-?
M;65R9V5A9'9A;F-E9"!["BL)=F%R("1V97)S:6]N3G5M8F5R.PDO+R!V97)S
M:6]N(&YU;6)E<B!C;VUI;F<@9G)O;2!T,VQI8E]D:78Z.FEN=%]F<F]M7W9E
M<B at I"BL**PDO*BH**PD@*B!P87)E;G0@;V)J96-T"BL)("H**PD@*B! =F%R
M('1X7VEN<W1A;&P**PD@*B\**PEV87(@)'!/8FH["BL)=F%R("1U<V5R26YP
M=70["2\O('5S97(@:6YP=70**PHK"7!U8FQI8R!F=6YC=&EO;B!C:&5C:T9O
M<E5P9&%T92 at F)&1E<V-R:7!T:6]N*0E["BL)"21D97-C<FEP=&EO;B ]("=2
M96UO=F5S(&%D=F%N8V5D('!A9V5T>7!E("AD;VMT>7!E,BDN($YO<FUA;"!P
M86=E("AD;VMT>7!E(#$I(&YO=R!H87,@<V%M92!F96%T=7)E<R!S;R!A9'9A
M;F-E9"!I<R!N;R!M;W)E(&YE961E9"XG.PHK"BL)"6EF("@D=&AI<RT^=F5R
M<VEO;DYU;6)E<B ^/2 T,# R,# P*0E["BL)"0DD<F5S(#T@)$=,3T)!3%-;
M)U194$\S7T1")UTM/F5X96-?4T5,14-4<75E<GDH)W5I9"<L)W!A9V5S)RPG
M9&]K='EP93TR)RD["BL)"0EI9B at D1TQ/0D%,4ULG5%E03S-?1$(G72T^<W%L
M7VYU;5]R;W=S*"1R97,I*0E["BL)"0D)<F5T=7)N(#$["BL)"0E]"BL)"7T*
M*PD)<F5T=7)N(# ["BL)?0HK"BL)+RHJ"BL)("H at 6T1E<V-R:6)E(&9U;F-T
M:6]N+BXN70HK"2 J"BL)("H at 0'!A<F%M"5MT>7!E70D))"1D8E%U97)I97,Z
M("XN+ at HK"2 J($!P87)A;0E;='EP95T)"21C=7-T;VU-97-S86=E<SH at +BXN
M"BL)("H at 0')E='5R;@E;='EP95T)"2XN+ at HK"2 J+PHK"7!U8FQI8R!F=6YC
M=&EO;B!P97)F;W)M57!D871E*"8D9&)1=65R:65S+" F)&-U<W1O;4UE<W-A
M9V5S*0E["BL)"6EF*"1T:&ES+3YV97)S:6]N3G5M8F5R(#X](#0P,#(P,# I
M"7L**PD)"21U<&1A=&5!<G)A>2 ](&%R<F%Y* HK"0D)"2=D;VMT>7!E)R ]
M/B Q+ HK"0D)*3L**PHK"0D))')E<R ]("1'3$]"04Q36R=465!/,U]$0B==
M+3YE>&5C7U501$%417%U97)Y*"=P86=E<R<L("=D;VMT>7!E/3(G+" D=7!D
M871E07)R87DI.PHK"0D))&1B475E<FEE<UM=(#T@<W1R7W)E<&QA8V4H8VAR
M*#$P*2P@)R G+" D1TQ/0D%,4ULG5%E03S-?1$(G72T^9&5B=6=?;&%S=$)U
M:6QT475E<GDI.PHK"BL)"0EI9B H)$=,3T)!3%-;)U194$\S7T1")UTM/G-Q
M;%]E<G)O<B at I*0E["BL)"0D)<F5T=7)N(# ["2\O('-O;65T:&EN9R!W96YT
M('=R;VYG"BL)"0E]"BL)"0ER971U<FX@,3L**PD)?0HK"7T**WT**S\^"DEN
M9&5X.B!T>7!O,R]S>7-E>'0O:6YS=&%L;%]O;&0O=7!D871E<R]C;&%S<RYT
M>%]C;W)E=7!D871E<U]N;W1I;FUE;G4N<&AP#0H]/3T]/3T]/3T]/3T]/3T]
M/3T]/3T]/3T]/3T]/3T]/3T]/3T]/3T]/3T]/3T]/3T]/3T]/3T]/3T]/3T]
M/3T]/3T]#0HM+2T@='EP;S,O<WES97AT+VEN<W1A;&Q?;VQD+W5P9&%T97,O
M8VQA<W,N='A?8V]R975P9&%T97-?;F]T:6YM96YU+G!H< DH<F5V:7-I;VX@
M,S T,BD-"BLK*R!T>7!O,R]S>7-E>'0O:6YS=&%L;%]O;&0O=7!D871E<R]C
M;&%S<RYT>%]C;W)E=7!D871E<U]N;W1I;FUE;G4N<&AP"2AW;W)K:6YG(&-O
M<'DI#0I 0" M,BPW("LR+#<@0$ -"B O*BHJ*BHJ*BHJ*BHJ*BHJ*BHJ*BHJ
M*BHJ*BHJ*BHJ*BHJ*BHJ*BHJ*BHJ*BHJ*BHJ*BHJ*BHJ*BHJ*BHJ*BHJ"B J
M("!#;W!Y<FEG:'0@;F]T:6-E"B J"BTJ(" H8RD@,3DY.2TR,# V(%-E8F%S
M=&EA;B!+=7)F=65R<W0@*'-E8F%S=&EA;D!G87)B86=E+6=R;W5P+F1E*0HK
M*B @*&,I(#(P,#@@4W1E9F9E;B!+86UP97(@/&EN9F] <VLM='EP;S,N9&4^
M"B J("!!;&P@<FEG:'1S(')E<V5R=F5D"B J"B J("!4:&ES('-C<FEP="!I
M<R!P87)T(&]F('1H92!465!/,R!P<F]J96-T+B!4:&4 at 5%E03S,@<')O:F5C
M="!I<PI 0" M,C<L-R K,C<L-R! 0 T*("\J*@H@("H at 0V]N=&%I;G,@=&AE
M('5P9&%T92!C;&%S<R!F;W(@;F]T(&EN(&UE;G4@<&%G97,N(%5S960 at 8GD@
M=&AE('5P9&%T92!W:7IA<F0@:6X@=&AE(&EN<W1A;&P@=&]O;"X*(" J"BT@
M*B! 875T:&]R"5-E8F%S=&EA;B!+=7)F=65R<W0@/'-E8F%S=&EA;D!G87)B
M86=E+6=R;W5P+F1E"BL@*B! 875T:&]R"5-T969F96X at 2V%M<&5R(#QI;F9O
M0'-K+71Y<&\S+F1E/@H@("HO"B!C;&%S<R!T>%]C;W)E=7!D871E<U]N;W1I
M;FUE;G4@>PH@"79A<B D=F5R<VEO;DYU;6)E<CL)+R\@=F5R<VEO;B!N=6UB
M97(@8V]M:6YG(&9R;VT@=#-L:6)?9&EV.CII;G1?9G)O;5]V97(H*0I 0" M
M-# L,3 @*S0P+#$P($! #0H@"79A<B D<$]B:CL*( EV87(@)'5S97));G!U
M=#L)+R\@=7-E<B!I;G!U= H@"BT)9G5N8W1I;VX at 8VAE8VM&;W)5<&1A=&4H
M)B1D97-C<FEP=&EO;BD)>PHK"7!U8FQI8R!F=6YC=&EO;B!C:&5C:T9O<E5P
M9&%T92 at F)&1E<V-R:7!T:6]N*0E["B )"21D97-C<FEP=&EO;B ]("=296UO
M=F5S('1H92!D;V-T>7!E(").;W0@:6X@;65N=2(@=VAI8V@@:7, at 9&5P<F5C
M871E9"!A;F0@<V5T<R!T:&4@<W5C8V5S<VEN9R!P86=E(&9L86<@(DYO="!I
M;B!M96YU(B!I;G-T96%D+B<["B *+0D):68@*"1T:&ES+3YV97)S:6]N3G5M
M8F5R(#X](#,P,#DP,# I"7L**PD):68@*"1T:&ES+3YV97)S:6]N3G5M8F5R
M(#X](#0P,#(P,# I"7L*( D)"21R97,@/2 D1TQ/0D%,4ULG5%E03S-?1$(G
M72T^97AE8U]314Q%0U1Q=65R>2 at G=6ED)RPG<&%G97,G+"=D;VMT>7!E/34G
M*3L*( D)"6EF*"1'3$]"04Q36R=465!/,U]$0B==+3YS<6Q?;G5M7W)O=W,H
M)')E<RDI"7L*( D)"0ER971U<FX@,3L*0$ @+34Y+#@@*S4Y+#@@0$ -"B )
M("H at 0'!A<F%M"5MT>7!E70D))&-U<W1O;4UE<W-A9V5S.B N+BX*( D@*B! 
M<F5T=7)N"5MT>7!E70D)+BXN"B )("HO"BT)9G5N8W1I;VX@<&5R9F]R;55P
M9&%T92 at F)&1B475E<FEE<RP@)B1C=7-T;VU-97-S86=E<RD)>PHM"0EI9B at D
M=&AI<RT^=F5R<VEO;DYU;6)E<B ^/2 S,# Y,# P*0E["BL)<'5B;&EC(&9U
M;F-T:6]N('!E<F9O<FU5<&1A=&4H)B1D8E%U97)I97,L("8D8W5S=&]M365S
M<V%G97,I"7L**PD):68H)'1H:7,M/G9E<G-I;VY.=6UB97(@/CT at -# P,C P
M,"D)>PH@"0D))'5P9&%T94%R<F%Y(#T at 87)R87DH"B )"0D))V1O:W1Y<&4G
M(#T^(#$L"B )"0D))VYA=E]H:61E)R ]/B Q"D! ("TW-BPT("LW-BPT($! 
M#0H@"0E]"B )?0H@?0HM/SX-"EP at 3F\@;F5W;&EN92!A="!E;F0@;V8 at 9FEL
'90T**S\^"@``
`
end