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

Mon Feb 4 18:43:03 CET 2008

Hi,

here is a new patch that takes care of olly's suggestions

* includes of update classes only in tx_install
* on sql_error the error is shown
* changed author reference back to sebastian in tx_coreupdates_notinmenu

Additional i searched core files for nav_hide and doktype 5.

With nav_hide i found nothing that will behave different from situation 
before.

With doktype i only found that if nav_hide is set, doktype is set to 5 to 
show the icon. This is a workarround, is not nice but has no sideeffects.
This is also the reason i didn't removed the icon with index 5.

tslib_menu uses nav_hide and doktypeExcludeList for not showing pages, this 
don't will change anything

Any cases in core using nav_hide or doktype (mostly  doktypeExcludeList ) 
use doktype 5 and/or nav_hide to exclude records

So imho there is no bug in core after this change.

vg  Steffen

begin 666 20080204_pagetypes_updates3.patch
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,#4R*0T**RLK('1Y<&\S+W-Y<V5X="]C
M;7,O97AT7W1A8FQE<RYP:' )*'=O<FMI;F<@8V]P>2D-"D! ("TV-BPX("LV
M-BPV($! #0H@"0DQ+ H@"0DP+ H@"0EA<G)A>2@*+0D)"6%R<F%Y*"=,3$PZ
M15A4.F-M<R]L;V-A;&QA;F=?=&-A+GAM;#IP86=E<RYD;VMT>7!E+DDN,"<L
M("<R)RP@)VDO<&%G97,N9VEF)RDL"BT)"0EA<G)A>2 at G3$Q,.D585#IC;7,O
M;&]C86QL86YG7W1C82YX;6PZ<&%G97,N9&]K='EP92Y)+C,G+" G-2<L("=I
M+W!A9V5S7VYO=&EN;65N=2YG:68G*2P*( D)"6%R<F%Y*"=,3$PZ15A4.F-M
M<R]L;V-A;&QA;F=?=&-A+GAM;#IP86=E<RYD;VMT>7!E+DDN-"<L("<V)RP@
M)VDO8F5?=7-E<G-?<V5C=&EO;BYG:68G*2P*( D)"6%R<F%Y*"=,3$PZ15A4
M.F-M<R]L;V-A;&QA;F=?=&-A+GAM;#IP86=E<RYD;VMT>7!E+F1I=BYL:6YK
M)RP@)RTM9&EV+2TG*2P*( D)"6%R<F%Y*"=,3$PZ15A4.F-M<R]L;V-A;&QA
M;F=?=&-A+GAM;#IP86=E<RYD;VMT>7!E+DDN,B<L("<T)RP@)VDO<&%G97-?
M<VAO<G1C=70N9VEF)RDL"D! ("TT.#0L,3<@*S0X,BPX($! #0H@"B )"2\O
M(%1O=&%L;'D@;W9E<G)I9&EN9R!A;&P@='EP92US971T:6YG<SH*( DD5$-!
M6R=P86=E<R==6R=T>7!E<R==(#T at 87)R87D@* HM"0D)+R\@<W1A;F1A<F0*
M*PD)"0DO+R!N;W)M86P*( D))S$G(#T^(&%R<F%Y*"=S:&]W:71E;2<@/3X*
M+0D)"0DG9&]K='EP93L[,CMB=71T;VX[,2TQ+3$L(&AI9&1E;BP@;F%V7VAI
M9&4L('1I=&QE.SLS.SLR+3(M,BP@<W5B=&ET;&4L"BT)"0DM+61I=BTM.TQ,
M3#I%6%0Z8VUS+VQO8V%L;&%N9U]T8V$N>&UL.G!A9V5S+G1A8G,N86-C97-S
M+ HM"0D)"7-T87)T=&EM92P at 96YD=&EM92P at 9F5?9W)O=7 L(&5X=&5N9%1O
M4W5B<&%G97,L"BT)"0DM+61I=BTM.TQ,3#I%6%0Z8VUS+VQO8V%L;&%N9U]T
M8V$N>&UL.G!A9V5S+G1A8G,N;W!T:6]N<RP*+0D)"0E44V-O;F9I9SL[-CMN
M;W=R87 [-"TT+30L('-T;W)A9V5?<&ED.SLW+"!L,3AN7V-F9RP*+0D)"2TM
M9&EV+2T[3$Q,.D585#IC;7,O;&]C86QL86YG7W1C82YX;6PZ<&%G97,N=&%B
M<RYE>'1E;F1E9"P*+0D))RDL"BT)"0DO+R!A9'9A;F-E9 HM"0DG,B<@/3X@
M87)R87DH)W-H;W=I=&5M)R ]/@H@"0D)"2=D;VMT>7!E.SLR.V)U='1O;CLQ
M+3$M,2P@:&ED9&5N+"!N879?:&ED92P@=&ET;&4[.S,[.S(M,BTR+"!S=6)T
M:71L92P@;F%V7W1I=&QE+ H@"0D)+2UD:78M+3M,3$PZ15A4.F-M<R]L;V-A
M;&QA;F=?=&-A+GAM;#IP86=E<RYT86)S+FUE=&%D871A+ H@"0D)"6%B<W1R
M86-T.SLU.SLS+3,M,RP@:V5Y=V]R9',L(&1E<V-R:7!T:6]N+ I 0" M-3 at W
M+#@@*S4W-BPT.2! 0 T*( DI*3L*( H@"BL)+R\@:68@=&AE(&-O;7!A="!V
M97)S:6]N(&ES(&QE<W,@=&AA;B T+C(L('!A9V5T>7!E(#(@*")!9'9A;F-E
M9"(I"BL)+R\@86YD('!A9V5T>7!E(#4@*").;W0@:6X@;65N=2(I(&%R92!A
M9&1E9"!T;R!40T$N"BL):68@*"%T,VQI8E]D:78Z.F-O;7!A=%]V97)S:6]N
M*"<T+C(G*2D@>PHK"0D**PD)"2\O($UE<F=I;F<@:6X at 0TU3(&1O:W1Y<&5S
M"BL)"6%R<F%Y7W-P;&EC92@**PD)"2140T%;)W!A9V5S)UU;)V-O;'5M;G,G
M75LG9&]K='EP92==6R=C;VYF:6<G75LG:71E;7,G72P**PD)"3(L"BL)"0DP
M+ HK"0D)87)R87DH"BL)"0D)87)R87DH)TQ,3#I%6%0Z8VUS+VQO8V%L;&%N
M9U]T8V$N>&UL.G!A9V5S+F1O:W1Y<&4N22XP)RP@)S(G+" G:2]P86=E<RYG
M:68G*2P**PD)"0EA<G)A>2 at G3$Q,.D585#IC;7,O;&]C86QL86YG7W1C82YX
M;6PZ<&%G97,N9&]K='EP92Y)+C,G+" G-2<L("=I+W!A9V5S7VYO=&EN;65N
M=2YG:68G*2P**PD)"2D**PD)*3L*( HK"0D)+R\@<V5T=&EN9R!T:&4 at 9&]K
M='EP92 Q("@B4W1A;F1A<F0B*2!T;R!S:&]W(&QE<W, at 9FEE;&1S"BL)"214
M0T%;)W!A9V5S)UU;)W1Y<&5S)UU;,5T@/2!A<G)A>2@**PD)"0DO+R!S=&%N
M9&%R9 HK"0D))W-H;W=I=&5M)R ]/@HK"0D)"0DG9&]K='EP93L[,CMB=71T
M;VX[,2TQ+3$L(&AI9&1E;BP@;F%V7VAI9&4L('1I=&QE.SLS.SLR+3(M,BP@
M<W5B=&ET;&4L"BL)"0D)+2UD:78M+3M,3$PZ15A4.F-M<R]L;V-A;&QA;F=?
M=&-A+GAM;#IP86=E<RYT86)S+F%C8V5S<RP**PD)"0D)<W1A<G1T:6UE+"!E
M;F1T:6UE+"!F95]G<F]U<"P at 97AT96YD5&]3=6)P86=E<RP**PD)"0DM+61I
M=BTM.TQ,3#I%6%0Z8VUS+VQO8V%L;&%N9U]T8V$N>&UL.G!A9V5S+G1A8G,N
M;W!T:6]N<RP**PD)"0D)5%-C;VYF:6<[.S8[;F]W<F%P.S0M-"TT+"!S=&]R
M86=E7W!I9#L[-RP@;#$X;E]C9F<L"BL)"0D)+2UD:78M+3M,3$PZ15A4.F-M
M<R]L;V-A;&QA;F=?=&-A+GAM;#IP86=E<RYT86)S+F5X=&5N9&5D+ HK"0DG
M*3L*( HK"0D)+R\@861D:6YG(&1O:W1Y<&4@,B H(D%D=F%N8V5D(BD**PD)
M)%1#05LG<&%G97,G75LG='EP97,G75LR72 ](&%R<F%Y* HK"0D))W-H;W=I
M=&5M)R ]/@HK"0D)"0DG9&]K='EP93L[,CMB=71T;VX[,2TQ+3$L(&AI9&1E
M;BP@;F%V7VAI9&4L('1I=&QE.SLS.SLR+3(M,BP@<W5B=&ET;&4L(&YA=E]T
M:71L92P**PD)"0DM+61I=BTM.TQ,3#I%6%0Z8VUS+VQO8V%L;&%N9U]T8V$N
M>&UL.G!A9V5S+G1A8G,N;65T861A=&$L"BL)"0D)"6%B<W1R86-T.SLU.SLS
M+3,M,RP@:V5Y=V]R9',L(&1E<V-R:7!T:6]N+ HK"0D)"2TM9&EV+2T[3$Q,
M.D585#IC;7,O;&]C86QL86YG7W1C82YX;6PZ<&%G97,N=&%B<RYF:6QE<RP*
M*PD)"0D);65D:6$L"BL)"0D)+2UD:78M+3M,3$PZ15A4.F-M<R]L;V-A;&QA
M;F=?=&-A+GAM;#IP86=E<RYT86)S+F%C8V5S<RP**PD)"0D)<W1A<G1T:6UE
M+"!E;F1T:6UE+"!F95]L;V=I;E]M;V1E+"!F95]G<F]U<"P at 97AT96YD5&]3
M=6)P86=E<RP**PD)"0DM+61I=BTM.TQ,3#I%6%0Z8VUS+VQO8V%L;&%N9U]T
M8V$N>&UL.G!A9V5S+G1A8G,N;W!T:6]N<RP**PD)"0D)5%-C;VYF:6<[.S8[
M;F]W<F%P.S8M-BTV+"!S=&]R86=E7W!I9#L[-RP@;#$X;E]C9F<L(&UO9'5L
M92P at 8V]N=&5N=%]F<F]M7W!I9"P**PD)"0DM+61I=BTM.TQ,3#I%6%0Z8VUS
M+VQO8V%L;&%N9U]T8V$N>&UL.G!A9V5S+G1A8G,N97AT96YD960L"BL)"2<I
M.PHK"7T**PH at +R\@*BHJ*BHJ*BHJ*BHJ*BHJ*BHJ*BHJ*BHJ*BHJ*BHJ*BHJ
M*BHJ*BHJ*BHJ*BHJ*BHJ*BHJ*BHJ*BHJ*BHJ*BHJ*BHJ"B O+R!4:&ES(&ES
M('1H92!S=&%N9&%R9"!4>7!O4V-R:7!T(&-O;G1E;G0@=&%B;&4L('1T7V-O
M;G1E;G0*("\O("HJ*BHJ*BHJ*BHJ*BHJ*BHJ*BHJ*BHJ*BHJ*BHJ*BHJ*BHJ
M*BHJ*BHJ*BHJ*BHJ*BHJ*BHJ*BHJ*BHJ*BHJ*BHJ*@I 0" M-SDQ+#4@*S at R
M,2PT($! #0H@"0DG9'EN86UI8T-O;F9I9T9I;&4G(#T^('0S;&EB7V5X=$UG
M;3HZ97AT4&%T:"@D7T585$M%62DN)W1B;%]C;7,N<&AP)PH@"2D*("D["BT*
M(#\^"DEN9&5X.B!T>7!O,R]S>7-E>'0O:6YS=&%L;%]O;&0O97AT7VQO8V%L
M8V]N9BYP:' -"CT]/3T]/3T]/3T]/3T]/3T]/3T]/3T]/3T]/3T]/3T]/3T]
M/3T]/3T]/3T]/3T]/3T]/3T]/3T]/3T]/3T]/3T]/3T-"BTM+2!T>7!O,R]S
M>7-E>'0O:6YS=&%L;%]O;&0O97AT7VQO8V%L8V]N9BYP:' )*')E=FES:6]N
M(#,P-3(I#0HK*RL@='EP;S,O<WES97AT+VEN<W1A;&Q?;VQD+V5X=%]L;V-A
M;&-O;F8N<&AP"2AW;W)K:6YG(&-O<'DI#0I 0" M,2PQ,2 K,2PQ-R! 0 T*
M(#P_<&AP"B!I9B H(61E9FEN960@*"=465!/,U]-3T1%)RDI( ED:64@*"=!
M8V-E<W, at 9&5N:65D+B<I.PH@"BUR97%U:7)E7V]N8V4H=#-L:6)?97AT36=M
M.CIE>'10871H*"=I;G-T86QL7V]L9"<I+B=U<&1A=&5S+V-L87-S+G1X7V-O
M<F5U<&1A=&5S7V-O;7!A='9E<G-I;VXN<&AP)RD["BL*("1465!/,U]#3TY&
M7U9!4E-;)U-#7T]05$E/3E,G75LG97AT+VEN<W1A;&PG75LG=7!D871E)UU;
M)V-H86YG94-O;7!A=&EB:6QI='E697)S:6]N)UT@/2 G='A?8V]R975P9&%T
M97-?8V]M<&%T=F5R<VEO;B<["B *+0DO+R!N;W0@=7-E9"!Y970*+2\O<F5Q
M=6ER95]O;F-E*'0S;&EB7V5X=$UG;3HZ97AT4&%T:"@G:6YS=&%L;"<I+B=U
M<&1A=&5S+V-L87-S+G1X7V-O<F5U<&1A=&5S7VYO=&EN;65N=2YP:' G*3L*
M+2\O)%194$\S7T-/3D9?5D%24ULG4T-?3U!424].4R==6R=E>'0O:6YS=&%L
M;"==6R=U<&1A=&4G75LG;F]T26Y-96YU7V1O8W1Y<&5?8V]N=F5R<VEO;B==
M(#T@)W1X7V-O<F5U<&1A=&5S7VYO=&EN;65N=2<["B *+3\^#0I<($YO(&YE
M=VQI;F4 at 870@96YD(&]F(&9I;&4-"BL)+R\@<F5M;W9E('!A9V5T>7!E(")N
M;W0@:6X@;65N=2(@<VEN8V4 at 5%E03S, at -"XR"BL)+R\@87,@=&AE<F4@:7,@
M86X@;W!T:6]N(&EN(&5V97)Y('!A9V5T>7!E"BLD5%E03S-?0T].1E]605)3
M6R=30U]/4%1)3TY3)UU;)V5X="]I;G-T86QL)UU;)W5P9&%T92==6R=R96UO
M=F5.;W1);DUE;G5$;VMT>7!E0V]N=F5R<VEO;B==(#T@)W1X7V-O<F5U<&1A
M=&5S7VYO=&EN;65N=2<["BL**PHK"2\O(')E;6]V92!P86=E='EP92 B861V
M86YC960B('-I;F-E(%194$\S(#0N, at HK"2\O('1H:7,@:7,@;65R9V5D('=I
M=&@@9&]C='EP92 B<W1A;F1A<F0B('=I=&@@=&%B('9I97<@=&\@961I= HK
M)%194$\S7T-/3D9?5D%24ULG4T-?3U!424].4R==6R=E>'0O:6YS=&%L;"==
M6R=U<&1A=&4G75LG;65R9V5!9'9A;F-E9$1O:W1Y<&5#;VYV97)S:6]N)UT@
M/2 G='A?8V]R975P9&%T97-?;65R9V5A9'9A;F-E9"<["BL**S\^"DEN9&5X
M.B!T>7!O,R]S>7-E>'0O:6YS=&%L;%]O;&0O;6]D+V-L87-S+G1X7VEN<W1A
M;&PN<&AP#0H]/3T]/3T]/3T]/3T]/3T]/3T]/3T]/3T]/3T]/3T]/3T]/3T]
M/3T]/3T]/3T]/3T]/3T]/3T]/3T]/3T]/3T]/3T]#0HM+2T@='EP;S,O<WES
M97AT+VEN<W1A;&Q?;VQD+VUO9"]C;&%S<RYT>%]I;G-T86QL+G!H< DH<F5V
M:7-I;VX@,S U,BD-"BLK*R!T>7!O,R]S>7-E>'0O:6YS=&%L;%]O;&0O;6]D
M+V-L87-S+G1X7VEN<W1A;&PN<&AP"2AW;W)K:6YG(&-O<'DI#0I 0" M,34Q
M+#8@*S$U,2PQ,B! 0 T*(')E<75I<F5?;VYC92 H4$%42%]T,VQI8BXG8VQA
M<W,N=#-L:6)?:6YS=&%L;"YP:' G*3L*(')E<75I<F5?;VYC92 H4$%42%]T
M,VQI8BXG8VQA<W,N=#-L:6)?<W1D9W)A<&AI8RYP:' G*3L*( HK+R\@:6YC
M;'5D92!U<&1A=&4 at 8VQA<W-E<PHK<F5Q=6ER95]O;F-E*'0S;&EB7V5X=$UG
M;3HZ97AT4&%T:"@G:6YS=&%L;%]O;&0G*2XG=7!D871E<R]C;&%S<RYT>%]C
M;W)E=7!D871E<U]C;VUP871V97)S:6]N+G!H<"<I.PHK<F5Q=6ER95]O;F-E
M*'0S;&EB7V5X=$UG;3HZ97AT4&%T:"@G:6YS=&%L;%]O;&0G*2XG=7!D871E
M<R]C;&%S<RYT>%]C;W)E=7!D871E<U]N;W1I;FUE;G4N<&AP)RD["BMR97%U
M:7)E7V]N8V4H=#-L:6)?97AT36=M.CIE>'10871H*"=I;G-T86QL7V]L9"<I
M+B=U<&1A=&5S+V-L87-S+G1X7V-O<F5U<&1A=&5S7VUE<F=E861V86YC960N
M<&AP)RD["BL**R @(" *("\J*@H@("H at 26YS=&%L;"!4;V]L(&UO9'5L90H@
M("H*26YD97 at Z('1Y<&\S+W-Y<V5X="]I;G-T86QL7V]L9"]U<&1A=&5S+V-L
M87-S+G1X7V-O<F5U<&1A=&5S7VUE<F=E861V86YC960N<&AP#0H]/3T]/3T]
M/3T]/3T]/3T]/3T]/3T]/3T]/3T]/3T]/3T]/3T]/3T]/3T]/3T]/3T]/3T]
M/3T]/3T]/3T]/3T]/3T]#0HM+2T@='EP;S,O<WES97AT+VEN<W1A;&Q?;VQD
M+W5P9&%T97,O8VQA<W,N='A?8V]R975P9&%T97-?;65R9V5A9'9A;F-E9"YP
M:' )*')E=FES:6]N(# I#0HK*RL@='EP;S,O<WES97AT+VEN<W1A;&Q?;VQD
M+W5P9&%T97,O8VQA<W,N='A?8V]R975P9&%T97-?;65R9V5A9'9A;F-E9"YP
M:' )*')E=FES:6]N(# I#0I 0" M,"PP("LQ+#@W($! #0HK/#]P:' -"BLO
M*BHJ*BHJ*BHJ*BHJ*BHJ*BHJ*BHJ*BHJ*BHJ*BHJ*BHJ*BHJ*BHJ*BHJ*BHJ
M*BHJ*BHJ*BHJ*BHJ*BHJ*BHJ#0HK*B @0V]P>7)I9VAT(&YO=&EC90T**RH-
M"BLJ(" H8RD@,C P."!3=&5F9F5N($MA;7!E<B \:6YF;T!S:RUT>7!O,RYD
M93X-"BLJ("!!;&P@<FEG:'1S(')E<V5R=F5D#0HK*@T**RH@(%1H:7,@<V-R
M:7!T(&ES('!A<G0@;V8@=&AE(%194$\S('!R;VIE8W0N(%1H92!465!/,R!P
M<F]J96-T(&ES#0HK*B @9G)E92!S;V9T=V%R93L@>6]U(&-A;B!R961I<W1R
M:6)U=&4@:70 at 86YD+V]R(&UO9&EF>0T**RH@(&ET('5N9&5R('1H92!T97)M
M<R!O9B!T:&4 at 1TY5($=E;F5R86P at 4'5B;&EC($QI8V5N<V4 at 87,@<'5B;&ES
M:&5D(&)Y#0HK*B @=&AE($9R964 at 4V]F='=A<F4 at 1F]U;F1A=&EO;CL at 96ET
M:&5R('9E<G-I;VX@,B!O9B!T:&4 at 3&EC96YS92P@;W(-"BLJ(" H870@>6]U
M<B!O<'1I;VXI(&%N>2!L871E<B!V97)S:6]N+ at T**RH-"BLJ("!4:&4 at 1TY5
M($=E;F5R86P at 4'5B;&EC($QI8V5N<V4 at 8V%N(&)E(&9O=6YD(&%T#0HK*B @
M:'1T<#HO+W=W=RYG;G4N;W)G+V-O<'EL969T+V=P;"YH=&UL+ at T**RH@($$@
M8V]P>2!I<R!F;W5N9"!I;B!T:&4@=&5X=&9I;&4 at 1U!,+G1X="!A;F0@:6UP
M;W)T86YT(&YO=&EC97,@=&\@=&AE(&QI8V5N<V4-"BLJ("!F<F]M('1H92!A
M=71H;W(@:7, at 9F]U;F0@:6X at 3$E#14Y312YT>'0 at 9&ES=')I8G5T960@=VET
M:"!T:&5S92!S8W)I<'1S+ at T**RH-"BLJ#0HK*B @5&AI<R!S8W)I<'0@:7,@
M9&ES=')I8G5T960@:6X@=&AE(&AO<&4@=&AA="!I="!W:6QL(&)E('5S969U
M;"P-"BLJ("!B=70 at 5TE42$]55"!!3ED at 5T%24D%.5%D[('=I=&AO=70 at 979E
M;B!T:&4@:6UP;&EE9"!W87)R86YT>2!O9 at T**RH@($U%4D-(04Y404))3$E4
M62!O<B!&251.15-3($9/4B!!(%!!4E1)0U5,05(@4%524$]312X@(%-E92!T
M:&4-"BLJ("!'3E4 at 1V5N97)A;"!0=6)L:6, at 3&EC96YS92!F;W(@;6]R92!D
M971A:6QS+ at T**RH-"BLJ("!4:&ES(&-O<'ER:6=H="!N;W1I8V4 at 35535"!!
M4%!%05(@:6X at 86QL(&-O<&EE<R!O9B!T:&4@<V-R:7!T(0T**RHJ*BHJ*BHJ
M*BHJ*BHJ*BHJ*BHJ*BHJ*BHJ*BHJ*BHJ*BHJ*BHJ*BHJ*BHJ*BHJ*BHJ*BHJ
M*BHJ*BHJ*BHJ*B\-"BLO*BH-"BL@*B!#;VYT86EN<R!T:&4@=7!D871E(&-L
M87-S(&9O<B!M97)G:6YG(&%D=F%N8V5D(&%N9"!N;W)M86P@<&%G971Y<&4N
M#0HK("H-"BL@*B! 875T:&]R"5-T969F96X at 2V%M<&5R(#QI;F9O0'-K+71Y
M<&\S+F1E/@T**R J+PT**V-L87-S('1X7V-O<F5U<&1A=&5S7VUE<F=E861V
M86YC960@>PT**PEV87(@)'9E<G-I;VY.=6UB97(["2\O('9E<G-I;VX@;G5M
M8F5R(&-O;6EN9R!F<F]M('0S;&EB7V1I=CHZ:6YT7V9R;VU?=F5R*"D-"BL-
M"BL)+RHJ#0HK"2 J('!A<F5N="!O8FIE8W0-"BL)("H-"BL)("H at 0'9A<B!T
M>%]I;G-T86QL#0HK"2 J+PT**PEV87(@)'!/8FH[#0HK"79A<B D=7-E<DEN
M<'5T.PDO+R!U<V5R(&EN<'5T#0HK#0HK#0HK"2\J*@T**PD@*B!#:&5C:W,@
M:68 at 86X@=7!D871E(&ES(&YE961E9 T**PD@*@T**PD@*B! <&%R86T)<W1R
M:6YG"21D97-C<FEP=&EO;CH at 5&AE(&1E<V-R:7!T:6]N(&9O<B!T:&4@=7!D
M871E#0HK"2 J($!R971U<FX):6YT"0EW:&5T:&5R(&%N('5P9&%T92!I<R!N
M965D960@*#T@,2D@;W(@;F]T("@](# I#0HK"2 J+PT**PEP=6)L:6, at 9G5N
M8W1I;VX at 8VAE8VM&;W)5<&1A=&4H)B1D97-C<FEP=&EO;BD@>PT**PD))&1E
M<V-R:7!T:6]N(#T@)TUE<F=E<R!T:&4@(D%D=F%N8V5D(B!P86=E='EP92 H
M9&]K='EP92 R*2!T;R B4W1A;F1A<F0B("AD;VMT>7!E(#$I(&)E8V%U<V4@
M(E-T86YD87)D(B!N;W<@:&%S('1H92!S86UE(&9E871U<F5S+"!A;F0@(D%D
M=F%N8V5D(B!I<R!N;W0@;F5E9&5D(&%N>6UO<F4N)SL-"BL-"BL)"6EF("@D
M=&AI<RT^=F5R<VEO;DYU;6)E<B ^/2 T,# R,# P*2![#0HK"0D))')E<R ]
M("1'3$]"04Q36R=465!/,U]$0B==+3YE>&5C7U-%3$5#5'%U97)Y*"=U:60G
M+" G<&%G97,G+" G9&]K='EP93TR)RD[#0HK"0D):68H)$=,3T)!3%-;)U19
M4$\S7T1")UTM/G-Q;%]N=6U?<F]W<R at D<F5S*2D@>PT**PD)"0ER971U<FX@
M,3L-"BL)"0E]#0HK"0E]#0HK"0ER971U<FX@,#L-"BL)?0T**PT**PT**PDO
M*BH-"BL)("H at 4&5R9F]R;7,@=&AE(&1A=&%B87-E('5P9&%T92X at 0VAA;F=E
M<R!T:&4 at 9&]K='EP92!F<F]M(#(@*&%D=F%N8V5D*2!T;R Q("AS=&%N9&%R
M9"D-"BL)("H-"BL)("H at 0'!A<F%M"6%R<F%Y"21D8E%U97)I97,Z('%U97)I
M97, at 9&]N92!I;B!T:&ES('5P9&%T90T**PD@*B! <&%R86T);6EX960))&-U
M<W1O;4UE<W-A9V5S.B!C=7-T;VT@;65S<V%G97,-"BL)("H at 0')E='5R;@EI
M;G0)"7=H971H97(@:70@=V]R:V5D("@](#$I(&]R(&YO=" H/2 P*0T**PD@
M*B\-"BL)<'5B;&EC(&9U;F-T:6]N('!E<F9O<FU5<&1A=&4H)B1D8E%U97)I
M97,L("8D8W5S=&]M365S<V%G97,I('L-"BL)"6EF*"1T:&ES+3YV97)S:6]N
M3G5M8F5R(#X](#0P,#(P,# I"7L-"BL)"0DD=7!D871E07)R87D@/2!A<G)A
M>2 at -"BL)"0D))V1O:W1Y<&4G(#T^(#$L#0HK"0D)*3L-"BL-"BL)"0DD<F5S
M(#T@)$=,3T)!3%-;)U194$\S7T1")UTM/F5X96-?55!$051%<75E<GDH)W!A
M9V5S)RP@)V1O:W1Y<&4],B<L("1U<&1A=&5!<G)A>2D[#0HK"0D))&1B475E
M<FEE<UM=(#T@<W1R7W)E<&QA8V4H8VAR*#$P*2P@)R G+" D1TQ/0D%,4ULG
M5%E03S-?1$(G72T^9&5B=6=?;&%S=$)U:6QT475E<GDI.PT**PD)"0T**PD)
M"6EF("@D1TQ/0D%,4ULG5%E03S-?1$(G72T^<W%L7V5R<F]R*"DI('L-"BL)
M"0D))&-U<W1O;4UE<W-A9V5S(#T@)U-13"U%4E)/4CH@)R N(&AT;6QS<&5C
M:6%L8VAA<G,H)$=,3T)!3%-;)U194$\S7T1")UTM/G-Q;%]E<G)O<B at I*3L-
M"BL)"0D)<F5T=7)N(# ["2\O('-O;65T:&EN9R!W96YT('=R;VYG#0HK"0D)
M?0T**PD)"7)E='5R;B Q.PT**PD)?0T**PE]#0HK?0T**S\^#0I<($YO(&YE
M=VQI;F4 at 870@96YD(&]F(&9I;&4-"DEN9&5X.B!T>7!O,R]S>7-E>'0O:6YS
M=&%L;%]O;&0O=7!D871E<R]C;&%S<RYT>%]C;W)E=7!D871E<U]N;W1I;FUE
M;G4N<&AP#0H]/3T]/3T]/3T]/3T]/3T]/3T]/3T]/3T]/3T]/3T]/3T]/3T]
M/3T]/3T]/3T]/3T]/3T]/3T]/3T]/3T]/3T]/3T]#0HM+2T@='EP;S,O<WES
M97AT+VEN<W1A;&Q?;VQD+W5P9&%T97,O8VQA<W,N='A?8V]R975P9&%T97-?
M;F]T:6YM96YU+G!H< DH<F5V:7-I;VX@,S U,BD-"BLK*R!T>7!O,R]S>7-E
M>'0O:6YS=&%L;%]O;&0O=7!D871E<R]C;&%S<RYT>%]C;W)E=7!D871E<U]N
M;W1I;FUE;G4N<&AP"2AW;W)K:6YG(&-O<'DI#0I 0" M,BPW("LR+#<@0$ -
M"B O*BHJ*BHJ*BHJ*BHJ*BHJ*BHJ*BHJ*BHJ*BHJ*BHJ*BHJ*BHJ*BHJ*BHJ
M*BHJ*BHJ*BHJ*BHJ*BHJ*BHJ*BHJ"B J("!#;W!Y<FEG:'0@;F]T:6-E"B J
M"BTJ(" H8RD@,3DY.2TR,# V(%-E8F%S=&EA;B!+=7)F=65R<W0@*'-E8F%S
M=&EA;D!G87)B86=E+6=R;W5P+F1E*0HK*B @*&,I(#$Y.3DM,C P-B!396)A
M<W1I86X at 2W5R9G5E<G-T(#QS96)A<W1I86Y 9V%R8F%G92UG<F]U<"YD93X*
M("H@($%L;"!R:6=H=',@<F5S97)V960*("H*("H@(%1H:7,@<V-R:7!T(&ES
M('!A<G0@;V8@=&AE(%194$\S('!R;VIE8W0N(%1H92!465!/,R!P<F]J96-T
M(&ES"D! ("TR-RPW("LR-RPX($! #0H at +RHJ"B @*B!#;VYT86EN<R!T:&4@
M=7!D871E(&-L87-S(&9O<B!N;W0@:6X@;65N=2!P86=E<RX at 57-E9"!B>2!T
M:&4@=7!D871E('=I>F%R9"!I;B!T:&4@:6YS=&%L;"!T;V]L+ at H@("H*+2 J
M($!A=71H;W()4V5B87-T:6%N($MU<F9U97)S=" \<V5B87-T:6%N0&=A<F)A
M9V4M9W)O=7 N9&4**R J($!A=71H;W(@(%-E8F%S=&EA;B!+=7)F=65R<W0@
M/'-E8F%S=&EA;D!G87)B86=E+6=R;W5P+F1E/@HK("H at 0&%U=&AO<@E3=&5F
M9F5N($MA;7!E<B \:6YF;T!S:RUT>7!O,RYD93X*(" J+PH at 8VQA<W,@='A?
M8V]R975P9&%T97-?;F]T:6YM96YU('L*( EV87(@)'9E<G-I;VY.=6UB97([
M"2\O('9E<G-I;VX@;G5M8F5R(&-O;6EN9R!F<F]M('0S;&EB7V1I=CHZ:6YT
M7V9R;VU?=F5R*"D*0$ @+30P+#(W("LT,2PS-2! 0 T*( EV87(@)'!/8FH[
M"B )=F%R("1U<V5R26YP=70["2\O('5S97(@:6YP=70*( HM"69U;F-T:6]N
M(&-H96-K1F]R57!D871E*"8D9&5S8W)I<'1I;VXI"7L*+0D))&1E<V-R:7!T
M:6]N(#T@)U)E;6]V97,@=&AE(&1O8W1Y<&4@(DYO="!I;B!M96YU(B!W:&EC
M:"!I<R!D97!R96-A=&5D(&%N9"!S971S('1H92!S=6-C97-S:6YG('!A9V4@
M9FQA9R B3F]T(&EN(&UE;G4B(&EN<W1E860N)SL*( HM"0EI9B H)'1H:7,M
M/G9E<G-I;VY.=6UB97(@/CT@,S P.3 P,"D)>PHM"0D))')E<R ]("1'3$]"
M04Q36R=465!/,U]$0B==+3YE>&5C7U-%3$5#5'%U97)Y*"=U:60G+"=P86=E
M<R<L)V1O:W1Y<&4]-2<I.PHM"0D):68H)$=,3T)!3%-;)U194$\S7T1")UTM
M/G-Q;%]N=6U?<F]W<R at D<F5S*2D)>PHK"2\J*@HK"2 J($-H96-K<R!I9B!A
M;B!U<&1A=&4@:7,@;F5E9&5D"BL)("H**PD@*B! <&%R86T)<W1R:6YG"21D
M97-C<FEP=&EO;CH at 5&AE(&1E<V-R:7!T:6]N(&9O<B!T:&4@=7!D871E"BL)
M("H at 0')E='5R;@EI;G0)"7=H971H97(@86X@=7!D871E(&ES(&YE961E9" H
M/2 Q*2!O<B!N;W0@*#T@,"D**PD@*B\**PEP=6)L:6, at 9G5N8W1I;VX at 8VAE
M8VM&;W)5<&1A=&4H)B1D97-C<FEP=&EO;BD@>PHK"0DD9&5S8W)I<'1I;VX@
M/2 G4F5M;W9E<R!T:&4 at 9&5P<F5C871E9"!P86=E<R!D;VMT>7!E(").;W0@
M:6X@;65N=2(N($ET('-E=',@=&AE('-U8V-E<W-I;F<@9FQA9R B3F]T(&EN
M(&UE;G4B(&9O<B!T:&4 at 8V]R<F5S<&]N9&EN9R!P86=E<R!I;G-T96%D+B<[
M"BL**PD):68@*"1T:&ES+3YV97)S:6]N3G5M8F5R(#X](#0P,#(P,# I('L*
M*PD)"21R97,@/2 D1TQ/0D%,4ULG5%E03S-?1$(G72T^97AE8U]314Q%0U1Q
M=65R>2 at G=6ED)RP@)W!A9V5S)RP@)V1O:W1Y<&4]-2<I.PHK"0D):68H)$=,
M3T)!3%-;)U194$\S7T1")UTM/G-Q;%]N=6U?<F]W<R at D<F5S*2D@>PH@"0D)
M"7)E='5R;B Q.PH@"0D)?0H@"0E]"B )"7)E='5R;B P.PH@"7T*( HK"B )
M+RHJ"BT)("H at 6T1E<V-R:6)E(&9U;F-T:6]N+BXN70HK"2 J(%!E<F9O<FUS
M('1H92!D871A8F%S92!U<&1A=&4N($-H86YG97,@=&AE(&1O:W1Y<&4 at 9G)O
M;2 U("@B;F]T(&EN(&UE;G4B*2!T;R Q("AS=&%N9&%R9"D at 86YD('-E=',@
M=&AE(")N879?:&ED92(@9FQA9R!T;R Q"B )("H*+0D@*B! <&%R86T)6W1Y
M<&5="0DD)&1B475E<FEE<SH at +BXN"BT)("H at 0'!A<F%M"5MT>7!E70D))&-U
M<W1O;4UE<W-A9V5S.B N+BX*+0D@*B! <F5T=7)N"5MT>7!E70D)+BXN"BL)
M("H at 0'!A<F%M"6%R<F%Y"21D8E%U97)I97,Z('%U97)I97, at 9&]N92!I;B!T
M:&ES('5P9&%T90HK"2 J($!P87)A;0EM:7AE9 DD8W5S=&]M365S<V%G97,Z
M(&-U<W1O;2!M97-S86=E<PHK"2 J($!R971U<FX):6YT"0EW:&5T:&5R(&ET
M('=O<FME9" H/2 Q*2!O<B!N;W0@*#T@,"D*( D@*B\*+0EF=6YC=&EO;B!P
M97)F;W)M57!D871E*"8D9&)1=65R:65S+" F)&-U<W1O;4UE<W-A9V5S*0E[
M"BT)"6EF*"1T:&ES+3YV97)S:6]N3G5M8F5R(#X](#,P,#DP,# I"7L**PEP
M=6)L:6, at 9G5N8W1I;VX@<&5R9F]R;55P9&%T92 at F)&1B475E<FEE<RP@)B1C
M=7-T;VU-97-S86=E<RD@>PHK"0EI9B at D=&AI<RT^=F5R<VEO;DYU;6)E<B ^
M/2 T,# R,# P*0E["B )"0DD=7!D871E07)R87D@/2!A<G)A>2@*( D)"0DG
M9&]K='EP92<@/3X@,2P*( D)"0DG;F%V7VAI9&4G(#T^(#$*0$ @+38X+#$R
M("LW-RPQ,R! 0 T*( H@"0D))')E<R ]("1'3$]"04Q36R=465!/,U]$0B==
M+3YE>&5C7U501$%417%U97)Y*"=P86=E<R<L("=D;VMT>7!E/34G+" D=7!D
M871E07)R87DI.PH@"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.PHM"BT)"0EI9B H)$=,3T)!3%-;)U194$\S7T1")UTM/G-Q
M;%]E<G)O<B at I*0E["BL)"0D**PD)"6EF("@D1TQ/0D%,4ULG5%E03S-?1$(G
M72T^<W%L7V5R<F]R*"DI('L**PD)"0DD8W5S=&]M365S<V%G97,@/2 G4U%,
M+4524D]2.B G("X@:'1M;'-P96-I86QC:&%R<R at D1TQ/0D%,4ULG5%E03S-?
M1$(G72T^<W%L7V5R<F]R*"DI.PH@"0D)"7)E='5R;B P.PDO+R!S;VUE=&AI
M;F<@=V5N="!W<F]N9PH@"0D)?0H@"0D)<F5T=7)N(#$["B )"7T*( E]"B!]
G"BT_/@T*7"!.;R!N97=L:6YE(&%T(&5N9"!O9B!F:6QE#0HK/SX*
`
end