You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by si...@apache.org on 2011/02/21 15:13:40 UTC

svn commit: r1072973 [4/11] - in /lucene/dev/branches/docvalues: ./ dev-tools/eclipse/ dev-tools/idea/.idea/ dev-tools/idea/lucene/contrib/ant/ dev-tools/idea/lucene/contrib/demo/ dev-tools/idea/lucene/contrib/highlighter/ dev-tools/idea/lucene/contrib...

Modified: lucene/dev/branches/docvalues/lucene/docs/demo2.pdf
URL: http://svn.apache.org/viewvc/lucene/dev/branches/docvalues/lucene/docs/demo2.pdf?rev=1072973&r1=1072972&r2=1072973&view=diff
==============================================================================
--- lucene/dev/branches/docvalues/lucene/docs/demo2.pdf (original)
+++ lucene/dev/branches/docvalues/lucene/docs/demo2.pdf Mon Feb 21 14:13:28 2011
@@ -5,10 +5,10 @@
 /Producer (FOP 0.20.5) >>
 endobj
 5 0 obj
-<< /Length 615 /Filter [ /ASCII85Decode /FlateDecode ]
+<< /Length 570 /Filter [ /ASCII85Decode /FlateDecode ]
  >>
 stream
-Gau`Q9okbt&A@ZcI*<Ykos`nIUlEl=V5amN*k"3CDuqN*WI`mm^FpE>44-[e.;KFgg#JKGcQBKRKDR5(KL#b#6\,#?)B`u-0L4HL6.Cr%L*.3SLelrCYrX7HY3s)gaKV.<4LD)f4M5dlF]'$TK4!,"41*J=8QC0DIY7Fm<BNr\]Z6iGZYXZWgLEDchet6bAB=RU+m09nOH#)tR8GUii!-dlO0X"2Ao]7"B(*:*$jnHgGB'oA/PY(t/bHmP;dD8\C?in_#8gbC_l1nJGJfO_r*eLZM@?r:II#Ei[uH<ujBa;TSTW"siQYSn#*'OrI00j4.fkP6PTqV4.tMX;T[T\cFS5VS>UWM)ZZTbP]'rr76BD^,+W9>c2`e-qBDnsTeEaOkqqL^6gO?u-&$3a*=E=N-aFhaDp8iHf0kjrn8%6g:X?i1D813hISi[B)*ng%.m[eRfTC,4WG<ihgVfShR2Rh8RhL4p;pYYaqNJ#!SL=eF!,7,[b2R3Pn&e9j%LYugLmV<?$PX7&LP&[\ti9ji=JqJkS#CiMps%IFV)u#Nq+ri[4&/#JlI\"'Q><@7H?4u:XCirrnp5/;h`MtI0Yd%sSX'1p(PsIq=5FMA&K)~>
+Gau`P9lHd\&A@Zck*R4Lq@gb$aYm%t9%>C^Hg'mKJeQL/g_sk<s*i3_YnL,0:G!QRB9-]f]tq$MK$,_Jaq9A=+5m-^"W.^M!Gl*EEPE90N*$o_nd+uJePhnOl2m8N7Wr]igL[DYnC!`jZmdd9J#Gm)cq\d3;p>LDJ`Pr=+(6eZYI+/<C^[#M6SUT.D@$k8epMR9#`_HoVaB_)W)o=)K:I?kPqU;(i?T!6;)lQmaMKZ:P!2hI:!ml2o\S8hY$4o8boBLZ_8l'OmctU23L4/;id7;Z+iA<WHhF&Den&Y*YEY$l/K.=Tjc;!G`#Q&]JH\1e!KS[m'.J6.!oNlUB5(T8qVrV:.FJY)ee`+2dgJ/C5sM3!j@Du"fQec*n*<#9DqhS_DpLAMrJ7iu=biVY/OIB&*rJ-9c[2QfP8.YWE..^t%;[1"S%6<.n1"a9LD`.s&:u3k_@l)67T=n8YRc0el[JQU=XB"N._5%<0<r+.Tn&NTNSirtJ#5=BXd`k9W?;[JN'i@5InlW]m@E+CYGq%m[^rO2iJMoEE`H*L%(R;fX%&KnPp8ft5;Fun9`~>
 endstream
 endobj
 6 0 obj
@@ -26,7 +26,6 @@ endobj
 10 0 R
 12 0 R
 14 0 R
-16 0 R
 ]
 endobj
 8 0 obj
@@ -70,20 +69,25 @@ endobj
 >>
 endobj
 16 0 obj
-<< /Type /Annot
-/Subtype /Link
-/Rect [ 102.0 446.366 206.972 434.366 ]
-/C [ 0 0 0 ]
-/Border [ 0 0 0 ]
-/A 17 0 R
-/H /I
+<< /Length 2391 /Filter [ /ASCII85Decode /FlateDecode ]
+ >>
+stream
+Gatm=h/D%+&:aF]+m`bld*NEu]sjkEMA?B(2'2=mm"(I9S#n5fPiO+elZ`30FHe6-7>Ck7.-ln;^UsC!OhP*QIU+Q)=kG!W,MTWk^RjK8IsjD=/5'i^kmtOVYSOK<Cb...@DnRE>Y6Ar)%PTXn@X1bKH2<!U+Y9R?%"+`TY@=*t]<%Q^:R_Qa4R4TkhgGUc>`.IIYe:5T1P*q#sE07V"'cb>g8/<^^+<NO,
 hr1Atto-+GgrVjh$\Il*!W!1=4Pr^2@A4Q9B-:9J^gQVbd7b>"8&'1G_eo)p60,6oR'nt5$nqduC."2l9_O=l&^$2EH2\T*A_`m:1/[QP-0SXaEdu?D0>l_F_PJ<`>3-2H@%bF]1\^lp3@5Q#a+=JUY<jQo.37&]J?"2,JrqPdKoir4uh*tm/?LB'G-4Ji:TB`*31BWFe:]mJJ*n&i6,*3PIKKf>lIDC@>n3qFS<TNiN>RD%]'\3E^5m]4Fm10kWDGH;fkA<KEOC9)e_gO\Z1R5]!=n_D>mduLC_0"Q^_9$e0j#`ZI`7CFZ/t/)-)#,?!.Qeo8BBAAOJO..qW35tdeE4t#$?\\pO/4H3s,$h.LGuCRpc!?_^D%taZRtIu#2J.,h&#Y;ACC9:/0XESUJ)Y'!Gd&s!=O.0fm#<*]h9fJEM/eF`o#p(+?Z"?:U!@b9fmC2jC?DWeK8W:\A:JE-\;H<)R^bD;88G1c6Y*&FPU"D*)-'9W='#fM]HHfe[=@*!K$#a>3`XNZ0@dPk;YC@GeeU5?ugWaBqg.U9NY;.gc([h2lt.o;sYk=5`b_:F'-C6M*0UXMbq5017%_Bfe1N<<l&`02&kI*FbjIH%a:pM,VTD[S^%`5bhOq1C2Gpl9_)7_.E-?BLF9(8Bjif2Hdi[PH@4*1K4Wt,C?.biS[553r[`rtnMMMnh_=(^9Zm[^R@4nL$Sa?ud%7pUM)D.Em>bV]iAu?U[#-?dR0,BfQD`)jHS1!l;g@*PBb9nU2NSeU6!O9$8PPDY8S'ZtrXN$bQFXU&N[BJ%?CY;N!GB";Oa.9)VO#^NI:P:o%9%!PA?[+f<RY0uKq(+DMYem922RgfO@&B[+WgDtg<uh#7_Ieb2KtMJJk9k<l.W<["/%rN8SSBY3Afi:qAnHq9MI\qXta<*Tu19a1FJTF:^Y,g&'_UK*>W<1cn]aGQfCEGJ:qF;MqrD7'%"!Q(i)!O=%:%iQdctt7]6B0^,S
 g*U<"13;j)-d)ab12oBD\G.?=S2eK;t3J:M+/4g:m\W9O*@"?8S!pZEdV%+V:B,EdNo\N+^G$r_#=DiP;sF7?drnOA[$op`Mi_H]<N9-LkSK&Jh+KZlk4;3n(Gf09"Y_;2f`]IEQ0N7[#se)1(_+GWeZ%9ZE=>OWk=$tZ<;hsSmg((:Bc\=Q('4"GDXim>3Irb8O%CE6hSi\7&#@\nQrUTJE:+VO1aqsFs'IrIX-s7Xb[d%-8Aok&'qq^fbt8a(BM=Z2t&I@7K'?"Q*,Isg_flIDoTcEMBQGIH$RV[*gRDR0d5'+I)HI@]`?bRb#n'mY=ge#I^A%kgOkG>52p;)=2.h\fJE[Y&#=*TPlX6FBtRb>%f^"g<>p-`]@@rE#JZ=N`MfU=m.DCC[\pETipCh1&TmEB4~>
+endstream
+endobj
+17 0 obj
+<< /Type /Page
+/Parent 1 0 R
+/MediaBox [ 0 0 612 792 ]
+/Resources 3 0 R
+/Contents 16 0 R
 >>
 endobj
 18 0 obj
-<< /Length 2590 /Filter [ /ASCII85Decode /FlateDecode ]
+<< /Length 2967 /Filter [ /ASCII85Decode /FlateDecode ]
  >>
 stream
-Gatm>D3*F0%/ui*@I-YAiD+#II`oIu[WP\L?n]c$%(gr73D-$rYqk!-HMdB1r(9"JH:*GhG:1G*aG8hDMWt(cnbme(pVLRr.eB!uq&KWiq&T@5bk(JPF+<uN&)LdW1Z(jb#_#7Jq>3(+=g3iI/\K-C08o`#ipKP+"m1O3G2[e["\=/nJ_+auQLK4[XUj810*Cpj]+%t!04-rDVOj+H?;-8qeHT'(HL&&2qEZY)LL-B[`3LX+e;7(h&7o<(#WlUr,%89][+"'U&g&[*BiU#&Q3r%f7V\K>nI]]hWnHb[-<."m\Nl<"`EniLa4n-c*-f$)/S'^0^2%b?f,J^+h]R(86DI=leO)gNp+mKXAoHi>*,`hql=kP)\jkEFfhVJ1[OGG-OE9%*6,aqgZ52Ok+RrZiKYQUrNY+7-661bL!m\(QA9Trlj&O>$hKT.KYbcmQF]B*Mp?G>V*+,kO\3uWX=SVDgaIF3m.u'hp$^3;?@hqi0Il/5q)G.jk5O@;6Ogj2H:<i$[g0P5(B5Y_/!nr<[D?,1]SD9'uOJN%Nr$i'#js9<M+PLY-L<rip$"]88]Z/>%=b7'/;U)Q[T5)Vlo(LkR3#&d![=eNJY=lfA>HJCal@&8KJf"ShDlf'=Y#meg9U)RNW[Z:,PsFX(laHDZ0\WqTh7ZrsJ8O.9^cgcN9'>6#9E0Ylg?)VbH^X=C8^M.Xb#MSc=]YQl"]62B36\<^L)7%\&GnXqcM'<?b5?,H=-0ZJYa<;$<XK'4%N$n^)(B-,q$O+qRis:`]s;$*)IUId1WDpB=m=`_5Os1TmYY&/]?e817N%,_N2p>IaqXr4!(&.7U6$"D.308dVI]cR_JIMVZ@K%]h*4FqeCb@7n9obo[`Z.E0oO[6bG[<`K!R\TObKad?S)[]2_9Mb0=L$IY;#$.)=^;Z%H0@aFWlII6^2*p,N%gq^=l,]3Dpc7=rYC/>=K2>I$.P>%+9s.o,ZKXi!?\&)d22sEPCO
 ]-$(&Q\F:</IXs2Rq+!O*(.t:gO4P51s0KF0OC,&fL-EAd8'?ke8_*pM6od72Q*YF"^l9eAd2s:0N&.&&\Kg%OZ);j6#ec5!ntrEXi@H!0I+7.$<J)S`f6uC4gGb-ufYZ&#1`*aC^g;l['\nSPk694=38",rM^+!6SN*f2$EIo$af<WA"/cRmX>(o'#n8NHV<61t]=$^QF\,nhL9?h8Q6[&*o"\,N>=q<sZY7'c\1Y:MV3cg@l[%ui%pIO9GE#C\[7B^K`D9U`"(oXZ[Ao\$gfN+K/F8fL,!['SY45X->]0D\5tWPO8o^F)K"2<]*-Xo&hcPm*WO_qG]m3oSioqNd,RL5]-q%H>i^a"XKkQ`XDF,`[DQn@9Na_*ibhTfT>5[:YVl&\Z>k(eD!k%B\>(<Yekq/Hld$PebpS`@an;+8GE0Suti9s+[gWQJ5G.8ZS1j]ukYYq<d76V#f'GB.)X+01fV,PgC8c1'hqVltCm?@s2A&6XYO1`kDPfSrmdN;bG!4?S&@*9](0-r[!c)Ln+?@ZH',Xm*D<W2Coq<'-l=G=ZZ#WGfErT_COmX[Sc'2;^J'd0<S!'ns)k5\%hg&p8oDeRpk/eDq>f<@ECCBV,ciDPeW'hq94^*q&C8)'H&B[N(W#Ba`X*E?7a`rbEWDY70IBo?/4T]*etW3pE8KDe2Aqa4j#W5[sO5WiR-:fucrXr#Xl1&6U`TFE2ZDENn8LcRf6i1jK7njkMHH\*_f,t6OHE*8%nU@15rciNBl1tKW0QA9P+`;WoN*(A3&@LGK]R`*KjiO'&9!sDN\G8q%0$bWE71sPF'DpHXG.L2f(:tnH3;rr'M(_CMQ.+hi#jmRrZ,o6T`-CMJF!caPQ&+$_H8Z#D/D2jFlnd)XX9(,k@MdY?lJoT83<7(T<7`?PsoGp&)`n3%b$BF=Z&;@t-]2+?Q_[nNn[L)OgR68tVAugP.KDI_;-JT2Td\eI2V\oIlfM<k)>-!^YPZ4
 ,WPp`7S.?a+qla&8g,I\HR/@:6?lruTGQN[p^&Pg'aJ^t%M"e_)u>[Jf<He...@e>-R!bd*b8aHK%5o=^<^/`3$/U.(M"4O@EGSg\7.eN[M>4m$Q>9Ho"om=*Kc[C7d:YmMh(*C<#m^I<bZ<O\K=(j2DZ?0ibliVG2![4<*pA~>
+Gat%&>BAO[%Xua-nB=(lh.[R//c"a3g9bM<cFNSSg$-Cdk6rri2B,4e8L]\of.SQ*&g1,1G</GL9:u7rq!\=.qhM55%p(uu]YtZcs*V4p*I"bn0&^F[REmfX(coc*n\t@ic`?dN=1=f&$dXSi&">)YQ#biU\*,*4V6b9]`C$p*pR?N'GZma_Ge<asio-LP)>0.?.5-QeFX!]PFdb+g\UM0#nQR<re2p\A=",YTMnK`\7o.:do9[)HhV%@.XCc5PY<_i-SN988WD,\>KI>l1D,O]7fA2]C5Q$iuUaoC-I\gSt[2.j>I4$M9MfROc[GpOe\83Ye+FcZfM@pjSb)F+)$sWYJ95GenSfD?$de=d^A7Wqb6,ZC&W2s_W_<UrK/E1Ch<Il3kG?ePoY*]eg-Hd$kcS_?BRlagZD4]OL.5O.VO6Aq[b<o^Gc!<?taYm"2Y)Fi$FsD#]RI$&POIM_[ccURbZX*'jXr_c!O87=/bQg="HUu[J`R.AZ"A.tT,I'D(LqACrSBs(gZqcKZOcu<$rE@+)1R27=Q1%2&:Sj1Xp,eE):uXfLf-Kcg5>J4amuU,uUd@04T&tiDEkLg0a^S_IJ!D4C)7KcAPkY=h4ciA7b-qO-lSaQ]bO_h=pt;?bl&)BJ,B0lCddm*\iM3G.Um1dg\GVi2q?QSa/>")7B3]*]_.),=21Sd]pKTugEO7FAEGucC\P!I'\i;]l/ZV$NNHVO'a6t@L1R1C[rKsp3gTW8U@O/&p*(EV+9nX_=6PtFq:J")>^0q/mh@Xg!WVlO7$N2BWSN3>#Gejq\mas>$%obo*cRa"]9u'Y;3bKqu6!>E2rdt*`P>.&o>h_V-$jP30,m?*!ZnZM,<ALi4^tfVd5#+5A3epNpSF?#JAN@hDg8p#CL`J(P(#BTn6&W=j?O\t`F_0eIH$ETWdmb4e8^UK-=_-00$Q1)U@)L$j.Ft:]DJ$S0EZL!Lc,VG^"l_\`ZMo;Nf(mU_fc3@
 `"i/K@XHni<Yq?J>&%fU4@"=e7AgUVtgC;Rthf^\mX&XI]PdlunHcmnk#_&8PrpLqWHu!:F@=hV)I*qULcWMm"`%Qj!I5CduI?<P[D!1(g&3K;N*k2?GGD^QP-Z]?8Gtt"O?I>]K%;@%t;XMh**&j89HUd&Bn:e+q$Lpp?\n0h5nI,?5MCQXaM]%<4oq_]QJMPD&UoXMmnaa/_(0fT9-9ulHEgZJ3>bKGT#X4"2EWSKqk_iAZhPed+f!A&KE]6\rh8PmYSXUkBQqS\('],4[!!*L,XPg>)p=Knm+X;K%nqf&u9quBu18NSu8Vf$mee<Gfi#"QMJ0.;,$FhWak-FIbU;ZTAU-`?19m5%gS=(OcAuilM$]1SG%J\HH:\QWpO)I_jT16a9&rMPb:.P(D2?^VL7VRFss/%5D$3R8:qclq`8p9Qs"U87143s9Of[1CM%C(QrJ4bk.Er@$0ee`N`?3EM3/a4IS[okL)^@90`fM,NLe=cYqWhjF];1c4p;oUoo\l-mJQ=F=f0*nT`8?U(@1OXntN7TIk!,W;4bqSuM*8-^o[l[)HTb[g(f]HG9mDF%T0Edt^dM2@d=[j@`bJA)XXIu'p)_XkW#[18I/;i]Y`p1dd)\DS*lJb-Q!A#B<Y62&=oUr(B`*U8hjD!]7/S+USUR2u#KTWTG/a7V=.o5J9:a*_%EPh6TH\#[F4g*HRB.oGLL&2Y6mVC\db[t=@PFg'T0-BX(55t5qQbVrPJ,]6?r>Zq*QA)2^"(4j1n_2q>+9XR$Ib><noLtng#m5XkGj@D'7;*li=UK7.K*ZXIFHhUK]K71V]Gf4I!:TGI;IECR%A*.oMAhGmFj5iEVSa;4d>br27CFNJI*3!YrG^0tHQaT3=^OaH`[U3/KZ9HhUkE=gke]gI3-ce36JmBF([0h&hsFfY0s#rglC#HR<7N&^H$kMs/K)l[k=LR^Hp"FAX>#XB9d':i=5Y_ufD;e0cT%Q<qb"Reca6
 =Ym6kO?6O247<f%bHbjWpMb\nmEa^UsPMs6^<IU7-:'EOF5s)^rn78RG[E_ZWq'j@op?R7;lZp"uieESl)5s:BEV]192jIF.I5>>(%;BZ$gYQbcrhiFJ!N`"D#2)r=WO&L*:@P9f-)KPQ!1+5=@-`WCZQkGcpV)$BM=t7Z7BtiP2DP=5^OfN]7q":!#n&J?oj<5sBF(&l`USh_%,aqnBjunD3du^iVTcW3ZIl:OP4u9%iY3VSi;et?pJ$eo>6Y9V(]7f!,@%Fl09hL.Zdp?["rhD*?7mKn*J,uEn57l0\WB!.;\d2sClsTL@R?5@CY0BpU6:lO#H1hn'.3o`(AH'?0NJT8RNps+t6^1+169^TE_3s+5emab[9(9)hdt)TnSra--m.qa:.^(4+IgqFK*X<I;4]JLPD2r=2Qmel4%CA8mNdX#g1/O3>mIo<VT4Tjd15E5X]u3`%430[As";Ee/X\k^qO5XT1g7AO>)P6jcM4N,P$?l/"nY>74e_4`Nb&+!l/!oX!DF*K?eHH`^\#lljs\C[(/nZ3$F5%t1p6Bq>8']SGUb;aggYOAp0]eMIZIIT#DbcA3QfIG:SiZYXQ1drXj0$Z`L*\LBYs-FE6>Pe-S*3nH5Pe`?B8'O@6<D:ri,)5T"TlJ@NS(q)NVTSc#J4h_efR?^,,m?0#/\;n*Ypk+.t6qo,cu`iu^^KMENt[&-QH60O!u`("<$d][F$6;[67``+7rbUSZoL+-;@)8p,HldsK;G5R2Yui7JDWcX.]Ra4jMnZUc&tX*Emh':Sp$)fkTm$:.:u\HhUO?[Nk(1A^IRZ2Ej`hC7,oGD*%!oBUSVNL`$iP!0ugOeI/l'BShe`iMMZqkGa8NsD6S)[#.-cg>0HfWH;`HjtR4j$dS0)D*(+4l>RkqB2hk'&-^(Q#Y5m.mNTZ/)PK9_po?"\dRTIpA1iFeGE`]m_8MHQIpZAF;4$F$f+8KDN1fEgDjd\jo5i35g'!~>
 endstream
 endobj
 19 0 obj
@@ -95,10 +99,10 @@ endobj
 >>
 endobj
 20 0 obj
-<< /Length 2028 /Filter [ /ASCII85Decode /FlateDecode ]
+<< /Length 630 /Filter [ /ASCII85Decode /FlateDecode ]
  >>
 stream
-Gatm<gN)%,&:N/3n4iUM%.Seg6Y:A<dr^aJ;QH#Ge9uj<84#WT$:%d<^V7mLa9<#4Icu#m$P]ku4kMoEJ2cf50C-T<L$.g\p\c:WM<i*"%"H0nrI!]1.7kQ%SB^':ilueS\rIcVLMtbuL"jjmiQ$$9R8HXe2g!UUkO4=6<41eV's20Fn1Tu?V.@=:7doP5aPD^pBte5\ZH67gqNhmt\!Q1(q8ZY<2DZ=@,Wm%F.)^=9m4Oq[^[pu)gW4]ejRf)VVeR,ioGQLQo6AA`9Z%+_9EV[=9j+,D@l#X+Q`KFgK]DE=&GdYFI,/LC($tpjaOT[smH$;fH8IYS,N?rqkFu?p>(40JC)T[02cB0-Ad$ERM17FiD5t82!l:T*iE/9;j':#2W@W!'*1!UYj:&^f.g/bFn5n3A01=S8=B-T0!\_T-NE1<%[b,t[23g0Ngl/c+f[fpIm9m`l5uSIAXm(4QZg3bp,u],#fS)6\FUt(d6KAPqoYeo#r!fip$'?Wo83/(l$a-qm2*We<cBTUB?IlCjiktbrRT?u-pC`rG$<EP!qFS4C.ER0DGJ5SoYEILS=kei\8r5L!MF4&oR;nilTF`>uWBUt37*H#q+6PF`j?pUKQrF.Sq2rggk=nOE<b):&Ns"7?d*,1U^GW%BOB"8G=Gb(ZJ=[R.Z$)koS*8rk18g7B:,,ho(_CUL=4Iq/Ht`*L',@^52q=96G$Rm0<1E67Q[$Vbe5jD#b"IF^re9Ao:eUtf&k8h:FJ@+q=-gq[4[&:LhBYQ?d2S=EO93WE!KQQk\dt`<RIa$Tn3[TFYNnt+&b[MNb*$ah7;>3kqU%jB)icj]8<*AtaR5r2S#41-XsJ"-'\:'(5f(r1I64"ZOu,hf^hNh(T%Et&gamRf\T@+Erpek0Ptg=.`#k6R1tj)%UeTinU!>@j1cHZ\cqG7&L_.4-<9ANZSQh7RfO[c\Kc*F^3$)?rHkKW$Q0(Bbnkrr\FM.psU=r)+p\%+
 pEPq0I+g^7J;=XgS>c4a1U`1J.]5XD%2(Ar<cs...@5>3\4/'V)GhV&$UQ*t/1^_+8]cnI"%h)eDfN,?*7Ci[;+-91r=5NCJ^-K<qH2PE4O6rR#)8@h%AbRHW-&A0OnS:q\d3RL9FY$)0]Z_$KS+5)d]n2V_[Q\;.tBD/C(:jB'1,>L9nT#R<2`?5fS5P**h'I6W<4Si=/[KAm&C\3i[WHM[CP)JUYg;#3,?=^.=:=J7Hbgo)N^O[r=cHtVCVQ"rEuMd9f!79>E%F43&:3#HoLb%RZ+MPj2l!PB)81&FXg3adI&`IUX$/WMclj)EX*5\ZmV-Q#Zq0ce9B6oi[9;b2s"+glMQo9pNC$BgMOAoQX6E0S[NO\+aqGO<4n\f1H1Ui>7;,XtDufjZp[_3jQ_;+*;XqT:_+l?XaPLfG;hR89PbeE4IM3rKr-fMAg@!haT=$4XK>lIDq:j5#:TUnG*Xdh=AWSt?Iii9iq;2#u0s-*`NqDL?Q&NS[LNF7%(2:^l'1)c0JNXi^A).kSMCeU&a6h-Si7J>@81Eta^)!uetN;%(D;%#/C'-4?L]LKL4$FLM@*K]i&"_ERff(njT-08`:97nss(/7*8[XZ/L8^>!iOP,)BhqN3^rI+O@Ud?"P1!(#=uDoB
 (J%;"*T\J>WFrpf,bR+>Vkon..!KuOPtfj/fEEX(qrKlMO.~>
+Gas1\9okbt'YO#fHq^?\X)2Z:H>C+JW`9S3_Q&Bg#;:&s26jKrg"lT'3^A9gWsF9DB@$@dJQWc9V]pGI#cdh$3Qa'aPU)*814FOV0FeCE&j8ZJU1FqMHQ\,@^JJ_kgl\hU#jR7/!Ko0:m*W#iRSl=>^JXOOPPBiR-4l[VN!'ZMn"OPromVo:Zo`X.BK[E1X5uc(s&UmM!ILf&j;54dD_!81=\Ak*HWe[d>A9+AC-B>Z+7oGBf5c6&C:sp8&oL*,]%/8kLgCP5@UNi:66GW<Bh.<$j6@6D`S6A4.Ai3iFK29W9L;;ZjI/n(cJDi0HNq/XiEWhI\Y*5:K&$[\-mo*q)AOf\8quM2D'jV%Nknnu6f%F:!=Acb1WD]+P8Lio01(qE4bnq''P5'H'4OF]`#20CB$e2gIQ3.h+$<7@:D8UthqCu.Bk]:f94=<1;Rr-@4XmISCJ&:g[@^q&BAmU#gSu=+m"0H(:mW2S;b6_G3^4ZMKl/u,mV3g2kD6G]jUAFO^Z9%]3=Ga-GR,m31hAe*0&[f@KVOKOB1O]K;'1gqWTrp?::'A8:ejJJ0ht2;$nc]GE4*S6]lgNr0@NuDFK7=:2-N:2g[.JWSS\H[XY_\O"/C'i!FStH%0~>
 endstream
 endobj
 21 0 obj
@@ -137,52 +141,44 @@ endobj
  /Title (\376\377\0\64\0\40\0\123\0\145\0\141\0\162\0\143\0\150\0\151\0\156\0\147\0\40\0\106\0\151\0\154\0\145\0\163)
  /Parent 22 0 R
  /Prev 25 0 R
- /Next 27 0 R
  /A 15 0 R
 >> endobj
 27 0 obj
-<<
- /Title (\376\377\0\65\0\40\0\124\0\150\0\145\0\40\0\127\0\145\0\142\0\40\0\145\0\170\0\141\0\155\0\160\0\154\0\145\0\56\0\56\0\56)
- /Parent 22 0 R
- /Prev 26 0 R
- /A 17 0 R
->> endobj
-28 0 obj
 << /Type /Font
 /Subtype /Type1
 /Name /F3
 /BaseFont /Helvetica-Bold
 /Encoding /WinAnsiEncoding >>
 endobj
-29 0 obj
+28 0 obj
 << /Type /Font
 /Subtype /Type1
 /Name /F5
 /BaseFont /Times-Roman
 /Encoding /WinAnsiEncoding >>
 endobj
-30 0 obj
+29 0 obj
 << /Type /Font
 /Subtype /Type1
 /Name /F1
 /BaseFont /Helvetica
 /Encoding /WinAnsiEncoding >>
 endobj
-31 0 obj
+30 0 obj
 << /Type /Font
 /Subtype /Type1
 /Name /F9
 /BaseFont /Courier
 /Encoding /WinAnsiEncoding >>
 endobj
-32 0 obj
+31 0 obj
 << /Type /Font
 /Subtype /Type1
 /Name /F2
 /BaseFont /Helvetica-Oblique
 /Encoding /WinAnsiEncoding >>
 endobj
-33 0 obj
+32 0 obj
 << /Type /Font
 /Subtype /Type1
 /Name /F7
@@ -191,8 +187,8 @@ endobj
 endobj
 1 0 obj
 << /Type /Pages
-/Count 3
-/Kids [6 0 R 19 0 R 21 0 R ] >>
+/Count 4
+/Kids [6 0 R 17 0 R 19 0 R 21 0 R ] >>
 endobj
 2 0 obj
 << /Type /Catalog
@@ -203,86 +199,79 @@ endobj
 endobj
 3 0 obj
 << 
-/Font << /F3 28 0 R /F5 29 0 R /F1 30 0 R /F9 31 0 R /F2 32 0 R /F7 33 0 R >> 
+/Font << /F3 27 0 R /F5 28 0 R /F1 29 0 R /F9 30 0 R /F2 31 0 R /F7 32 0 R >> 
 /ProcSet [ /PDF /ImageC /Text ] >> 
 endobj
 9 0 obj
 <<
 /S /GoTo
-/D [19 0 R /XYZ 85.0 659.0 null]
+/D [17 0 R /XYZ 85.0 659.0 null]
 >>
 endobj
 11 0 obj
 <<
 /S /GoTo
-/D [19 0 R /XYZ 85.0 580.266 null]
+/D [17 0 R /XYZ 85.0 580.266 null]
 >>
 endobj
 13 0 obj
 <<
 /S /GoTo
-/D [19 0 R /XYZ 85.0 453.932 null]
+/D [17 0 R /XYZ 85.0 453.932 null]
 >>
 endobj
 15 0 obj
 <<
 /S /GoTo
-/D [21 0 R /XYZ 85.0 520.2 null]
->>
-endobj
-17 0 obj
-<<
-/S /GoTo
-/D [21 0 R /XYZ 85.0 316.666 null]
+/D [19 0 R /XYZ 85.0 314.2 null]
 >>
 endobj
 22 0 obj
 <<
  /First 23 0 R
- /Last 27 0 R
+ /Last 26 0 R
 >> endobj
 xref
-0 34
+0 33
 0000000000 65535 f 
-0000008278 00000 n 
-0000008350 00000 n 
-0000008442 00000 n 
+0000009450 00000 n 
+0000009529 00000 n 
+0000009621 00000 n 
 0000000015 00000 n 
 0000000071 00000 n 
-0000000777 00000 n 
-0000000897 00000 n 
-0000000950 00000 n 
-0000008576 00000 n 
-0000001085 00000 n 
-0000008639 00000 n 
-0000001221 00000 n 
-0000008705 00000 n 
-0000001358 00000 n 
-0000008771 00000 n 
-0000001495 00000 n 
-0000008835 00000 n 
-0000001632 00000 n 
-0000004315 00000 n 
-0000004423 00000 n 
-0000006544 00000 n 
+0000000732 00000 n 
+0000000852 00000 n 
+0000000898 00000 n 
+0000009755 00000 n 
+0000001033 00000 n 
+0000009818 00000 n 
+0000001169 00000 n 
+0000009884 00000 n 
+0000001306 00000 n 
+0000009950 00000 n 
+0000001443 00000 n 
+0000003927 00000 n 
+0000004035 00000 n 
+0000007095 00000 n 
+0000007203 00000 n 
+0000007925 00000 n 
+0000010014 00000 n 
+0000008033 00000 n 
+0000008206 00000 n 
+0000008441 00000 n 
+0000008607 00000 n 
+0000008788 00000 n 
 0000008901 00000 n 
-0000006652 00000 n 
-0000006825 00000 n 
-0000007060 00000 n 
-0000007226 00000 n 
-0000007421 00000 n 
-0000007616 00000 n 
-0000007729 00000 n 
-0000007839 00000 n 
-0000007947 00000 n 
-0000008053 00000 n 
-0000008169 00000 n 
+0000009011 00000 n 
+0000009119 00000 n 
+0000009225 00000 n 
+0000009341 00000 n 
 trailer
 <<
-/Size 34
+/Size 33
 /Root 2 0 R
 /Info 4 0 R
 >>
 startxref
-8952
+10065
 %%EOF

Modified: lucene/dev/branches/docvalues/lucene/docs/fileformats.html
URL: http://svn.apache.org/viewvc/lucene/dev/branches/docvalues/lucene/docs/fileformats.html?rev=1072973&r1=1072972&r2=1072973&view=diff
==============================================================================
--- lucene/dev/branches/docvalues/lucene/docs/fileformats.html (original)
+++ lucene/dev/branches/docvalues/lucene/docs/fileformats.html Mon Feb 21 14:13:28 2011
@@ -129,11 +129,8 @@ document.write("Last Published: " + docu
 <div class="menuitem">
 <a href="api/core/index.html">Core</a>
 </div>
-<div class="menuitem">
-<a href="api/demo/index.html">Demo</a>
-</div>
-<div onclick="SwitchMenu('menu_1.1.3.4', 'skin/')" id="menu_1.1.3.4Title" class="menutitle">Contrib</div>
-<div id="menu_1.1.3.4" class="menuitemgroup">
+<div onclick="SwitchMenu('menu_1.1.3.3', 'skin/')" id="menu_1.1.3.3Title" class="menutitle">Contrib</div>
+<div id="menu_1.1.3.3" class="menuitemgroup">
 <div class="menuitem">
 <a href="api/contrib-ant/index.html">Ant</a>
 </div>
@@ -147,6 +144,9 @@ document.write("Last Published: " + docu
 <a href="api/contrib-benchmark/index.html">Benchmark</a>
 </div>
 <div class="menuitem">
+<a href="api/contrib-demo/index.html">Demo</a>
+</div>
+<div class="menuitem">
 <a href="api/contrib-highlighter/index.html">Highlighter</a>
 </div>
 <div class="menuitem">

Modified: lucene/dev/branches/docvalues/lucene/docs/gettingstarted.html
URL: http://svn.apache.org/viewvc/lucene/dev/branches/docvalues/lucene/docs/gettingstarted.html?rev=1072973&r1=1072972&r2=1072973&view=diff
==============================================================================
--- lucene/dev/branches/docvalues/lucene/docs/gettingstarted.html (original)
+++ lucene/dev/branches/docvalues/lucene/docs/gettingstarted.html Mon Feb 21 14:13:28 2011
@@ -129,11 +129,8 @@ document.write("Last Published: " + docu
 <div class="menuitem">
 <a href="api/core/index.html">Core</a>
 </div>
-<div class="menuitem">
-<a href="api/demo/index.html">Demo</a>
-</div>
-<div onclick="SwitchMenu('menu_1.1.3.4', 'skin/')" id="menu_1.1.3.4Title" class="menutitle">Contrib</div>
-<div id="menu_1.1.3.4" class="menuitemgroup">
+<div onclick="SwitchMenu('menu_1.1.3.3', 'skin/')" id="menu_1.1.3.3Title" class="menutitle">Contrib</div>
+<div id="menu_1.1.3.3" class="menuitemgroup">
 <div class="menuitem">
 <a href="api/contrib-ant/index.html">Ant</a>
 </div>
@@ -147,6 +144,9 @@ document.write("Last Published: " + docu
 <a href="api/contrib-benchmark/index.html">Benchmark</a>
 </div>
 <div class="menuitem">
+<a href="api/contrib-demo/index.html">Demo</a>
+</div>
+<div class="menuitem">
 <a href="api/contrib-highlighter/index.html">Highlighter</a>
 </div>
 <div class="menuitem">
@@ -251,7 +251,7 @@ document.write("Last Published: " + docu
 <div class="section">
 <p>
 This document is intended as a "getting started" guide.  It has three audiences: first-time users
-looking to install Apache Lucene in their application or web server; developers looking to modify or base
+looking to install Apache Lucene in their application; developers looking to modify or base
 the applications they develop on Lucene; and developers looking to become involved in and contribute
 to the development of Lucene.  This document is written in tutorial and walk-through format.  The
 goal is to help you "get started".  It does not go into great depth on some of the conceptual or
@@ -275,25 +275,6 @@ may wish to skip sections.
 	command-line Lucene demo.  This section is intended for developers.</li> 
 <p></p>
 
-	
-<li>
-<a href="demo3.html">About installing and configuring the demo template web
-	application</a>.  While this walk-through assumes Tomcat as your container of choice,
-	there is no reason you can't (provided you have the requisite knowledge) adapt the
-	instructions to your container.  This section is intended for those responsible for the
-	development or deployment of Lucene-based web applications.</li> 
-<p></p>
-
-	
-<li>
-<a href="demo4.html">About the sources used to construct the demo template web
-	application</a>.  Please note the template application is designed to highlight features of
-	Lucene and is <b>not</b> an example of best practices.  (One would hopefully use MVC
-	architecture such as provided by Jakarta Struts and taglibs, but showing you how to do that
-	would be WAY beyond the scope of this guide.)  This section is intended for developers and
-	those wishing to customize the demo template web application to their needs.  </li>
-
-
 </ul>
 </div>
 

Modified: lucene/dev/branches/docvalues/lucene/docs/gettingstarted.pdf
URL: http://svn.apache.org/viewvc/lucene/dev/branches/docvalues/lucene/docs/gettingstarted.pdf?rev=1072973&r1=1072972&r2=1072973&view=diff
==============================================================================
--- lucene/dev/branches/docvalues/lucene/docs/gettingstarted.pdf (original)
+++ lucene/dev/branches/docvalues/lucene/docs/gettingstarted.pdf Mon Feb 21 14:13:28 2011
@@ -36,10 +36,10 @@ endobj
 >>
 endobj
 10 0 obj
-<< /Length 987 /Filter [ /ASCII85Decode /FlateDecode ]
+<< /Length 977 /Filter [ /ASCII85Decode /FlateDecode ]
  >>
 stream
-Gat=*a_oie&A@B[Ln'W\),V0W[&9clJefrb1qp@\d*c#?,)\'Bg$mmc>&4Wg"[re$Q=`Ythj[Vi/+7rKrUtW-Ukui3h(rTCHZD>F#gig$Hh$tXnPZ"U,iYNr%sdo`@%=N682QF9pZ1/4]\A4/Y\q?nj8#M?X9JK2A2kJ[mIl@;[cGIdUGl]qoOb6J_&-;kPN(7$D'6S:^W>^3!1WZ4*_-dbO=!hHL(Q*X3@Hjq_19Bk?oNi1!+8gLB"B]u=hBCA9H(PnCBJ_9!BOot=r#NP<H1U,)5pe7R\H'-+SMGSV'WQc8e$<RBlaT'#0jbO[un6V$R<,o?e^*K7b>3;rIbA"qb!h(#H(FdY!lVrPN'JTA0nhH9:J3Vp]*bm;Bs]'>pV:8UdBDBg2MR"neUFPkk?JXY_Pj<H:B:</G@\;H-3*NdbUp.DN=;getN0Mr[`:A/oZ2l&D=3>*JO9E3r]_2B;gok0%;[f'1S1JXK;/rg>d"gnSo+NW]"%`>6FI53o1_4\n.ToQY]N6s%A=lZo#56hFOZt-nRkF90Gm\1fAP=*CTS+YXPAAU-p<&oMue6,iVoS;9e.=DCM8G!C*U8m/X>js,D'F'qcL\AM=[nr?/)d+Ku=-R<$k3S=c8kcH/Q7DLpj27,+S.Akfbe+1Q,t?%^-NN0%'2Qc,7WBj:D4.G``2K6ooHG)]*P#&!V_B&`oKXfQOO!&knQXb:h=#o^eDX3u5Uh[@UJh))RiPIM@+rXZ;#TQ-Wn(V-$3Co>XZ0o[HJPAb=\!g:nA:TgNW`7'gdb`:!l*R7A"3K@el7fdMMB@Xk]d$Qu^cBB%4lNS&p^"jt&OY]5!0d"H=:BTG_h9BZtZ:j96,$lThP1jUjO2/Me_Sm?7k0+o3*G?)(+\*UcbU.BLEKZ"+#Ac*e;=0BI(1gh]ERMDqB>E1G"hl'QdTG[bJGe$BcY?r"66ja-C?rNNr=g7kVW&`jG;i'IIXL7!o%bBKX$aQ~>
+GatU2>AqtE'RnB3Y^"kClGZ>b$Tp/N9d#OJjUHHR'0!1^`kch%p#"e7g)P;W'1.u<S....@jI7p>0&tC7f!.4+T[;mfP4\rf@!/9`n\H>@e0VCqs`(t>=k@s5AJ.Ao-F.B)f*'(E___acL*Q#o,r%"gQMud<]r:qE8:4jgdi-td4$(SsKV30;Y9LjMmh*Hmt*fD15#K_H"PUoknqse.?FZp[.^X7Lp)ma/aGj]/#Q=K7$@,!O)-=`":J^&&#fPZWamJ[)45WS6~>
 endstream
 endobj
 11 0 obj
@@ -122,24 +122,24 @@ endobj
 xref
 0 19
 0000000000 65535 f 
-0000002768 00000 n 
-0000002833 00000 n 
-0000002925 00000 n 
+0000002758 00000 n 
+0000002823 00000 n 
+0000002915 00000 n 
 0000000015 00000 n 
 0000000071 00000 n 
 0000000579 00000 n 
 0000000699 00000 n 
 0000000724 00000 n 
-0000003048 00000 n 
+0000003038 00000 n 
 0000000859 00000 n 
-0000001938 00000 n 
-0000003111 00000 n 
-0000002046 00000 n 
-0000002212 00000 n 
-0000002325 00000 n 
-0000002435 00000 n 
-0000002543 00000 n 
-0000002659 00000 n 
+0000001928 00000 n 
+0000003101 00000 n 
+0000002036 00000 n 
+0000002202 00000 n 
+0000002315 00000 n 
+0000002425 00000 n 
+0000002533 00000 n 
+0000002649 00000 n 
 trailer
 <<
 /Size 19
@@ -147,5 +147,5 @@ trailer
 /Info 4 0 R
 >>
 startxref
-3162
+3152
 %%EOF

Modified: lucene/dev/branches/docvalues/lucene/docs/index.html
URL: http://svn.apache.org/viewvc/lucene/dev/branches/docvalues/lucene/docs/index.html?rev=1072973&r1=1072972&r2=1072973&view=diff
==============================================================================
--- lucene/dev/branches/docvalues/lucene/docs/index.html (original)
+++ lucene/dev/branches/docvalues/lucene/docs/index.html Mon Feb 21 14:13:28 2011
@@ -127,11 +127,8 @@ document.write("Last Published: " + docu
 <div class="menuitem">
 <a href="api/core/index.html">Core</a>
 </div>
-<div class="menuitem">
-<a href="api/demo/index.html">Demo</a>
-</div>
-<div onclick="SwitchMenu('menu_1.1.3.4', 'skin/')" id="menu_1.1.3.4Title" class="menutitle">Contrib</div>
-<div id="menu_1.1.3.4" class="menuitemgroup">
+<div onclick="SwitchMenu('menu_1.1.3.3', 'skin/')" id="menu_1.1.3.3Title" class="menutitle">Contrib</div>
+<div id="menu_1.1.3.3" class="menuitemgroup">
 <div class="menuitem">
 <a href="api/contrib-ant/index.html">Ant</a>
 </div>
@@ -145,6 +142,9 @@ document.write("Last Published: " + docu
 <a href="api/contrib-benchmark/index.html">Benchmark</a>
 </div>
 <div class="menuitem">
+<a href="api/contrib-demo/index.html">Demo</a>
+</div>
+<div class="menuitem">
 <a href="api/contrib-highlighter/index.html">Highlighter</a>
 </div>
 <div class="menuitem">

Modified: lucene/dev/branches/docvalues/lucene/docs/linkmap.html
URL: http://svn.apache.org/viewvc/lucene/dev/branches/docvalues/lucene/docs/linkmap.html?rev=1072973&r1=1072972&r2=1072973&view=diff
==============================================================================
--- lucene/dev/branches/docvalues/lucene/docs/linkmap.html (original)
+++ lucene/dev/branches/docvalues/lucene/docs/linkmap.html Mon Feb 21 14:13:28 2011
@@ -127,11 +127,8 @@ document.write("Last Published: " + docu
 <div class="menuitem">
 <a href="api/core/index.html">Core</a>
 </div>
-<div class="menuitem">
-<a href="api/demo/index.html">Demo</a>
-</div>
-<div onclick="SwitchMenu('menu_1.1.3.4', 'skin/')" id="menu_1.1.3.4Title" class="menutitle">Contrib</div>
-<div id="menu_1.1.3.4" class="menuitemgroup">
+<div onclick="SwitchMenu('menu_1.1.3.3', 'skin/')" id="menu_1.1.3.3Title" class="menutitle">Contrib</div>
+<div id="menu_1.1.3.3" class="menuitemgroup">
 <div class="menuitem">
 <a href="api/contrib-ant/index.html">Ant</a>
 </div>
@@ -145,6 +142,9 @@ document.write("Last Published: " + docu
 <a href="api/contrib-benchmark/index.html">Benchmark</a>
 </div>
 <div class="menuitem">
+<a href="api/contrib-demo/index.html">Demo</a>
+</div>
+<div class="menuitem">
 <a href="api/contrib-highlighter/index.html">Highlighter</a>
 </div>
 <div class="menuitem">
@@ -298,12 +298,6 @@ document.write("Last Published: " + docu
 		 
 <ul>
 <li>
-<a href="api/demo/index.html">Demo</a>&nbsp;&nbsp;___________________&nbsp;&nbsp;<em>javadoc-demo</em>
-</li>
-</ul>
-		 
-<ul>
-<li>
 <a>Contrib</a>&nbsp;&nbsp;___________________&nbsp;&nbsp;<em>javadoc-contrib</em>
 </li>
 <ul>
@@ -331,6 +325,12 @@ document.write("Last Published: " + docu
 <a href="api/contrib-benchmark/index.html">Benchmark</a>&nbsp;&nbsp;___________________&nbsp;&nbsp;<em>javadoc-contrib-benchmark</em>
 </li>
 </ul>
+        
+<ul>
+<li>
+<a href="api/contrib-demo/index.html">Demo</a>&nbsp;&nbsp;___________________&nbsp;&nbsp;<em>javadoc-contrib-demo</em>
+</li>
+</ul>
 		    
 <ul>
 <li>

Modified: lucene/dev/branches/docvalues/lucene/docs/linkmap.pdf
URL: http://svn.apache.org/viewvc/lucene/dev/branches/docvalues/lucene/docs/linkmap.pdf?rev=1072973&r1=1072972&r2=1072973&view=diff
==============================================================================
--- lucene/dev/branches/docvalues/lucene/docs/linkmap.pdf (original)
+++ lucene/dev/branches/docvalues/lucene/docs/linkmap.pdf Mon Feb 21 14:13:28 2011
@@ -5,10 +5,10 @@
 /Producer (FOP 0.20.5) >>
 endobj
 5 0 obj
-<< /Length 1073 /Filter [ /ASCII85Decode /FlateDecode ]
+<< /Length 1080 /Filter [ /ASCII85Decode /FlateDecode ]
  >>
 stream
-Gau1.;,a5D'SYHA.sTR!As8;ZGdP'-Y+r>hfXH!9-UMQF$5I6FrqfE?Q@p/rii\<,^...@Y>@_e/GBW[#.;<nQZbIk;*6TNePD.3eEVlj/<!b`p.^lb1-CV8s&o4D)r(C?hP7FR.>o>99[6Jof_#)?<2i/*`T)$778ZAbEB'IC[pZfbn,;=I_3!_oQ<?CBfbRW9ggZ8!VK!9%KWG5.D3X\Ftuu:\J0gllc;F5&?7VKLf+d=l:!n06#1p
 UXEUMpT))Lb*`LRL0SE-cd$IpcI^\CD5/&N_od_]'4.!o5:R^,NBReSQ3kI]<?"mdlVnEfOkbnCrAU+-R~>
+Gatn&>uTc+(kqGU.rqU*AUshQ0!2:_lfd[rp28^>_3EYe5&-83l+^RrdKWT(%]X"JA9uN'Gn5JZI.H[QpFlWpRkH-crJN&MH^l2hb$X3uWfI_tHkq&"bklI%Qdk$ES)PQTG>><)r&Ng'^15G1;XJq<m'"`n]G>cuSU,e!q3?'!*l>%c@7PqM0M#BZq'rA."BBY@oP<;jFp)ZW[;<&4Q090,Of_PZCHY[l[s5X6S8-<KWln+ADb:$?m)[%=,7oPLq`VskS\ZMKVM-c2aF:MJRon_YM8I:-hso#YO<"X:(',L3;mIF=*<J##5nLiY^n)b"%fW2Y2jo&2]M=@>(!S*iLa$XR/W0>:@R*V0:b4g_BYV!Mga;%2R>Uk.K]sPs6$/%o@Lu_ac<!,X'UAQ;"i/0PBbBekm9GdR-kcB)IYM)rl!.OYUCEH]ha'us7X0lNOhNN1aRZo9*h;3M)T)Vm>4cd)p;dmnKN_l)`OEK3=P$%m_hh*GVcIkdhGd#t>\@d9?N.7QHtLNF9N/*9a1*7u-f?L):"S9TIAkTl0R+rI?W(Tm71V=XC"QL*>PU=f-K-MZS_52F'H`E2\PaNEPI5/K_//'oF6_.D=[RYZpTXG.m.o"s#K\oQEiqNV+CL.q%W<IJ(1WS,bEe0VaQ$:?b@bHahcJ!XiGlfhRuF$"#[-2.+gStQ'"76`6[sp&BFMld")JFjO5t;Gb.h,ET:/M8T8(T%FJ\knn]Itf/OD\nWg5A5GV']'!EL-h_e07F(e/#RlI/'NpSDT`?3K*>l39W*Zum3q7)U"C)d,Ylc9:r">H,3O&2NQ&7OV,%X_G@<W`Z&GcUG*YhFirBHUpi*,?X1eNZ'TeXDTtk9\fBH"K@`tkqHXqfisDDb+4DA9aYsnT@JD^Z9%(<TL+np,$G"RQ95ha`MZdF6hIMNmFF>Gp\EmH3FOke73pL*J9n"WLB(8V']*kN4.3(3\J0gl4.1j`+B1Fi,>(8?W#,8
 [#-I]HZ/1a\H0UIGpR%\hKct!\8U[G+e'HT-f%YDfZ@:o3eoOu1njRU("PVIrc"GXA]IU*9jKQ+&!W&Mi#OPXn^]~>
 endstream
 endobj
 6 0 obj
@@ -87,19 +87,19 @@ endobj
 xref
 0 14
 0000000000 65535 f 
-0000002982 00000 n 
-0000003046 00000 n 
-0000003096 00000 n 
+0000002989 00000 n 
+0000003053 00000 n 
+0000003103 00000 n 
 0000000015 00000 n 
 0000000071 00000 n 
-0000001236 00000 n 
-0000001342 00000 n 
-0000002319 00000 n 
-0000002425 00000 n 
-0000002537 00000 n 
-0000002647 00000 n 
-0000002758 00000 n 
-0000002866 00000 n 
+0000001243 00000 n 
+0000001349 00000 n 
+0000002326 00000 n 
+0000002432 00000 n 
+0000002544 00000 n 
+0000002654 00000 n 
+0000002765 00000 n 
+0000002873 00000 n 
 trailer
 <<
 /Size 14
@@ -107,5 +107,5 @@ trailer
 /Info 4 0 R
 >>
 startxref
-3218
+3225
 %%EOF

Modified: lucene/dev/branches/docvalues/lucene/docs/lucene-contrib/index.html
URL: http://svn.apache.org/viewvc/lucene/dev/branches/docvalues/lucene/docs/lucene-contrib/index.html?rev=1072973&r1=1072972&r2=1072973&view=diff
==============================================================================
--- lucene/dev/branches/docvalues/lucene/docs/lucene-contrib/index.html (original)
+++ lucene/dev/branches/docvalues/lucene/docs/lucene-contrib/index.html Mon Feb 21 14:13:28 2011
@@ -129,11 +129,8 @@ document.write("Last Published: " + docu
 <div class="menuitem">
 <a href="../api/core/index.html">Core</a>
 </div>
-<div class="menuitem">
-<a href="../api/demo/index.html">Demo</a>
-</div>
-<div onclick="SwitchMenu('menu_1.1.3.4', '../skin/')" id="menu_1.1.3.4Title" class="menutitle">Contrib</div>
-<div id="menu_1.1.3.4" class="menuitemgroup">
+<div onclick="SwitchMenu('menu_1.1.3.3', '../skin/')" id="menu_1.1.3.3Title" class="menutitle">Contrib</div>
+<div id="menu_1.1.3.3" class="menuitemgroup">
 <div class="menuitem">
 <a href="../api/contrib-ant/index.html">Ant</a>
 </div>
@@ -147,6 +144,9 @@ document.write("Last Published: " + docu
 <a href="../api/contrib-benchmark/index.html">Benchmark</a>
 </div>
 <div class="menuitem">
+<a href="../api/contrib-demo/index.html">Demo</a>
+</div>
+<div class="menuitem">
 <a href="../api/contrib-highlighter/index.html">Highlighter</a>
 </div>
 <div class="menuitem">
@@ -252,6 +252,9 @@ document.write("Last Published: " + docu
 <a href="#benchmark">benchmark</a>
 </li>
 <li>
+<a href="#demo">demo</a>
+</li>
+<li>
 <a href="#db">db</a>
 </li>
 <li>
@@ -354,72 +357,78 @@ document.write("Last Published: " + docu
 <p>The benchmark contribution contains tools for benchmarking Lucene using standard, freely available corpora.</p>
 <p>See <a href="../api/contrib-benchmark/index.html">benchmark javadoc</a>
 </p>
-<a name="N10053"></a><a name="db"></a>
+<a name="N10053"></a><a name="demo"></a>
+<h3 class="boxed">demo</h3>
+<p>The demo contrib contains the Lucene demo: IndexFiles and SearchFiles, described under
+                   <a href="../gettingstarted.html">Getting Started</a>.</p>
+<p>See <a href="../api/contrib-demo/index.html">demo javadoc</a>
+</p>
+<a name="N10066"></a><a name="db"></a>
 <h3 class="boxed">db</h3>
 <p>Provides integration with Berkley DB.</p>
 <p>See <a href="../api/contrib-db/index.html">db javadoc</a>
 </p>
-<a name="N10062"></a><a name="highlighter"></a>
+<a name="N10075"></a><a name="highlighter"></a>
 <h3 class="boxed">highlighter</h3>
 <p>A set of classes for highlighting matching terms in search results.</p>
 <p>See <a href="../api/contrib-highlighter/index.html">highlighter javadoc</a>
 </p>
-<a name="N10071"></a><a name="instantiated"></a>
+<a name="N10084"></a><a name="instantiated"></a>
 <h3 class="boxed">instantiated</h3>
 <p>RAM-based index that enables much faster searching than RAMDirectory in certain situations.</p>
 <p>See <a href="../api/contrib-instantiated/index.html">instantiated javadoc</a>
 </p>
-<a name="N10080"></a><a name="lucli"></a>
+<a name="N10093"></a><a name="lucli"></a>
 <h3 class="boxed">lucli</h3>
 <p>An application that allows Lucene index manipulation from the command-line.</p>
 <p>See <a href="../api/contrib-lucli/index.html">lucli javadoc</a>
 </p>
-<a name="N1008F"></a><a name="memory"></a>
+<a name="N100A2"></a><a name="memory"></a>
 <h3 class="boxed">memory</h3>
 <p>High-performance single-document main memory index.</p>
 <p>See <a href="../api/contrib-memory/index.html">memory javadoc</a>
 </p>
-<a name="N1009E"></a><a name="misc"></a>
+<a name="N100B1"></a><a name="misc"></a>
 <h3 class="boxed">misc</h3>
 <p>A variety of miscellaneous files, including QueryParsers, and other alternate Lucene class implementations and tools.</p>
 <p>See <a href="../api/contrib-misc/index.html">misc javadoc</a>
 </p>
-<a name="N100AD"></a><a name="queryparser"></a>
+<a name="N100C0"></a><a name="queryparser"></a>
 <h3 class="boxed">queryparser</h3>
 <p>A new Lucene query parser implementation, which matches the syntax of the core QueryParser but offers a more modular architecture to enable customization.</p>
 <p>See <a href="../api/contrib-queryparser/index.html">queryparser javadoc</a>
 </p>
-<a name="N100BC"></a><a name="queries"></a>
+<a name="N100CF"></a><a name="queries"></a>
 <h3 class="boxed">queries</h3>
 <p>Additional queries for Lucene.</p>
 <p>See <a href="../api/contrib-queries/index.html">queries javadoc</a>
 </p>
-<a name="N100CB"></a><a name="remote"></a>
+<a name="N100DE"></a><a name="remote"></a>
 <h3 class="boxed">remote</h3>
 <p>Classes to help use Lucene with RMI.</p>
 <p>See <a href="../api/contrib-remote/index.html">remote javadoc</a>
 </p>
-<a name="N100DA"></a><a name="spatial"></a>
+<a name="N100ED"></a><a name="spatial"></a>
 <h3 class="boxed">spatial</h3>
 <p>Classes to help with efficient distance based sorting.</p>
 <p>See <a href="../api/contrib-spatial/index.html">spatial javadoc</a>
 </p>
-<a name="N100E9"></a><a name="spellchecker"></a>
+<a name="N100FC"></a><a name="spellchecker"></a>
 <h3 class="boxed">spellchecker</h3>
 <p>Provides tools for spellchecking and suggestions with Lucene.</p>
 <p>See <a href="../api/contrib-spellchecker/index.html">spellchecker javadoc</a>
 </p>
-<a name="N100F8"></a><a name="swing"></a>
+<a name="N1010B"></a><a name="swing"></a>
 <h3 class="boxed">swing</h3>
 <p>Swing components designed to integrate with Lucene.</p>
 <p>See <a href="../api/contrib-swing/index.html">swing javadoc</a>
 </p>
-<a name="N10107"></a><a name="wordnet"></a>
+<a name="N1011A"></a><a name="wordnet"></a>
 <h3 class="boxed">wordnet</h3>
 <p>Tools to help utilize wordnet synonyms with Lucene</p>
 <p>See <a href="../api/contrib-wordnet/index.html">wordnet javadoc</a>
 </p>
-<a name="N10116"></a><a name="xml-query-parser"></a>
+<a name="N10129"></a><a name="xml-query-parser"></a>
 <h3 class="boxed">xml-query-parser</h3>
 <p>A QueryParser that can read queries written in an XML format.</p>
 <p>See <a href="../api/contrib-wordnet/index.html">xml-query-parser javadoc</a>

Modified: lucene/dev/branches/docvalues/lucene/docs/lucene-contrib/index.pdf
URL: http://svn.apache.org/viewvc/lucene/dev/branches/docvalues/lucene/docs/lucene-contrib/index.pdf?rev=1072973&r1=1072972&r2=1072973&view=diff
==============================================================================
--- lucene/dev/branches/docvalues/lucene/docs/lucene-contrib/index.pdf (original)
+++ lucene/dev/branches/docvalues/lucene/docs/lucene-contrib/index.pdf Mon Feb 21 14:13:28 2011
@@ -5,10 +5,10 @@
 /Producer (FOP 0.20.5) >>
 endobj
 5 0 obj
-<< /Length 883 /Filter [ /ASCII85Decode /FlateDecode ]
+<< /Length 908 /Filter [ /ASCII85Decode /FlateDecode ]
  >>
 stream
-Gb!$G966RV&:j6I$6>[i<BUnSA!:U:SR+A=f(OX!*&GFh!3YX;hj'_)[6"P>W?RDD(>>&K[+a&&pK@"E;%aI=7^>b(bYJg)ne?&[i58-$Sjaft1.k*G,Ms:ZpNa$oG@W/^"POVu%Y_&_IJN?/LSjLoEcjm$P3au`*#&<4o#5Pt<g:ek4C"2U.bfY49oEWDrYNqPY5<,#:D(l)qr:A;%MbmMI.!&*BlPG9eZlJ+3"J"\fGa_g`Onf0V(!QjLf&7Mk=S>rhU(L8]T?)uaQI^7&+jdXT!1$G/8hU=)n<jD2j.P4]%HHAp=Uh,0f2Pd",CSYP6"c\!b;&6`s$lsN1lNHJK$pK1iS6!gdllu5&DhFp:BoX!JX_e:+`B3,Ndu'<R]/_^9"pf*4sFA^%T+Q6[iV_Z^=+2!a.A)N9%$,;3gT\M&T[:IVZcp=l<n9*l-fME$W3I];@`:-O8dI#\>fJR6mSuR3kDo]<Ws"o+'8/H*p=T'ZncpCb5U,d-YP>\"2,AAiFEYhp<!:Ko9H2N?T_S)(?E`;KpuW%F?O@_N]=XL@c*iAE,,,KglD$3-;@]"1%tE_]4k/36_k7V2Jc04<:cP8>4f$Y[(8cU#/32HtkXs\2_LKF#$CJ'Y:u\.QD)Vci.2'Qs%H#JHb,!/qWW`ABY$`L$i'o:]?>irAbeoGm6)NPUM?IB4D\q.3+h#?#/?<XBXL`5X(#kfQ]/`OcdNL?+%&oe^DoqAMR&,2K7Yh5@qZh^%nm6&=g]rL<RN+qVg6FBf4QH?\<]H@j6YQ@5JR9W6g5)=,Nl;+t7?UYJ^srrm[BHL:[cf+V],X_-#c5)89Ce^2<\sD#.YuU*l#HTjC*>ChejWWle?.fH$u-R.am59ca'PBc*"E~>
+Gb!$G9lldX&;KZO$6>[i<IGtja!T7T3k]XXXmH.!3G*lZ!F.S`^+5>]3h6>d<5IV"ATf@@XnU@<[qY?j?4miJ7abSXlpi*NndocWi5J8sJ(#R9;TC%GORK62a"6,;)mU5V%/3e0::[?#Hi<D;GBMFn`TDpQ,jAqY3?nB4jGVtrUaVS@+"kerV<^J$>H<'/Ia=]L;g%KST-Be2p;`T**@ah%W:,dWC[oEu\RXrfTHA1sE%Uqd0Dd.PQ1bR,8kbu63EK*VnVU'hiJ")m_EP"]J"V:4o9f4/Mn$<lCu?*#grOqSWdK<;RRa"B2UF!X%NHga`WNH8"ig7?F/[tbUp#bu#eH`8k\qR]fl'#cn_;6-/+Lb6kIEGh"c]O-DIgL8*qgnm44AGF!6Znu-!S/)$D_3YSf-2t<SN(n'j51XSs)4r4gS8/CffbM3LXSMp>m_VMg+_.\$:ZXF5V?V3)`Amid#KRIfM?AT"U<iZVHga[#?4TA]ZJX[QbICm[\Qp^+-00bgEA"S5"%EQ5_hHSP8X&baR+\PWA-.g0W/N@ONm,75eG73F_&WM$qdY%lQ[#;%F+E%d0OZX;lqQ:Y0(d)EBX9d%,FmbQ;0Y!kj+%2E.Ccn`c4\0dDJIR)*fCHA?s7m`!ZWlH2uEpiK5BWNeg;1h@!*bP]ap7b]W?kR(^r.?T3V(Lmpl3OItDHLN"eQd>McHkoOT+q^<I`Z-gU37lE`1;<LKf;>m)H4ig%F>;p>Oi-WT\TY%(g=((R.o4h'3$)cuV88?WmW%DBS4,8d>07k.5e%MB%+tekK3N[r,_gSQ1_rrecm]Q.MC)Mh"=fTOik,'^gt6J`Gl7/#-pG'B@sVsfpdjZ:&_"48f:B5PrGl8;W\#W0>uBZ`Q=Iglh4h?/C&_bQF@?-2@FDsn~>
 endstream
 endobj
 6 0 obj
@@ -39,6 +39,7 @@ endobj
 36 0 R
 38 0 R
 40 0 R
+42 0 R
 ]
 endobj
 8 0 obj
@@ -74,7 +75,7 @@ endobj
 14 0 obj
 << /Type /Annot
 /Subtype /Link
-/Rect [ 108.0 505.066 135.5 493.066 ]
+/Rect [ 108.0 505.066 150.164 493.066 ]
 /C [ 0 0 0 ]
 /Border [ 0 0 0 ]
 /A 15 0 R
@@ -84,7 +85,7 @@ endobj
 16 0 obj
 << /Type /Annot
 /Subtype /Link
-/Rect [ 108.0 486.866 176.168 474.866 ]
+/Rect [ 108.0 486.866 135.5 474.866 ]
 /C [ 0 0 0 ]
 /Border [ 0 0 0 ]
 /A 17 0 R
@@ -94,7 +95,7 @@ endobj
 18 0 obj
 << /Type /Annot
 /Subtype /Link
-/Rect [ 108.0 468.666 178.832 456.666 ]
+/Rect [ 108.0 468.666 176.168 456.666 ]
 /C [ 0 0 0 ]
 /Border [ 0 0 0 ]
 /A 19 0 R
@@ -104,7 +105,7 @@ endobj
 20 0 obj
 << /Type /Annot
 /Subtype /Link
-/Rect [ 108.0 450.466 144.836 438.466 ]
+/Rect [ 108.0 450.466 178.832 438.466 ]
 /C [ 0 0 0 ]
 /Border [ 0 0 0 ]
 /A 21 0 R
@@ -114,7 +115,7 @@ endobj
 22 0 obj
 << /Type /Annot
 /Subtype /Link
-/Rect [ 108.0 432.266 163.496 420.266 ]
+/Rect [ 108.0 432.266 144.836 420.266 ]
 /C [ 0 0 0 ]
 /Border [ 0 0 0 ]
 /A 23 0 R
@@ -124,7 +125,7 @@ endobj
 24 0 obj
 << /Type /Annot
 /Subtype /Link
-/Rect [ 108.0 414.066 146.168 402.066 ]
+/Rect [ 108.0 414.066 163.496 402.066 ]
 /C [ 0 0 0 ]
 /Border [ 0 0 0 ]
 /A 25 0 R
@@ -134,7 +135,7 @@ endobj
 26 0 obj
 << /Type /Annot
 /Subtype /Link
-/Rect [ 108.0 395.866 180.14 383.866 ]
+/Rect [ 108.0 395.866 146.168 383.866 ]
 /C [ 0 0 0 ]
 /Border [ 0 0 0 ]
 /A 27 0 R
@@ -144,7 +145,7 @@ endobj
 28 0 obj
 << /Type /Annot
 /Subtype /Link
-/Rect [ 108.0 377.666 163.156 365.666 ]
+/Rect [ 108.0 377.666 185.14 365.666 ]
 /C [ 0 0 0 ]
 /Border [ 0 0 0 ]
 /A 29 0 R
@@ -154,7 +155,7 @@ endobj
 30 0 obj
 << /Type /Annot
 /Subtype /Link
-/Rect [ 108.0 359.466 161.824 347.466 ]
+/Rect [ 108.0 359.466 163.156 347.466 ]
 /C [ 0 0 0 ]
 /Border [ 0 0 0 ]
 /A 31 0 R
@@ -164,7 +165,7 @@ endobj
 32 0 obj
 << /Type /Annot
 /Subtype /Link
-/Rect [ 108.0 341.266 159.832 329.266 ]
+/Rect [ 108.0 341.266 161.824 329.266 ]
 /C [ 0 0 0 ]
 /Border [ 0 0 0 ]
 /A 33 0 R
@@ -174,7 +175,7 @@ endobj
 34 0 obj
 << /Type /Annot
 /Subtype /Link
-/Rect [ 108.0 323.066 188.476 311.066 ]
+/Rect [ 108.0 323.066 159.832 311.066 ]
 /C [ 0 0 0 ]
 /Border [ 0 0 0 ]
 /A 35 0 R
@@ -184,7 +185,7 @@ endobj
 36 0 obj
 << /Type /Annot
 /Subtype /Link
-/Rect [ 108.0 304.866 157.168 292.866 ]
+/Rect [ 108.0 304.866 188.476 292.866 ]
 /C [ 0 0 0 ]
 /Border [ 0 0 0 ]
 /A 37 0 R
@@ -194,7 +195,7 @@ endobj
 38 0 obj
 << /Type /Annot
 /Subtype /Link
-/Rect [ 108.0 286.666 167.824 274.666 ]
+/Rect [ 108.0 286.666 157.168 274.666 ]
 /C [ 0 0 0 ]
 /Border [ 0 0 0 ]
 /A 39 0 R
@@ -204,7 +205,7 @@ endobj
 40 0 obj
 << /Type /Annot
 /Subtype /Link
-/Rect [ 108.0 268.466 211.804 256.466 ]
+/Rect [ 108.0 268.466 167.824 256.466 ]
 /C [ 0 0 0 ]
 /Border [ 0 0 0 ]
 /A 41 0 R
@@ -212,214 +213,247 @@ endobj
 >>
 endobj
 42 0 obj
-<< /Length 1840 /Filter [ /ASCII85Decode /FlateDecode ]
+<< /Type /Annot
+/Subtype /Link
+/Rect [ 108.0 250.266 211.804 238.266 ]
+/C [ 0 0 0 ]
+/Border [ 0 0 0 ]
+/A 43 0 R
+/H /I
+>>
+endobj
+44 0 obj
+<< /Length 1886 /Filter [ /ASCII85Decode /FlateDecode ]
  >>
 stream
-Gatm<gMZ%0&:O:S#lBhd#q]'Lm8K0BdOs7mG2j>dRQf(2D/1_]/k*h&hfiVeL:60]korB/as-"lk0+7;-_oG<khhLs_C2c3X8I&g/O)B[$8"oqXl1A:h-6Yq-FW#_0)Tq,o(sa+#^'BF$#;TuI<7UiNUHq,Q7kpD,MSZJhurhM<jgJ#i-!qGXK91_-onahg$Y66?T5727CU!n\Q7teh"o'[I'0iR]>O&P*?:E!^>EV_7NnI3A>nHiPZ;Ic.POKMT[I5R&AouFk"iWoXd/f:@bj3*=WtCW%/TNO0@91Df<&#q@a/D&nHOW8#ENLRWE)>s0AWsG0"3hRJ]-g$Pb#-SC[I4fg=gt;%m3Xbo(hhR![#=BN@>J_f)gf#9"dL%,kan)<hIB0$+sHD;QYYi:<\oN.>`9^)5pNKHt]o(H,QkfhC`>Y+Ji;CFM?+(,$%9l!eM&#0qa5,*/e2Dp7I9a=;u(rJ-Ig'e@ti%MaL+Rg0tJK%gQ9\DZ51Wmq=$V>Lkq=0C+$G2N+!I1:^-N3Vr\c/MO\H]ghf@nS=mbg60cNnZdO_Hq4)*g[chu]kZ"@@p]'3+WjNONbUpK#_-l[b)Kh"WfZi(>j3'kbFN-$3gFtV?Id7+J4i\cbit;b#)bg18<#_oWbiq&KbKTh.<b[O5gW7th'=RUjU`[k&G(>&eg@[T;oLPc1?XHWe0`f39(\VB]"]Zsp*>.:/r@;u/`OT7Qs>P@d`C#sf;4'*#/BF=ORB[9?k_!Oc8LC82`P<'@pTZQkt<9\lk8QD@[M"E8tZpM69G?A5q$b:N'3A9f.r,j$QQd9lOn$ua]s^<(#Z4GfYD:oq;@ct7^*W;@-&"=R#>&\"],9'_,I/l$;,bMp-j"Q74=_HRuA;_HdC1UJKiqN_dg_&RVT0(c96pYCp:>ibLS-;@*;PJR.9/sSYfP)nlo6I<b<<ncO/('NuPL;][2!'EBN*TbEQsbqEbamk2U9Uk2gg6DLC9=EJ&s
 0Sg21p;Z]nGa&'B%clKZWf-^D=1>[RW'XS)iQ14Kc[o]2N]-[:k=Yrc-UL7QV!:Lqj?0f25\]7aj=q4(+TJe<^[_L&CX_]1M0b>_(,g\kdQXV)N$\oP3[b4NInf*eMMM9hr#Sk!#2RoL>?LWas/&"E@GlD`@cFob7KO&RVY]:<6S"Hmugtt:(^a!1THk3Y^;3ElcliH]+O[5i00-ZDu[-@OUgn7S*Sk7qoM"kt8)Ck[UM!7O5AW^`,OCNPhlT:]eVK,Bp`D_f-B6Vpo(UKQa`__c:3sD&XFZVN/GjP@#_m0AsWne,aj^d^<qr>!2e%I`b+]/e/UG<mVH*.AW@u'p!VG92i1ZH,[.X#W9#?q#nap8S4:kUO%`_&Le)K&;JBS;sG5Pc8A.k^4A5KCXa6BT@a#KDDl'F]+ZNsC:l!P6f.*Xp"t$4Z6/`RSu_.a3$kf7Lg0M#Wd60ZPNiGC/a-OMnk9`-c=V95#c\@Xq,*@uXW.5H`A9ih)oKaV1=ee,kn`A6G@JiXYI:)Nu;RBu['=d5\/6<4j#''W1`"fkXum`uRAc3>D>4kT,LRrNaOQ%<*9iS7MDHMg>D\J8T.B$kW.KaACJ70ZI)/^+/p]UPhtg[$W@]@`7WnYD$.l!qGZUlYb-[<X=))KY$)s0^u1E9W'GAq-uq+jTtr)&blcEW-rd`g'^&fJE;JoAZ$Q1^oP.Y'?EgccE)!qh,i&-opjC6U/K`LbHH'?eB2:B9PRYS"W4HDL</d(PBnM`4=bNi@+pPWl^-ErddFbef-LN+F=UtXI^c=U\QU+gmFDegVRQ4t<^"!W)b@1gAcutOVNtuE?"2?"!DUq)85LK,%q]]VmJ~>
+Gatm<gM...@9>aJhk:ZbPSWrR'j`Wfb=cNiVi1kMjF"Y5q\^g+fECS1f8KBGeM23e$Em#0p+Mbka[Mi@C&pR\?5!_$>o_dg`%_i<:rk5dquB=,)hbLS]K@*;QEqsiYmSYoWEkI7`tXS[!b37D>=+#dqUH"kLbC-(1JX-@RBqGIm(*iI[dc-($uh=OX@`\eP
 2E/kJS:C0]d+(O]T89a,MY>+dZA@r#8-tr@g<5R...@J>"0U.._)U%Q%0g-B1)sFn&dS5FU'nXJfHX)A0)#.,3@A6LrF5<uaPfEpbm_F%NV<t&$f3T<(Y:M=k/%t>#"C<*=RfJ4/(`,m`l+WT-W5h5:7A[H#QG:rj?7X>fAl?6m!C53B@,UG?>cCdkf!@[Z%&V9?[!C>1HL9!.a'KUC4kd"Xg\/6ZNM($;S@)SYbD"X#'4gds<^QS+a[$&HX!Xo_d9X94CB4n!;\qF_h1+73I:E~>
 endstream
 endobj
-43 0 obj
+45 0 obj
 << /Type /Page
 /Parent 1 0 R
 /MediaBox [ 0 0 612 792 ]
 /Resources 3 0 R
-/Contents 42 0 R
+/Contents 44 0 R
 >>
 endobj
-44 0 obj
-<< /Length 1340 /Filter [ /ASCII85Decode /FlateDecode ]
+46 0 obj
+<< /Length 1328 /Filter [ /ASCII85Decode /FlateDecode ]
  >>
 stream
-Gau0Cfrj'f&:O:SkV3*QQE-=l,]-En/WdqiD'*GZ[T.!\.-]UDIXO_LBb#P;jLV9uGTk>j*6pQ#*5110Ibq0?Y#odrpP2a<$'...@OsE-H1VZ23>b?t/+qC<k;8cX/gsW8I8pt:9%b$.ge6rbFSg?lt\Ef^CJ=PpgrdT(ooGL6s+"h-@^sI(b@W%&]?Y5#nO[@l-S9^D5+gPa)nUn9(ktlp"I67KaAZ9Ioo_;H>TMkf?H-+6Y(DPn*]s1?T[;CoB.j;fl-V-L\1E7ll%E3?JaiFBgNdmWM_VFC5l;X3<=&[XUnD6#s3FC0Z/4en]$cOq8F$D*n$!HH%ICYTPJ>Mf\V@8=GlbLGQA7AD7S3n6cns_K?ZZ-mJdo:0*QT6&Upn:&ud8E4NP0W*
 m^^\-4p>LHDW93I\D"):Je5p5=RQ1h]/0iR`%>ibBDYp)`h1O(:dLadQK-0L=<l1jYg6`BHPTDLDRd86)613L1WJZ2F!6kk<,q7d_Hm%?4%/84*;^k+qhl^H9Th8nEl'TjK+W%"]'JYf98=j+i/GR"%Gm'M+3D9DWj/sr)F?YO+8P#/c*38fh[Jo$7G>6oH@N36!J5.5$65#XC6^KuEgcLI2(*bZ'Bl\t';'/,;ip:8:+JVk+JInD<X5]aS)5M?iX(]#nq>$08?#t=t_c+dh?TNl8:Tg',ECs_*g70BD%T&t@nX!kF4_fmehD]krEtZ0RQ),R]^0<EPTZRMG,<g)H!j,b*SH~>
+Gau1.9lo&I&;KZM'g*g!'nT3_4PEAt:8aY&'&D7]+:=:aJtrI2<rDEu,Xi<,abc:^`Zn+V$1),n(Q692C@UV)nSLRd*IL%'&r^cDa"dMTUA_b>1dOHkaI-_Tpp@R2i;cI]p"k/l+<j/2_.pTth&m,U,jGUAMIOf)<?D,3k)1s4@<a`SRuPP5Z1X0,d[N"?)h!]H^\84GU_8Aae:)I*g2DNU'h*!Vbs2.(0flkh-rP]@KHi$Mi3\FKl^\M+VA)TgH\VpeaRaZD],/Hl$qMuUF.=F<';<bi-AVuV)gc\g;mnF2BJ:rOZZE_'b$s^"B(^Uhh&H*l2:#dQLO4.619`#<7V&_;E`h4^Jqu-j@piWh6,3IMP(A8T3:+!-hSQ0KDAJ$.">o)h!YJD>9BrY9N@$/SO,\0Ar_BSu.\GD&F;(6X`GY%eFe.rQ*`tuTE;(r"Q[6H<W>\uBdu^h&n_efq3=+=*BQGKSB@kVp&dI??TH,7A(fd\r3n(Libi7c)JeTTqPU96))VeT9Li^t5rI"A&EilCnb%Q-3^3c7@g67(:o\00*o>V$CeQ!1J*b:(TY<C<As$PpB>*nZ&=pq<L[;J'4U?A$i3io."lDD`Cdk]mDipcGT+HnM12q/.gh)XJ@]hVZr+cW`m-dpJ#D,QkJ$A9jgLf2je""#acaltXlo2+Yg_.Mq#C(Bp1XY#U*4T9"l;j^^-jgrMCNP1^"lcS!Ai/LOU*6)f\2ClusB?&n<+.Nj$T42q)^^OrbWIEk%AHW2IGa4%CLN9*E(NXs1W.Be@q9hYS`_NGUDic*.#NHq\6XWhG?579\CR,O,-9"B\6hC'8i+##s&e0PB7g?R+R`d_jIl:7s=L5N/%HS4Gm?p`/e&eV3Q47C3U5E9HS1,1DWVFG8r1mV1C+i!SH/(GiXOW"R)uim_+B/="P=]Vt$'OhV`jk2%m4./o2dqJeQ='eUItpCG0-FECDt:%pQrF'e3?D4fjTfR)AbB2
 Q`d1pVFulC^"=hr1Z;=::R+mIS83!_A[]^J\M4pk@p`Lo84Z.Y';&hV2Z_E%M!6$cT)j[gSP0bb8ZBDI/U+4B,*b+<YfGm"8M^b=^C$3"Pr/./Jqtu$h8E\MZ9^mI6eJEMgR8[5E4jZ_cVRp*0KTHjn8hYAnSbD(ekp/$]rW:DOb9+Fe^+=#c"]qAj[b""a$;WZmPdYIJ;/?IOACAMO,:-,<53cEeN-PdV\E=.WUCt_8nV0UXPpEVjg9[?AmPaOW_m=,/h/5F,#4-7XaOm4(a(&n-MG2Xk,1X*9PhZ&5S_*I02T;Q2N4`TMNfD>-jg>P2jiM>c(qBSG&+Y],~>
 endstream
 endobj
-45 0 obj
+47 0 obj
 << /Type /Page
 /Parent 1 0 R
 /MediaBox [ 0 0 612 792 ]
 /Resources 3 0 R
-/Contents 44 0 R
+/Contents 46 0 R
 >>
 endobj
-46 0 obj
-<< /Length 1108 /Filter [ /ASCII85Decode /FlateDecode ]
+48 0 obj
+<< /Length 1231 /Filter [ /ASCII85Decode /FlateDecode ]
  >>
 stream
-Gau1.:NP5L(rl#l$6@k'Wr>XTVO^GZ47,_qE9L!-#6bL1Xg+iW_Ic%2b$\FO![OAj$j68>QJP-Xc[$no04o\bB"qsq'`S&NQ6D'7&AioPhHeHqPRq=.)?]D>?YAi"mm&"RmXBB)!@If$`G1,;SWJ>0E9tXP'Sq=Z#5i^eQ06`O]$f\E0IMXlhYc5u`gSeBXQh,8T6Eq,)>G!F"VuSO)OY'UL66D6\M3+%qHi@XZ6/0^3s8Q\&-^lK_moU+-rU+&"ZZPB[u[3V"(N_`5;7_Ge&2h)0KhI[C.9%\9TGRHG9$mMNS2h,`#99j4JRuoq#Ual7]m<@*$6tc.!=:a`je'7Y>)P:dB5?f.>2qah)[s]^3hsJLiWa++a!j"R-O#-iA?0H\Fjl/S7MWMCa;Cm6L@f8gHE13&.o=J`[2os&dkgk.\`/Z=fq&=R`^>]gpTsZbK/m/h3pHp:u+*8'dr6#,p4.+-1jYG?4S.Lj[KA#?]L1eh[t\W+&26mZ<XQWns=(911X'E_=1EYN,hH+5N]Xnl?f"u&F8mlM$pUOMU8H*(t>]:9\YiXp)O)?Q'-:h%H8G&N%K<<Shss6*^#u@<Qpd_3q?f9ci(\a1E`Y2&1]UQ,S^I)XKU![qZP$HhJDN#0<ke7a)$Y`?<$HH[?WO:UYXVWH%?lFI]jTR,h,^pYCOe41)[`oJBRCpEeMCV=So\O/*"q8653&7VrAp"PL@0M0@EjD@<6Lu[/ZR.l:-[RWk*N/4L<a:@3`YX4G0@2gQNo_5<-M8D[2mENqiR9Y^fJ:kl08"oBo0B0]2/m]hgeI5EQOH-8WRQ.b3/;X-!'kQh.(M3C7$;aMF^Ui_tPkQJn#pi4cJAR4;O5EO?8-hnOP69(bZcP7&(;I]jW2-`!@qFrL1gCBB_Z.<;5beOg/k4XNl!a679=I?EqenON7G$5+H&`hrQQ2ghPSf@[^rH1UroPOXD>3BT8,'&JaT%HR"gRG>u\MLqp.gT/!
 77@K9+e&83bK)cXKIP2%X'/8T''-)+ZSdYkSHMc(A@XUKn<Ti.5_JtA;66\gUhOHqER<==(l]p5j->L)oG?(fXh%W?7ata*Tghd`E:\!<&0R3=6D/BF"~>
+Gau1.9lJcG&;KZQ'g/p[Yl#37@iB0@?*llNpeY@B&%"aZC1YeXk]kQ`^Q^:+Ugk]/OMJ*&O[RLaI5Jjha8,(_q<Z]...@aI>XmH6Ym!:EYd_WQ=H#aB^bW'.?YM%Oan&b;*]2jK7RB"-,63W5@U^c,
 2KseK!dke)6rqQAWcV^[u-p+6gLKahUHSU4"[/6X5#nTj59_sFUhC;T,gKB2[WCTS46]J"H?Fo+8<44Cpd0&A25H*]_4#&!0JqUU20*eKHEL>O87jS=Q)f6\YSQa#3=KkJX%]J/M7YL(0r#6X<*2X#Im8cmV%fF=_+7!CDmaqfu.eaJ4fNSKP`*;h>SB_DYlKil([!PdXB5Ytsb(ge=EEH@iU\!:E[WYHkK?g1BmXK/l@\<~>
 endstream
 endobj
-47 0 obj
+49 0 obj
 << /Type /Page
 /Parent 1 0 R
 /MediaBox [ 0 0 612 792 ]
 /Resources 3 0 R
-/Contents 46 0 R
+/Contents 48 0 R
 >>
 endobj
-49 0 obj
-<<
- /Title (\376\377\0\61\0\40\0\114\0\165\0\143\0\145\0\156\0\145\0\40\0\103\0\157\0\156\0\164\0\162\0\151\0\142)
- /Parent 48 0 R
- /First 50 0 R
- /Last 65 0 R
- /Count -16
- /A 9 0 R
->> endobj
 50 0 obj
-<<
- /Title (\376\377\0\61\0\56\0\61\0\40\0\141\0\156\0\164)
- /Parent 49 0 R
- /Next 51 0 R
- /A 11 0 R
->> endobj
+<< /Length 380 /Filter [ /ASCII85Decode /FlateDecode ]
+ >>
+stream
+Gat%]5u5B@'Z]ZiMKeCsI0(0tO)Aqa`e.m:W<_#&DJ!ZCekPo+V6m+:@U]asn;$c;O8!.UP5CI`$%p[N#EhoZ+Jj0q,hd[f)02qcf&VP/ru6Bm'Yq5j8..b4&p8gmQRFgc)F:rif3i16bb]ZQi+p(8O(Vt+iBc4^Z,=hA^?E5TB(-;pUU0+pA(8(cS/&Y)`fn^Dm\$nG2cg>",rl*(kKHoSU[YI;79qco]C%1r$uJMK*hs(-kS[4XU.%oV+CMsu0o7Sbr=bfG3@uRI%5QZ/_jIJqN$pG)0TcFraE>ZeX$qHHg24B7]O0GLHfK\eMGku0Q1eb$(m4B8<>WoX[\K$tIBIVHD!MEuBtN1DI-oBR)u"guPN)Z2)a$`QlM~>
+endstream
+endobj
 51 0 obj
-<<
- /Title (\376\377\0\61\0\56\0\62\0\40\0\142\0\145\0\156\0\143\0\150\0\155\0\141\0\162\0\153)
- /Parent 49 0 R
- /Prev 50 0 R
- /Next 52 0 R
- /A 13 0 R
->> endobj
-52 0 obj
-<<
- /Title (\376\377\0\61\0\56\0\63\0\40\0\144\0\142)
- /Parent 49 0 R
- /Prev 51 0 R
- /Next 53 0 R
- /A 15 0 R
->> endobj
+<< /Type /Page
+/Parent 1 0 R
+/MediaBox [ 0 0 612 792 ]
+/Resources 3 0 R
+/Contents 50 0 R
+>>
+endobj
 53 0 obj
 <<
- /Title (\376\377\0\61\0\56\0\64\0\40\0\150\0\151\0\147\0\150\0\154\0\151\0\147\0\150\0\164\0\145\0\162)
- /Parent 49 0 R
- /Prev 52 0 R
- /Next 54 0 R
- /A 17 0 R
+ /Title (\376\377\0\61\0\40\0\114\0\165\0\143\0\145\0\156\0\145\0\40\0\103\0\157\0\156\0\164\0\162\0\151\0\142)
+ /Parent 52 0 R
+ /First 54 0 R
+ /Last 70 0 R
+ /Count -17
+ /A 9 0 R
 >> endobj
 54 0 obj
 <<
- /Title (\376\377\0\61\0\56\0\65\0\40\0\151\0\156\0\163\0\164\0\141\0\156\0\164\0\151\0\141\0\164\0\145\0\144)
- /Parent 49 0 R
- /Prev 53 0 R
+ /Title (\376\377\0\61\0\56\0\61\0\40\0\141\0\156\0\164)
+ /Parent 53 0 R
  /Next 55 0 R
- /A 19 0 R
+ /A 11 0 R
 >> endobj
 55 0 obj
 <<
- /Title (\376\377\0\61\0\56\0\66\0\40\0\154\0\165\0\143\0\154\0\151)
- /Parent 49 0 R
+ /Title (\376\377\0\61\0\56\0\62\0\40\0\142\0\145\0\156\0\143\0\150\0\155\0\141\0\162\0\153)
+ /Parent 53 0 R
  /Prev 54 0 R
  /Next 56 0 R
- /A 21 0 R
+ /A 13 0 R
 >> endobj
 56 0 obj
 <<
- /Title (\376\377\0\61\0\56\0\67\0\40\0\155\0\145\0\155\0\157\0\162\0\171)
- /Parent 49 0 R
+ /Title (\376\377\0\61\0\56\0\63\0\40\0\144\0\145\0\155\0\157)
+ /Parent 53 0 R
  /Prev 55 0 R
  /Next 57 0 R
- /A 23 0 R
+ /A 15 0 R
 >> endobj
 57 0 obj
 <<
- /Title (\376\377\0\61\0\56\0\70\0\40\0\155\0\151\0\163\0\143)
- /Parent 49 0 R
+ /Title (\376\377\0\61\0\56\0\64\0\40\0\144\0\142)
+ /Parent 53 0 R
  /Prev 56 0 R
  /Next 58 0 R
- /A 25 0 R
+ /A 17 0 R
 >> endobj
 58 0 obj
 <<
- /Title (\376\377\0\61\0\56\0\71\0\40\0\161\0\165\0\145\0\162\0\171\0\160\0\141\0\162\0\163\0\145\0\162)
- /Parent 49 0 R
+ /Title (\376\377\0\61\0\56\0\65\0\40\0\150\0\151\0\147\0\150\0\154\0\151\0\147\0\150\0\164\0\145\0\162)
+ /Parent 53 0 R
  /Prev 57 0 R
  /Next 59 0 R
- /A 27 0 R
+ /A 19 0 R
 >> endobj
 59 0 obj
 <<
- /Title (\376\377\0\61\0\56\0\61\0\60\0\40\0\161\0\165\0\145\0\162\0\151\0\145\0\163)
- /Parent 49 0 R
+ /Title (\376\377\0\61\0\56\0\66\0\40\0\151\0\156\0\163\0\164\0\141\0\156\0\164\0\151\0\141\0\164\0\145\0\144)
+ /Parent 53 0 R
  /Prev 58 0 R
  /Next 60 0 R
- /A 29 0 R
+ /A 21 0 R
 >> endobj
 60 0 obj
 <<
- /Title (\376\377\0\61\0\56\0\61\0\61\0\40\0\162\0\145\0\155\0\157\0\164\0\145)
- /Parent 49 0 R
+ /Title (\376\377\0\61\0\56\0\67\0\40\0\154\0\165\0\143\0\154\0\151)
+ /Parent 53 0 R
  /Prev 59 0 R
  /Next 61 0 R
- /A 31 0 R
+ /A 23 0 R
 >> endobj
 61 0 obj
 <<
- /Title (\376\377\0\61\0\56\0\61\0\62\0\40\0\163\0\160\0\141\0\164\0\151\0\141\0\154)
- /Parent 49 0 R
+ /Title (\376\377\0\61\0\56\0\70\0\40\0\155\0\145\0\155\0\157\0\162\0\171)
+ /Parent 53 0 R
  /Prev 60 0 R
  /Next 62 0 R
- /A 33 0 R
+ /A 25 0 R
 >> endobj
 62 0 obj
 <<
- /Title (\376\377\0\61\0\56\0\61\0\63\0\40\0\163\0\160\0\145\0\154\0\154\0\143\0\150\0\145\0\143\0\153\0\145\0\162)
- /Parent 49 0 R
+ /Title (\376\377\0\61\0\56\0\71\0\40\0\155\0\151\0\163\0\143)
+ /Parent 53 0 R
  /Prev 61 0 R
  /Next 63 0 R
- /A 35 0 R
+ /A 27 0 R
 >> endobj
 63 0 obj
 <<
- /Title (\376\377\0\61\0\56\0\61\0\64\0\40\0\163\0\167\0\151\0\156\0\147)
- /Parent 49 0 R
+ /Title (\376\377\0\61\0\56\0\61\0\60\0\40\0\161\0\165\0\145\0\162\0\171\0\160\0\141\0\162\0\163\0\145\0\162)
+ /Parent 53 0 R
  /Prev 62 0 R
  /Next 64 0 R
- /A 37 0 R
+ /A 29 0 R
 >> endobj
 64 0 obj
 <<
- /Title (\376\377\0\61\0\56\0\61\0\65\0\40\0\167\0\157\0\162\0\144\0\156\0\145\0\164)
- /Parent 49 0 R
+ /Title (\376\377\0\61\0\56\0\61\0\61\0\40\0\161\0\165\0\145\0\162\0\151\0\145\0\163)
+ /Parent 53 0 R
  /Prev 63 0 R
  /Next 65 0 R
- /A 39 0 R
+ /A 31 0 R
 >> endobj
 65 0 obj
 <<
- /Title (\376\377\0\61\0\56\0\61\0\66\0\40\0\170\0\155\0\154\0\55\0\161\0\165\0\145\0\162\0\171\0\55\0\160\0\141\0\162\0\163\0\145\0\162)
- /Parent 49 0 R
+ /Title (\376\377\0\61\0\56\0\61\0\62\0\40\0\162\0\145\0\155\0\157\0\164\0\145)
+ /Parent 53 0 R
  /Prev 64 0 R
- /A 41 0 R
+ /Next 66 0 R
+ /A 33 0 R
 >> endobj
 66 0 obj
+<<
+ /Title (\376\377\0\61\0\56\0\61\0\63\0\40\0\163\0\160\0\141\0\164\0\151\0\141\0\154)
+ /Parent 53 0 R
+ /Prev 65 0 R
+ /Next 67 0 R
+ /A 35 0 R
+>> endobj
+67 0 obj
+<<
+ /Title (\376\377\0\61\0\56\0\61\0\64\0\40\0\163\0\160\0\145\0\154\0\154\0\143\0\150\0\145\0\143\0\153\0\145\0\162)
+ /Parent 53 0 R
+ /Prev 66 0 R
+ /Next 68 0 R
+ /A 37 0 R
+>> endobj
+68 0 obj
+<<
+ /Title (\376\377\0\61\0\56\0\61\0\65\0\40\0\163\0\167\0\151\0\156\0\147)
+ /Parent 53 0 R
+ /Prev 67 0 R
+ /Next 69 0 R
+ /A 39 0 R
+>> endobj
+69 0 obj
+<<
+ /Title (\376\377\0\61\0\56\0\61\0\66\0\40\0\167\0\157\0\162\0\144\0\156\0\145\0\164)
+ /Parent 53 0 R
+ /Prev 68 0 R
+ /Next 70 0 R
+ /A 41 0 R
+>> endobj
+70 0 obj
+<<
+ /Title (\376\377\0\61\0\56\0\61\0\67\0\40\0\170\0\155\0\154\0\55\0\161\0\165\0\145\0\162\0\171\0\55\0\160\0\141\0\162\0\163\0\145\0\162)
+ /Parent 53 0 R
+ /Prev 69 0 R
+ /A 43 0 R
+>> endobj
+71 0 obj
 << /Type /Font
 /Subtype /Type1
 /Name /F3
 /BaseFont /Helvetica-Bold
 /Encoding /WinAnsiEncoding >>
 endobj
-67 0 obj
+72 0 obj
 << /Type /Font
 /Subtype /Type1
 /Name /F5
 /BaseFont /Times-Roman
 /Encoding /WinAnsiEncoding >>
 endobj
-68 0 obj
+73 0 obj
 << /Type /Font
 /Subtype /Type1
 /Name /F1
 /BaseFont /Helvetica
 /Encoding /WinAnsiEncoding >>
 endobj
-69 0 obj
+74 0 obj
 << /Type /Font
 /Subtype /Type1
 /Name /F2
 /BaseFont /Helvetica-Oblique
 /Encoding /WinAnsiEncoding >>
 endobj
-70 0 obj
+75 0 obj
 << /Type /Font
 /Subtype /Type1
 /Name /F7
@@ -428,207 +462,218 @@ endobj
 endobj
 1 0 obj
 << /Type /Pages
-/Count 4
-/Kids [6 0 R 43 0 R 45 0 R 47 0 R ] >>
+/Count 5
+/Kids [6 0 R 45 0 R 47 0 R 49 0 R 51 0 R ] >>
 endobj
 2 0 obj
 << /Type /Catalog
 /Pages 1 0 R
- /Outlines 48 0 R
+ /Outlines 52 0 R
  /PageMode /UseOutlines
  >>
 endobj
 3 0 obj
 << 
-/Font << /F3 66 0 R /F5 67 0 R /F1 68 0 R /F2 69 0 R /F7 70 0 R >> 
+/Font << /F3 71 0 R /F5 72 0 R /F1 73 0 R /F2 74 0 R /F7 75 0 R >> 
 /ProcSet [ /PDF /ImageC /Text ] >> 
 endobj
 9 0 obj
 <<
 /S /GoTo
-/D [43 0 R /XYZ 85.0 659.0 null]
+/D [45 0 R /XYZ 85.0 659.0 null]
 >>
 endobj
 11 0 obj
 <<
 /S /GoTo
-/D [43 0 R /XYZ 85.0 339.066 null]
+/D [45 0 R /XYZ 85.0 339.066 null]
 >>
 endobj
 13 0 obj
 <<
 /S /GoTo
-/D [43 0 R /XYZ 85.0 266.613 null]
+/D [45 0 R /XYZ 85.0 266.613 null]
 >>
 endobj
 15 0 obj
 <<
 /S /GoTo
-/D [43 0 R /XYZ 85.0 180.96 null]
+/D [45 0 R /XYZ 85.0 180.96 null]
 >>
 endobj
 17 0 obj
 <<
 /S /GoTo
-/D [45 0 R /XYZ 85.0 637.8 null]
+/D [47 0 R /XYZ 85.0 637.8 null]
 >>
 endobj
 19 0 obj
 <<
 /S /GoTo
-/D [45 0 R /XYZ 85.0 565.347 null]
+/D [47 0 R /XYZ 85.0 565.347 null]
 >>
 endobj
 21 0 obj
 <<
 /S /GoTo
-/D [45 0 R /XYZ 85.0 479.694 null]
+/D [47 0 R /XYZ 85.0 492.894 null]
 >>
 endobj
 23 0 obj
 <<
 /S /GoTo
-/D [45 0 R /XYZ 85.0 407.241 null]
+/D [47 0 R /XYZ 85.0 407.241 null]
 >>
 endobj
 25 0 obj
 <<
 /S /GoTo
-/D [45 0 R /XYZ 85.0 334.788 null]
+/D [47 0 R /XYZ 85.0 334.788 null]
 >>
 endobj
 27 0 obj
 <<
 /S /GoTo
-/D [45 0 R /XYZ 85.0 249.135 null]
+/D [47 0 R /XYZ 85.0 262.335 null]
 >>
 endobj
 29 0 obj
 <<
 /S /GoTo
-/D [45 0 R /XYZ 85.0 163.482 null]
+/D [47 0 R /XYZ 85.0 176.682 null]
 >>
 endobj
 31 0 obj
 <<
 /S /GoTo
-/D [47 0 R /XYZ 85.0 616.6 null]
+/D [49 0 R /XYZ 85.0 616.6 null]
 >>
 endobj
 33 0 obj
 <<
 /S /GoTo
-/D [47 0 R /XYZ 85.0 544.147 null]
+/D [49 0 R /XYZ 85.0 544.147 null]
 >>
 endobj
 35 0 obj
 <<
 /S /GoTo
-/D [47 0 R /XYZ 85.0 471.694 null]
+/D [49 0 R /XYZ 85.0 471.694 null]
 >>
 endobj
 37 0 obj
 <<
 /S /GoTo
-/D [47 0 R /XYZ 85.0 399.241 null]
+/D [49 0 R /XYZ 85.0 399.241 null]
 >>
 endobj
 39 0 obj
 <<
 /S /GoTo
-/D [47 0 R /XYZ 85.0 326.788 null]
+/D [49 0 R /XYZ 85.0 326.788 null]
 >>
 endobj
 41 0 obj
 <<
 /S /GoTo
-/D [47 0 R /XYZ 85.0 254.335 null]
+/D [49 0 R /XYZ 85.0 254.335 null]
 >>
 endobj
-48 0 obj
+43 0 obj
+<<
+/S /GoTo
+/D [49 0 R /XYZ 85.0 181.882 null]
+>>
+endobj
+52 0 obj
 <<
- /First 49 0 R
- /Last 49 0 R
+ /First 53 0 R
+ /Last 53 0 R
 >> endobj
 xref
-0 71
+0 76
 0000000000 65535 f 
-0000011873 00000 n 
-0000011952 00000 n 
-0000012044 00000 n 
+0000012924 00000 n 
+0000013010 00000 n 
+0000013102 00000 n 
 0000000015 00000 n 
 0000000071 00000 n 
-0000001045 00000 n 
-0000001165 00000 n 
-0000001302 00000 n 
+0000001070 00000 n 
+0000001190 00000 n 
+0000001334 00000 n 
+0000013225 00000 n 
+0000001469 00000 n 
+0000013288 00000 n 
+0000001606 00000 n 
+0000013354 00000 n 
+0000001743 00000 n 
+0000013420 00000 n 
+0000001880 00000 n 
+0000013485 00000 n 
+0000002015 00000 n 
+0000013549 00000 n 
+0000002152 00000 n 
+0000013615 00000 n 
+0000002289 00000 n 
+0000013681 00000 n 
+0000002426 00000 n 
+0000013747 00000 n 
+0000002563 00000 n 
+0000013813 00000 n 
+0000002700 00000 n 
+0000013879 00000 n 
+0000002836 00000 n 
+0000013945 00000 n 
+0000002973 00000 n 
+0000014009 00000 n 
+0000003110 00000 n 
+0000014075 00000 n 
+0000003247 00000 n 
+0000014141 00000 n 
+0000003384 00000 n 
+0000014207 00000 n 
+0000003521 00000 n 
+0000014273 00000 n 
+0000003658 00000 n 
+0000014339 00000 n 
+0000003795 00000 n 
+0000005774 00000 n 
+0000005882 00000 n 
+0000007303 00000 n 
+0000007411 00000 n 
+0000008735 00000 n 
+0000008843 00000 n 
+0000009315 00000 n 
+0000014405 00000 n 
+0000009423 00000 n 
+0000009624 00000 n 
+0000009744 00000 n 
+0000009914 00000 n 
+0000010054 00000 n 
+0000010182 00000 n 
+0000010364 00000 n 
+0000010552 00000 n 
+0000010698 00000 n 
+0000010850 00000 n 
+0000010990 00000 n 
+0000011177 00000 n 
+0000011340 00000 n 
+0000011497 00000 n 
+0000011660 00000 n 
+0000011853 00000 n 
+0000012004 00000 n 
 0000012167 00000 n 
-0000001437 00000 n 
-0000012230 00000 n 
-0000001574 00000 n 
-0000012296 00000 n 
-0000001711 00000 n 
-0000012362 00000 n 
-0000001846 00000 n 
-0000012427 00000 n 
-0000001983 00000 n 
-0000012491 00000 n 
-0000002120 00000 n 
-0000012557 00000 n 
-0000002257 00000 n 
-0000012623 00000 n 
-0000002394 00000 n 
-0000012689 00000 n 
-0000002531 00000 n 
-0000012755 00000 n 
-0000002667 00000 n 
-0000012821 00000 n 
-0000002804 00000 n 
-0000012887 00000 n 
-0000002941 00000 n 
-0000012951 00000 n 
-0000003078 00000 n 
-0000013017 00000 n 
-0000003215 00000 n 
-0000013083 00000 n 
-0000003352 00000 n 
-0000013149 00000 n 
-0000003489 00000 n 
-0000013215 00000 n 
-0000003626 00000 n 
-0000005559 00000 n 
-0000005667 00000 n 
-0000007100 00000 n 
-0000007208 00000 n 
-0000008409 00000 n 
-0000013281 00000 n 
-0000008517 00000 n 
-0000008718 00000 n 
-0000008838 00000 n 
-0000009008 00000 n 
-0000009136 00000 n 
-0000009318 00000 n 
-0000009506 00000 n 
-0000009652 00000 n 
-0000009804 00000 n 
-0000009944 00000 n 
-0000010126 00000 n 
-0000010289 00000 n 
-0000010446 00000 n 
-0000010609 00000 n 
-0000010802 00000 n 
-0000010953 00000 n 
-0000011116 00000 n 
-0000011317 00000 n 
-0000011430 00000 n 
-0000011540 00000 n 
-0000011648 00000 n 
-0000011764 00000 n 
+0000012368 00000 n 
+0000012481 00000 n 
+0000012591 00000 n 
+0000012699 00000 n 
+0000012815 00000 n 
 trailer
 <<
-/Size 71
+/Size 76
 /Root 2 0 R
 /Info 4 0 R
 >>
 startxref
-13332
+14456
 %%EOF

Modified: lucene/dev/branches/docvalues/lucene/docs/queryparsersyntax.html
URL: http://svn.apache.org/viewvc/lucene/dev/branches/docvalues/lucene/docs/queryparsersyntax.html?rev=1072973&r1=1072972&r2=1072973&view=diff
==============================================================================
--- lucene/dev/branches/docvalues/lucene/docs/queryparsersyntax.html (original)
+++ lucene/dev/branches/docvalues/lucene/docs/queryparsersyntax.html Mon Feb 21 14:13:28 2011
@@ -129,11 +129,8 @@ document.write("Last Published: " + docu
 <div class="menuitem">
 <a href="api/core/index.html">Core</a>
 </div>
-<div class="menuitem">
-<a href="api/demo/index.html">Demo</a>
-</div>
-<div onclick="SwitchMenu('menu_1.1.3.4', 'skin/')" id="menu_1.1.3.4Title" class="menutitle">Contrib</div>
-<div id="menu_1.1.3.4" class="menuitemgroup">
+<div onclick="SwitchMenu('menu_1.1.3.3', 'skin/')" id="menu_1.1.3.3Title" class="menutitle">Contrib</div>
+<div id="menu_1.1.3.3" class="menuitemgroup">
 <div class="menuitem">
 <a href="api/contrib-ant/index.html">Ant</a>
 </div>
@@ -147,6 +144,9 @@ document.write("Last Published: " + docu
 <a href="api/contrib-benchmark/index.html">Benchmark</a>
 </div>
 <div class="menuitem">
+<a href="api/contrib-demo/index.html">Demo</a>
+</div>
+<div class="menuitem">
 <a href="api/contrib-highlighter/index.html">Highlighter</a>
 </div>
 <div class="menuitem">

Modified: lucene/dev/branches/docvalues/lucene/docs/scoring.html
URL: http://svn.apache.org/viewvc/lucene/dev/branches/docvalues/lucene/docs/scoring.html?rev=1072973&r1=1072972&r2=1072973&view=diff
==============================================================================
--- lucene/dev/branches/docvalues/lucene/docs/scoring.html (original)
+++ lucene/dev/branches/docvalues/lucene/docs/scoring.html Mon Feb 21 14:13:28 2011
@@ -129,11 +129,8 @@ document.write("Last Published: " + docu
 <div class="menuitem">
 <a href="api/core/index.html">Core</a>
 </div>
-<div class="menuitem">
-<a href="api/demo/index.html">Demo</a>
-</div>
-<div onclick="SwitchMenu('menu_1.1.3.4', 'skin/')" id="menu_1.1.3.4Title" class="menutitle">Contrib</div>
-<div id="menu_1.1.3.4" class="menuitemgroup">
+<div onclick="SwitchMenu('menu_1.1.3.3', 'skin/')" id="menu_1.1.3.3Title" class="menutitle">Contrib</div>
+<div id="menu_1.1.3.3" class="menuitemgroup">
 <div class="menuitem">
 <a href="api/contrib-ant/index.html">Ant</a>
 </div>
@@ -147,6 +144,9 @@ document.write("Last Published: " + docu
 <a href="api/contrib-benchmark/index.html">Benchmark</a>
 </div>
 <div class="menuitem">
+<a href="api/contrib-demo/index.html">Demo</a>
+</div>
+<div class="menuitem">
 <a href="api/contrib-highlighter/index.html">Highlighter</a>
 </div>
 <div class="menuitem">

Modified: lucene/dev/branches/docvalues/lucene/docs/systemrequirements.html
URL: http://svn.apache.org/viewvc/lucene/dev/branches/docvalues/lucene/docs/systemrequirements.html?rev=1072973&r1=1072972&r2=1072973&view=diff
==============================================================================
--- lucene/dev/branches/docvalues/lucene/docs/systemrequirements.html (original)
+++ lucene/dev/branches/docvalues/lucene/docs/systemrequirements.html Mon Feb 21 14:13:28 2011
@@ -127,11 +127,8 @@ document.write("Last Published: " + docu
 <div class="menuitem">
 <a href="api/core/index.html">Core</a>
 </div>
-<div class="menuitem">
-<a href="api/demo/index.html">Demo</a>
-</div>
-<div onclick="SwitchMenu('menu_1.1.3.4', 'skin/')" id="menu_1.1.3.4Title" class="menutitle">Contrib</div>
-<div id="menu_1.1.3.4" class="menuitemgroup">
+<div onclick="SwitchMenu('menu_1.1.3.3', 'skin/')" id="menu_1.1.3.3Title" class="menutitle">Contrib</div>
+<div id="menu_1.1.3.3" class="menuitemgroup">
 <div class="menuitem">
 <a href="api/contrib-ant/index.html">Ant</a>
 </div>
@@ -145,6 +142,9 @@ document.write("Last Published: " + docu
 <a href="api/contrib-benchmark/index.html">Benchmark</a>
 </div>
 <div class="menuitem">
+<a href="api/contrib-demo/index.html">Demo</a>
+</div>
+<div class="menuitem">
 <a href="api/contrib-highlighter/index.html">Highlighter</a>
 </div>
 <div class="menuitem">

Modified: lucene/dev/branches/docvalues/lucene/src/java/org/apache/lucene/analysis/NumericTokenStream.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/docvalues/lucene/src/java/org/apache/lucene/analysis/NumericTokenStream.java?rev=1072973&r1=1072972&r2=1072973&view=diff
==============================================================================
--- lucene/dev/branches/docvalues/lucene/src/java/org/apache/lucene/analysis/NumericTokenStream.java (original)
+++ lucene/dev/branches/docvalues/lucene/src/java/org/apache/lucene/analysis/NumericTokenStream.java Mon Feb 21 14:13:28 2011
@@ -293,6 +293,11 @@ public final class NumericTokenStream ex
     return (shift < valSize);
   }
 
+  /** Returns the precision step. */
+  public int getPrecisionStep() {
+    return precisionStep;
+  }
+  
   // members
   private final NumericTermAttribute numericAtt = addAttribute(NumericTermAttribute.class);
   private final TypeAttribute typeAtt = addAttribute(TypeAttribute.class);

Modified: lucene/dev/branches/docvalues/lucene/src/java/org/apache/lucene/analysis/tokenattributes/CharTermAttributeImpl.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/docvalues/lucene/src/java/org/apache/lucene/analysis/tokenattributes/CharTermAttributeImpl.java?rev=1072973&r1=1072972&r2=1072973&view=diff
==============================================================================
--- lucene/dev/branches/docvalues/lucene/src/java/org/apache/lucene/analysis/tokenattributes/CharTermAttributeImpl.java (original)
+++ lucene/dev/branches/docvalues/lucene/src/java/org/apache/lucene/analysis/tokenattributes/CharTermAttributeImpl.java Mon Feb 21 14:13:28 2011
@@ -17,7 +17,6 @@ package org.apache.lucene.analysis.token
  * limitations under the License.
  */
 
-import java.io.Serializable;
 import java.nio.CharBuffer;
 
 import org.apache.lucene.util.ArrayUtil;
@@ -30,7 +29,7 @@ import org.apache.lucene.util.UnicodeUti
 /**
  * The term text of a Token.
  */
-public class CharTermAttributeImpl extends AttributeImpl implements CharTermAttribute, TermToBytesRefAttribute, Cloneable, Serializable {
+public class CharTermAttributeImpl extends AttributeImpl implements CharTermAttribute, TermToBytesRefAttribute, Cloneable {
   private static int MIN_BUFFER_SIZE = 10;
   
   private char[] termBuffer = new char[ArrayUtil.oversize(MIN_BUFFER_SIZE, RamUsageEstimator.NUM_BYTES_CHAR)];

Modified: lucene/dev/branches/docvalues/lucene/src/java/org/apache/lucene/analysis/tokenattributes/FlagsAttributeImpl.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/docvalues/lucene/src/java/org/apache/lucene/analysis/tokenattributes/FlagsAttributeImpl.java?rev=1072973&r1=1072972&r2=1072973&view=diff
==============================================================================
--- lucene/dev/branches/docvalues/lucene/src/java/org/apache/lucene/analysis/tokenattributes/FlagsAttributeImpl.java (original)
+++ lucene/dev/branches/docvalues/lucene/src/java/org/apache/lucene/analysis/tokenattributes/FlagsAttributeImpl.java Mon Feb 21 14:13:28 2011
@@ -17,8 +17,6 @@ package org.apache.lucene.analysis.token
  * limitations under the License.
  */
 
-import java.io.Serializable;
-
 import org.apache.lucene.util.AttributeImpl;
 
 /**
@@ -26,7 +24,7 @@ import org.apache.lucene.util.AttributeI
  * eg from one TokenFilter to another one. 
  * @lucene.experimental While we think this is here to stay, we may want to change it to be a long.
  */
-public class FlagsAttributeImpl extends AttributeImpl implements FlagsAttribute, Cloneable, Serializable {
+public class FlagsAttributeImpl extends AttributeImpl implements FlagsAttribute, Cloneable {
   private int flags = 0;
   
   /**

Modified: lucene/dev/branches/docvalues/lucene/src/java/org/apache/lucene/analysis/tokenattributes/OffsetAttributeImpl.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/docvalues/lucene/src/java/org/apache/lucene/analysis/tokenattributes/OffsetAttributeImpl.java?rev=1072973&r1=1072972&r2=1072973&view=diff
==============================================================================
--- lucene/dev/branches/docvalues/lucene/src/java/org/apache/lucene/analysis/tokenattributes/OffsetAttributeImpl.java (original)
+++ lucene/dev/branches/docvalues/lucene/src/java/org/apache/lucene/analysis/tokenattributes/OffsetAttributeImpl.java Mon Feb 21 14:13:28 2011
@@ -17,14 +17,12 @@ package org.apache.lucene.analysis.token
  * limitations under the License.
  */
 
-import java.io.Serializable;
-
 import org.apache.lucene.util.AttributeImpl;
 
 /**
  * The start and end character offset of a Token. 
  */
-public class OffsetAttributeImpl extends AttributeImpl implements OffsetAttribute, Cloneable, Serializable {
+public class OffsetAttributeImpl extends AttributeImpl implements OffsetAttribute, Cloneable {
   private int startOffset;
   private int endOffset;
 

Modified: lucene/dev/branches/docvalues/lucene/src/java/org/apache/lucene/analysis/tokenattributes/PayloadAttributeImpl.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/docvalues/lucene/src/java/org/apache/lucene/analysis/tokenattributes/PayloadAttributeImpl.java?rev=1072973&r1=1072972&r2=1072973&view=diff
==============================================================================
--- lucene/dev/branches/docvalues/lucene/src/java/org/apache/lucene/analysis/tokenattributes/PayloadAttributeImpl.java (original)
+++ lucene/dev/branches/docvalues/lucene/src/java/org/apache/lucene/analysis/tokenattributes/PayloadAttributeImpl.java Mon Feb 21 14:13:28 2011
@@ -17,15 +17,13 @@ package org.apache.lucene.analysis.token
  * limitations under the License.
  */
 
-import java.io.Serializable;
-
 import org.apache.lucene.index.Payload;
 import org.apache.lucene.util.AttributeImpl;
 
 /**
  * The payload of a Token. See also {@link Payload}.
  */
-public class PayloadAttributeImpl extends AttributeImpl implements PayloadAttribute, Cloneable, Serializable {
+public class PayloadAttributeImpl extends AttributeImpl implements PayloadAttribute, Cloneable {
   private Payload payload;  
   
   /**

Modified: lucene/dev/branches/docvalues/lucene/src/java/org/apache/lucene/analysis/tokenattributes/PositionIncrementAttributeImpl.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/docvalues/lucene/src/java/org/apache/lucene/analysis/tokenattributes/PositionIncrementAttributeImpl.java?rev=1072973&r1=1072972&r2=1072973&view=diff
==============================================================================
--- lucene/dev/branches/docvalues/lucene/src/java/org/apache/lucene/analysis/tokenattributes/PositionIncrementAttributeImpl.java (original)
+++ lucene/dev/branches/docvalues/lucene/src/java/org/apache/lucene/analysis/tokenattributes/PositionIncrementAttributeImpl.java Mon Feb 21 14:13:28 2011
@@ -17,8 +17,6 @@ package org.apache.lucene.analysis.token
  * limitations under the License.
  */
 
-import java.io.Serializable;
-
 import org.apache.lucene.analysis.TokenStream;
 import org.apache.lucene.util.AttributeImpl;
 
@@ -46,7 +44,7 @@ import org.apache.lucene.util.AttributeI
  *
  * </ul>
  */
-public class PositionIncrementAttributeImpl extends AttributeImpl implements PositionIncrementAttribute, Cloneable, Serializable {
+public class PositionIncrementAttributeImpl extends AttributeImpl implements PositionIncrementAttribute, Cloneable {
   private int positionIncrement = 1;
   
   /** Set the position increment. The default value is one.

Modified: lucene/dev/branches/docvalues/lucene/src/java/org/apache/lucene/analysis/tokenattributes/TypeAttributeImpl.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/docvalues/lucene/src/java/org/apache/lucene/analysis/tokenattributes/TypeAttributeImpl.java?rev=1072973&r1=1072972&r2=1072973&view=diff
==============================================================================
--- lucene/dev/branches/docvalues/lucene/src/java/org/apache/lucene/analysis/tokenattributes/TypeAttributeImpl.java (original)
+++ lucene/dev/branches/docvalues/lucene/src/java/org/apache/lucene/analysis/tokenattributes/TypeAttributeImpl.java Mon Feb 21 14:13:28 2011
@@ -17,14 +17,12 @@ package org.apache.lucene.analysis.token
  * limitations under the License.
  */
 
-import java.io.Serializable;
-
 import org.apache.lucene.util.AttributeImpl;
 
 /**
  * A Token's lexical type. The Default value is "word". 
  */
-public class TypeAttributeImpl extends AttributeImpl implements TypeAttribute, Cloneable, Serializable {
+public class TypeAttributeImpl extends AttributeImpl implements TypeAttribute, Cloneable {
   private String type;
   
   public TypeAttributeImpl() {

Modified: lucene/dev/branches/docvalues/lucene/src/java/org/apache/lucene/document/AbstractField.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/docvalues/lucene/src/java/org/apache/lucene/document/AbstractField.java?rev=1072973&r1=1072972&r2=1072973&view=diff
==============================================================================
--- lucene/dev/branches/docvalues/lucene/src/java/org/apache/lucene/document/AbstractField.java (original)
+++ lucene/dev/branches/docvalues/lucene/src/java/org/apache/lucene/document/AbstractField.java Mon Feb 21 14:13:28 2011
@@ -80,17 +80,14 @@ public abstract class AbstractField impl
    * name, all such values are multiplied together.  This product is then
    * used to compute the norm factor for the field.  By
    * default, in the {@link
-   * org.apache.lucene.search.Similarity#computeNorm(String,
-   * FieldInvertState)} method, the boost value is multiplied
-   * by the {@link
-   * org.apache.lucene.search.Similarity#lengthNorm(String,
-   * int)} and then
+   * org.apache.lucene.search.Similarity#computeNorm(FieldInvertState)} method, the boost value is multiplied
+   * by the length normalization factor and then
    * rounded by {@link org.apache.lucene.search.Similarity#encodeNormValue(float)} before it is stored in the
    * index.  One should attempt to ensure that this product does not overflow
    * the range of that encoding.
    *
    * @see org.apache.lucene.document.Document#setBoost(float)
-   * @see org.apache.lucene.search.Similarity#computeNorm(String, FieldInvertState)
+   * @see org.apache.lucene.search.Similarity#computeNorm(FieldInvertState)
    * @see org.apache.lucene.search.Similarity#encodeNormValue(float)
    */
   public void setBoost(float boost) {

Modified: lucene/dev/branches/docvalues/lucene/src/java/org/apache/lucene/document/Document.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/docvalues/lucene/src/java/org/apache/lucene/document/Document.java?rev=1072973&r1=1072972&r2=1072973&view=diff
==============================================================================
--- lucene/dev/branches/docvalues/lucene/src/java/org/apache/lucene/document/Document.java (original)
+++ lucene/dev/branches/docvalues/lucene/src/java/org/apache/lucene/document/Document.java Mon Feb 21 14:13:28 2011
@@ -35,7 +35,7 @@ import org.apache.lucene.index.IndexRead
  * ScoreDoc#doc} or {@link IndexReader#document(int)}.
  */
 
-public final class Document implements java.io.Serializable {
+public final class Document {
   List<Fieldable> fields = new ArrayList<Fieldable>();
   private float boost = 1.0f;
 

Modified: lucene/dev/branches/docvalues/lucene/src/java/org/apache/lucene/document/Field.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/docvalues/lucene/src/java/org/apache/lucene/document/Field.java?rev=1072973&r1=1072972&r2=1072973&view=diff
==============================================================================
--- lucene/dev/branches/docvalues/lucene/src/java/org/apache/lucene/document/Field.java (original)
+++ lucene/dev/branches/docvalues/lucene/src/java/org/apache/lucene/document/Field.java Mon Feb 21 14:13:28 2011
@@ -18,7 +18,6 @@ package org.apache.lucene.document;
  */
 
 import java.io.Reader;
-import java.io.Serializable;
 
 import org.apache.lucene.analysis.TokenStream;
 import org.apache.lucene.index.IndexWriter;
@@ -32,7 +31,7 @@ import org.apache.lucene.util.StringHelp
   index, so that they may be returned with hits on the document.
   */
 
-public final class Field extends AbstractField implements Fieldable, Serializable {
+public final class Field extends AbstractField implements Fieldable {
   
   /** Specifies whether and how a field should be stored. */
   public static enum Store {

Modified: lucene/dev/branches/docvalues/lucene/src/java/org/apache/lucene/document/FieldSelector.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/docvalues/lucene/src/java/org/apache/lucene/document/FieldSelector.java?rev=1072973&r1=1072972&r2=1072973&view=diff
==============================================================================
--- lucene/dev/branches/docvalues/lucene/src/java/org/apache/lucene/document/FieldSelector.java (original)
+++ lucene/dev/branches/docvalues/lucene/src/java/org/apache/lucene/document/FieldSelector.java Mon Feb 21 14:13:28 2011
@@ -1,6 +1,5 @@
 package org.apache.lucene.document;
 
-import java.io.Serializable;
 /**
  * Copyright 2004 The Apache Software Foundation
  *
@@ -22,7 +21,7 @@ import java.io.Serializable;
  * what Fields get loaded on a {@link Document} by {@link org.apache.lucene.index.IndexReader#document(int,org.apache.lucene.document.FieldSelector)}
  *
  **/
-public interface FieldSelector extends Serializable {
+public interface FieldSelector {
 
   /**
    * 

Modified: lucene/dev/branches/docvalues/lucene/src/java/org/apache/lucene/document/Fieldable.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/docvalues/lucene/src/java/org/apache/lucene/document/Fieldable.java?rev=1072973&r1=1072972&r2=1072973&view=diff
==============================================================================
--- lucene/dev/branches/docvalues/lucene/src/java/org/apache/lucene/document/Fieldable.java (original)
+++ lucene/dev/branches/docvalues/lucene/src/java/org/apache/lucene/document/Fieldable.java Mon Feb 21 14:13:28 2011
@@ -25,7 +25,6 @@ import org.apache.lucene.search.PhraseQu
 import org.apache.lucene.search.spans.SpanQuery; // for javadocs
 
 import java.io.Reader;
-import java.io.Serializable;
 
 /**
  * Synonymous with {@link Field}.
@@ -37,7 +36,7 @@ import java.io.Serializable;
  * </p>
  *
  **/
-public interface Fieldable extends Serializable {
+public interface Fieldable {
   /** Sets the boost factor hits on this field.  This value will be
    * multiplied into the score of all hits on this this field of this
    * document.
@@ -47,16 +46,14 @@ public interface Fieldable extends Seria
    * name, all such values are multiplied together.  This product is then
    * used to compute the norm factor for the field.  By
    * default, in the {@link
-   * org.apache.lucene.search.Similarity#computeNorm(String,
-   * FieldInvertState)} method, the boost value is multiplied
-   * by the {@link
-   * org.apache.lucene.search.Similarity#lengthNorm(String,
-   * int)} and then rounded by {@link org.apache.lucene.search.Similarity#encodeNormValue(float)} before it is stored in the
+   * org.apache.lucene.search.Similarity#computeNorm(FieldInvertState)} method, the boost value is multiplied
+   * by the length normalization factor
+   * and then rounded by {@link org.apache.lucene.search.Similarity#encodeNormValue(float)} before it is stored in the
    * index.  One should attempt to ensure that this product does not overflow
    * the range of that encoding.
    *
    * @see org.apache.lucene.document.Document#setBoost(float)
-   * @see org.apache.lucene.search.Similarity#computeNorm(String, FieldInvertState)
+   * @see org.apache.lucene.search.Similarity#computeNorm(FieldInvertState)
    * @see org.apache.lucene.search.Similarity#encodeNormValue(float)
    */
   void setBoost(float boost);

Modified: lucene/dev/branches/docvalues/lucene/src/java/org/apache/lucene/document/NumericField.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/docvalues/lucene/src/java/org/apache/lucene/document/NumericField.java?rev=1072973&r1=1072972&r2=1072973&view=diff
==============================================================================
--- lucene/dev/branches/docvalues/lucene/src/java/org/apache/lucene/document/NumericField.java (original)
+++ lucene/dev/branches/docvalues/lucene/src/java/org/apache/lucene/document/NumericField.java Mon Feb 21 14:13:28 2011
@@ -222,6 +222,11 @@ public final class NumericField extends 
     return (Number) fieldsData;
   }
   
+  /** Returns the precision step. */
+  public int getPrecisionStep() {
+    return numericTS.getPrecisionStep();
+  }
+  
   /**
    * Initializes the field with the supplied <code>long</code> value.
    * @param value the numeric value