diff --git a/docs/index.html b/docs/index.html
index b67a06438ea..4d240144c36 100644
--- a/docs/index.html
+++ b/docs/index.html
@@ -250,6 +250,9 @@ document.write("Last Published: " + document.lastModified);
 <a href="#Lucene News">Lucene News</a>
 <ul class="minitoc">
 <li>
+<a href="#26+August+2007+-+Lucene+at+ApacheCon+Atlanta">26 August 2007 - Lucene at ApacheCon Atlanta</a>
+</li>
+<li>
 <a href="#19+June+2007+-+Release+2.2+available">19 June 2007 - Release 2.2 available</a>
 </li>
 <li>
@@ -285,7 +288,29 @@ document.write("Last Published: " + document.lastModified);
 <a name="N1001D"></a><a name="Lucene News"></a>
 <h2 class="boxed">Lucene News</h2>
 <div class="section">
-<a name="N10023"></a><a name="19+June+2007+-+Release+2.2+available"></a>
+<a name="N10023"></a><a name="26+August+2007+-+Lucene+at+ApacheCon+Atlanta"></a>
+<h3 class="boxed">26 August 2007 - Lucene at ApacheCon Atlanta</h3>
+<p>
+<a href="http://www.us.apachecon.com"><img alt="ApacheCon US logo" src="http://www.apache.org/ads/ApacheCon/2007-usa-125x125.png"></a>
+              Lucene will once again be well represented at ApacheCon USA in Atlanta this November 12-16, 2007.  
+            </p>
+<p>The following talks and trainings are scheduled for this year's conference:
+              <ul>
+                
+<li>November 12: <a href="http://us.apachecon.com/us2007/program/talk/1859">Lucene Boot Camp</a> by Grant Ingersoll.  An all-day training focusing on getting started with Lucene.</li>
+                
+<li>November 16, 9:00 am: <a href="http://us.apachecon.com/us2007/program/talk/1992">Apache Solr out of the Box</a> by Chris Hostetter. Introduction to Solr.</li>
+                
+<li>November 16, 10:00 am: <a href="http://us.apachecon.com/us2007/program/talk/1943">Building a Vertical Search Site using Apache Software</a> by Ken Krugler. Will cover many Lucene-based projects.</li>
+                
+<li>November 16, 3:00 pm: <a href="http://us.apachecon.com/us2007/program/talk/1953">Apache Lucene Performance</a> by Grant Ingersoll. Tips and techniques for improving Lucene performance.</li>
+                
+<li>November 16, 4:00 pm: <a href="http://us.apachecon.com/us2007/program/talk/2017"> Advanced Indexing Techniques with Apache Lucene</a> by Michael Busch. Information on payloads and advanced indexing techniques.</li>
+              
+</ul>
+            
+</p>
+<a name="N1005B"></a><a name="19+June+2007+-+Release+2.2+available"></a>
 <h3 class="boxed">19 June 2007 - Release 2.2 available</h3>
 <p>This release has many improvements since release 2.1. New major features:
 			<ul>
@@ -321,7 +346,7 @@ document.write("Last Published: " + document.lastModified);
               available
               <a href="http://www.apache.org/dyn/closer.cgi/lucene/java/">here</a>.
             </p>
-<a name="N10056"></a><a name="18+February+2007+-+Lucene+at+ApacheCon+Europe"></a>
+<a name="N1008E"></a><a name="18+February+2007+-+Lucene+at+ApacheCon+Europe"></a>
 <h3 class="boxed">18 February 2007 - Lucene at ApacheCon Europe</h3>
 <p>
               
@@ -335,7 +360,7 @@ document.write("Last Published: " + document.lastModified);
               Hadoop committer Owen O'Malley's <a href="http://www.eu.apachecon.com/program/talk/36">Introduction to Hadoop</a>.
             </p>
 <p>Registration is now open on the ApacheCon website.</p>
-<a name="N10089"></a><a name="17+February+2007+-+Release+2.1+available"></a>
+<a name="N100C1"></a><a name="17+February+2007+-+Release+2.1+available"></a>
 <h3 class="boxed">17 February 2007 - Release 2.1 available</h3>
 <p>This release has many improvements since release
               2.0, including new features, performance
@@ -352,7 +377,7 @@ document.write("Last Published: " + document.lastModified);
               available
               <a href="http://www.apache.org/dyn/closer.cgi/lucene/java/">here</a>.
             </p>
-<a name="N100A1"></a><a name="3+January+2007+-+Nightly+Source+builds+available"></a>
+<a name="N100D9"></a><a name="3+January+2007+-+Nightly+Source+builds+available"></a>
 <h3 class="boxed">3 January 2007 - Nightly Source builds available</h3>
 <p>Nightly source builds of the current development version of Lucene
                     are now available at
diff --git a/docs/index.pdf b/docs/index.pdf
index 4bf702219c7..6b8b66ce636 100644
--- a/docs/index.pdf
+++ b/docs/index.pdf
@@ -5,10 +5,10 @@
 /Producer (FOP 0.20.5) >>
 endobj
 5 0 obj
-<< /Length 632 /Filter [ /ASCII85Decode /FlateDecode ]
+<< /Length 680 /Filter [ /ASCII85Decode /FlateDecode ]
  >>
 stream
-Gaua<9lldX&;KZO$6>[i<NUp"3&[3"OQiRiL0NDbN9,^1$8*FojPO$*2Ng4o^beUj#A_<%Y2>"g^!<>_.u%_r$-K[gYs3M%csm37QkN;2pI%\/'+)g1U2PsN4-`%p/$u*-1"R25qHR)f]_'CnHen#rICMU.:j-JD8Hd(3BDK+!(mo:<1USijFPL2+e6B]5l`/E6f8fYd!cjkC#djt!i)mR<&?=uKHFQ+;HZuXRak[NdIt*i8_@1g=:pcnEc5FOlk_2bn&(LS=3p686d/H8ec8q:JXkS$Z^bIiPa"KW"atQ'/6gBZgocXN3M"K*C0>HdMX#<pdl3"Fq7Hll/m1GdB+<6eo%[f9k3#TiNfG4RW:_/CA[F4B<=3^=F3g\Zu3kok,fM,ZIXkURhGHYOgW?g8-R75)BUr5fX9iDAj+TI>A+*n.J\S#`)QCb%ZBe"^n+%(qGBe"\*"YZ"<AhpnM*hU#!:d3BWP6[&tI8On9GJI`e8oS<o7rt.g^P3=[N$]Y[9B1%@9eb\-d:aJIM6?70Ua&9Z'.RK59MXLcVh1\n:ce0XWHZ[J[Hg?DGKR`l#*SIQ(67(kZ27@9]7XjMSQ4KI)q>[GKnJ.&dK`/,2McKk#.35pDuDVdK!-$~>
+Gaua=9lldX&;KZO$6@7)W]lLIa!;<?17<6QE,0f^Z0X/3_;W;'r;0#mUNP8p[n0bN0FP(-rB;e'?DPE83CbX;"Jr/L\?@G+BH9o;m"_=R?'>l:>fJ2jJ\Hm%)kB-Z1GiSk[eIY./i+f0BE%Ppf$rI0m*<t%P[<*B$IO:$U\mFb9Xu/6Vg;54l%HY`<\&Zk<Fosg[MeZC7*0F48si7".#uf=O$Y^NU$e77[<FQo4Lj\Zr9k0n9=T]E%Yd;.m@87Ap0QCYF.i6QEH$ABG0U'Y4]iNc7-h#3";R:DXQ*A(46'E_l_QOhhQ=Deoe@[Zq.TJCD]E3q((G\6=d@oC>NiBCDe<`?;R5`tGm]oeOZ4Du]\4)`(oX?h2fRS=\%fn&B*tCQW,sme86_W$_^k`c^#dV^JP:.u)7r\dOURj/"8"GDVWMJfGIi6Ls/*?ll>#o[<fTd'"tV1`do7S1pHs\1BduADeR)2L7F0<kmMV@_-\"B-@X_t/@[[YNF79h,njFh6q>-d:JF^G>l3o@MFEt--4ogd@WT^k.*7.re_.,\Ko`*U/.'0Mn^,3Z"T\?&=n0PS`1Be^@&f`\B#r#7R+`JV/8h?f%T?D!@<'.^@G50&[ooXqRI?_VEj5iCD?`i%QY/-BKeWie`k#I8SZD-hS?b6?DC$aniQIoDk"r%F/#Q~>
 endstream
 endobj
 6 0 obj
@@ -28,6 +28,7 @@ endobj
 14 0 R
 16 0 R
 18 0 R
+20 0 R
 ]
 endobj
 8 0 obj
@@ -53,7 +54,7 @@ endobj
 12 0 obj
 << /Type /Annot
 /Subtype /Link
-/Rect [ 108.0 523.266 299.132 511.266 ]
+/Rect [ 108.0 523.266 355.124 511.266 ]
 /C [ 0 0 0 ]
 /Border [ 0 0 0 ]
 /A 13 0 R
@@ -63,7 +64,7 @@ endobj
 14 0 obj
 << /Type /Annot
 /Subtype /Link
-/Rect [ 108.0 505.066 363.104 493.066 ]
+/Rect [ 108.0 505.066 299.132 493.066 ]
 /C [ 0 0 0 ]
 /Border [ 0 0 0 ]
 /A 15 0 R
@@ -73,7 +74,7 @@ endobj
 16 0 obj
 << /Type /Annot
 /Subtype /Link
-/Rect [ 108.0 486.866 320.456 474.866 ]
+/Rect [ 108.0 486.866 363.104 474.866 ]
 /C [ 0 0 0 ]
 /Border [ 0 0 0 ]
 /A 17 0 R
@@ -83,7 +84,7 @@ endobj
 18 0 obj
 << /Type /Annot
 /Subtype /Link
-/Rect [ 108.0 468.666 358.472 456.666 ]
+/Rect [ 108.0 468.666 320.456 456.666 ]
 /C [ 0 0 0 ]
 /Border [ 0 0 0 ]
 /A 19 0 R
@@ -91,25 +92,20 @@ endobj
 >>
 endobj
 20 0 obj
-<< /Length 2010 /Filter [ /ASCII85Decode /FlateDecode ]
- >>
-stream
-Gatm<968iG&AII3E-b):;]u;=cHUMWa-e8o@pM,i%hK%=816_(5q0s[n'[HE"\#G*S+2G2O9Bb$gW-eHlhTVlI.Ck.P;Gr2^h`q)PW&Od5>+/cXM"(Y+)\b`jqHX1UC_mlW4AMJLsR::N:7UHh^@%Iabs<]dH6/YEoMGH$(M!Fe8)OJ!PBJ#o8WM-F%UoTVX3i?k>tlZY=5r"Xj2WPoj?SR9rg+!4R;^>64f;:N_`9C%">GgO[iQTJh*Ei&gjaQ0o;g9XL`3(?*<:(4l$IOe7QTu/q3%+/aK^4/d8_l&OgouMQaHm<J$]fh5uB78M%<7$cC5_]<O<C>+psQ\E<Q8@7PBlZI4OAD3V'4I`$@LTm^SRd7u4_[F1mXTbFJ1>.uDI[X^]R:gb2BJ1J:bDG-C=.lC5JXuXqKLbCX<;"YB:nN43Das,geX`%'*^(AgqjH>j3TA8Y1RVkc9)s<@"1R!?bs!9pl;0jb>Wm\;sdB9V!T1"^@#1(B]!iem<d%`qr<N17pS9\HK?D1G8]Wc0![a\rcZlTXU./$5[KYZCqQ:PknOU6:cWiD*o_:e]M9262t38ZA)*S6_[IXTe9_oT>Hhhcb=>&GO_)bIh?iWH\^r><ZV+ZB07(=JQ`"aq>B!?8p-,B4QlCrBnMAuGp`fO!_;8[k.3QQJUKSetmgd5lkZQr/[3m)b23,4'YkF-o3I97tfQq&3n4l)V2Rkip*d1NER8[M'UYLZk:$.\)0)#J-j"/E#PQ3U,2IpZgj:mY!<ZUlu60)2hlEV<u9pm^6#;.b3%kNVKL!#Z@d$B'od7q/5m[-nM)<*>*J@%o&=f#589MM+@9aC6cCWqF`E!'Z10\LkHuX3=oNQhi/>ZXV"L7G^9(=)075q3MO,-G<p8)eDs%A?,c[ImY(+a!(,I)**%f+(A/#MrDhd2_WE8D*eY@c.*-um@W#LZ]t8^c5V-di*4uVe+oeQ.mKsR@%i;@'A16aF'<P5fq!,rU?tR^9>cmMm/obrb,Ur+W3\O`U>9Kke=l;8pTWc.bR%]gUUuGQ!TnpErH&d`-U$^Q6'b`W3eD#RZ0rjtNA'f`T.briHFQ34AaA\)0@5"m;:63e;0E=OtEjG/R]dug8L!qKl&TV6OGB0h$8_3-D23&"`#@``[C3:D;*t,]V^6ZoUIiV&OS#J_Tf#U9sh6:nYEM1'M$hH`tPJ@];XN:B(F0dDC5t4YoNVaBXG1SOT0XZPU.!t\u&\GepBQ%jPHrV,!=%BfkV(i9Zf62k,Uu0)O%,,BE,TiLQAAl/HbM3E,rn_/V>`FI0Rd\VX0K08;adkfs^c3'.n_PBD!n2FrZ7$rq:d'B]AM6)T;d!N9^;8KRH^Y&@5'$B+=*Z0S>ZY"RBS5H'B)^.LIWft5'SeDnE&+WXc7MZS6&&iW9]DhdZXt8J47hf+Dk;)e<o8IoQ_0%1VuFlT7un4#fMQQIc2r^_TY&H<'G:HQc[8AkQ?j'b,/e@.=+_/4$N^r)2&@d9,E9MYL[l9]%\-V>Y3@)^7'gAe"nTj(Nl.T:=cF,/BPUnN6)iEDe#7@H5Rp&pI):mTf\1'B1\=iBI>;TOL$;"Zne)Mc)YXY!I'XjS#mtb!=B.@3*DN=i%F/J,KAopu.-#?]fef=(d&h(+3ocI&?U7/!4pDV,r7eR#Pr3IH[5_iIbf,V]1l\*l903srVqU+jE_ULP4UX.Fn22l+hHi&<r>pI+GlR+^0;5CRS*uS!\u9u)6IQAP(mV>''%.+/p+Hh2VtBj/<XlP4att`D8tu^1rT<*g@R;aW0]67g.VYO/JJU-)V'O!<('ZM'KR*r$3+Z7mj%to#/;Y7ar9;e^=hTUIBd]Cd#^%1R\#o1L6B^QR[#fo;_m@N"cdKO*&L\;XTKiUA-:aWpq8sGuOAXMGGoF71Q@okH0MA0sA9$\,+ddK?7;hbk@,u)$R$KFn"&L(B7(X2<;V\D:7judqjDOphQZdjpakAg4?)uu4[01>^X&HWTP[0t?e5rsi"mXh@#,'(L>6~>
-endstream
-endobj
-21 0 obj
-<< /Type /Page
-/Parent 1 0 R
-/MediaBox [ 0 0 612 792 ]
-/Resources 3 0 R
-/Contents 20 0 R
+<< /Type /Annot
+/Subtype /Link
+/Rect [ 108.0 450.466 358.472 438.466 ]
+/C [ 0 0 0 ]
+/Border [ 0 0 0 ]
+/A 21 0 R
+/H /I
 >>
 endobj
 22 0 obj
-<< /Length 1123 /Filter [ /ASCII85Decode /FlateDecode ]
+<< /Length 1995 /Filter [ /ASCII85Decode /FlateDecode ]
  >>
 stream
-Gatm:95iQE&AJ$CnCRe"78iU2P&-X4=EJa#hmP\p&oFn8.@$Xo[(h'hQSifZ+GYYZS'RMkS,$Zlg[49T]DB(4k[;.9X-d:HJfq;4T&5LYN"R+o!,7"-X++0Zr<7eJ3$Ktir]NlCJ"OXk6Mc4u2kM-fn&"fg(Y"In(O0mW+el-qg?r%<77QX!U@,&Eig;L.4edEj0^Re[(1_4E!tE<@7dP6Aori@h&H_[Xj7#Y$Jl`#D`,qO=':1`:j`^Ycg-3g$bOolAKbleg`GEE28!J.4VG%iE^/$g;gItYC;gf*(j'_W&(#UC!V(PO&.$OaF.]F'NL-Z42'<n0n]M>:aN(Zd5a2qY,;eo6]/#CVi6<bk[&=Ft-&n?,.#9a-^],LJ!bEn'6@1n[UB*#6oIC]1ME;tmAMZNP[4\em`Ct:'uLWkf'9F#*Xeqm3rWUHQ*._(Y!Q\j$5#8iV_WrkJ&1:YRdn>$Bne&0X0A!bhu$l=1=!4e<?Pq3Vg;s_PEa(V&iki);BbS.,ZPeps0W.:$4PIaGu&W=0&4gr0@(!,r?3n9lPTVoacS0\:D&,$9@64m$6%\^C-j&tM)N("0`8"+^N4)cMqPYI;Ql24DB5okb;$rVjl5(+Iiqo,[:PO:>#6rh_T<duSLUZJX:;qXk:#l<>Qkm2\Ldf7_fI7A/])Wb1OJ'-P1KE=@ZHG0V0j,V#IY27k%^WJoUEcCUF.U]klk%Q[lS:u`K:DaRNDrBc33-`b*^l)[GClhh4Y@(Z!nJW1Eqh_87>&2l/@7*/6]I8i)`P.JIeOLCEfD//&1tD5%^g:\]/-`DJ1$*&g.7I+r!qVR&RD=M?3#tR<DuDa^XE@$UJT3s32_l1B;HE]$9<Y\/ro7U;^TM[1%G1CEHPU#))A./nc].im/'W4`"fd9t?Zj/\"LTM1g2]([7G)r5NmJODA\IGKg'BPO_@Xar^gN$P9C'^d0:UpaC`_Z1L952pl]d(2"nmNoR/)_JpOcf:/>Ce7;:l!IRieNA>sO1.rq-^j/G+>Z&k@BI[M8Kbngq8aRGAV>0AY^![21\$qSmnDc>4d3j)!JjTq-_D6sV81c+00.\$@GtA^b+RNkr-+`HRNsG6R-'Z@NZ<BR]s^[uR2V~>
+Gatm<9lo&I&A@C2E,oYR;_\FMSX]#'SWD?E,IK\A4[:8<+e]/G">.7#^.V<9(DJ:<BuVqa5n_!$gYK?"\=?@ObU6aESsuO4k<&)2J<9JSkbX-rW0K1<nDfKa8Nk[HU+h,T+De6Z,]nkb3/TeUa`!Bdq;g(Km#^ppq/YITWsPj-J&LTK#!T[@3V/7%f1Y-&kY15YR?n^)bLX<Js4h.tK^h:Pr-`37fr]D'2o-$[,`3($,SY^4$)'_"B7dZW-#O9<]8u?((lPu?B)UgpXObjXX//c7<bD9-rmA##MWp9[h'elh[l&Z^rM\jPAa=fhbE]lt(1Nu)HL,QdQ-btdHRMR3]YpXnGBg*@iWYc!b5V6#]4VE:GPXlq2:'jM/E@/?=>rRQ7=hND'`(*%Y$hE7M$I$\Ll?$kO]d"TO<od6Bu#LMJ7s_qWV9g>]&)<@%TO2N?<96&XMFO?9%N[B.[Y++k??JrI5gtf"@5f)MPF$#)jR+"Q'.baL:i8^LuJiC9?#;R>]._OZ5a&>Y2HBNY;CKsf1'YCT97OLRT*_V\^;H"F#IALZaE1RA/VT:+]9qqhZ$/-@Gp*j5>+&72a7.cZu_#6j3bO$gNo*%6K!jUVhaYf\/BT)gAee[kbWNfet(/0qWM.2%+<XbK&GQ3VH"NXMJZBgN?UnV0CD?ZEG0<NG"$D)MtfUTXOM&#]HAM^;!HB2e9@[k+mU6TG"_bYXeAHn;%u!REJ^q8_q_`:dl<qrGQi0kb_bT\$#b<c?.^V"#X_sFQm$A/4l7g#ZB\Z+!L"Nd-$2bRT?Jul\LN,9RN,qaf*6^=L"qQ+KoBHZB7mC,K2R49]T&O6Zs4%Wj@t1k1)S/UoF\%s#;j_:\`AW8KO.lrJ-(]??MmN3#Vuc)@Wkk4d+@<'H7:.th%e[D-j`]l\5<ece-sM8=#E6tjTl2E1m)Lt*`)=CE+D[[gc==o!kfMb-*\C/]NoNZNCgNib/hQ(d-IC?p0@*=^/ggp&a*6lg@LE4)[,Z7"3tG.<fmgm;(b@bcD>om8)\3bE8%si[0Ab'_D7t;9'/i+&.R%pXUd70/>C]n.o:[7pI4[9TSPOee7Bk^gk[7#Jj6cn+FOgkbQ]81-FD19NKm86YgcmP5V]>^:8HkjSg`ggm"9%RK`Uk=#+oLX"G1&l.(Lr>V[F%V-rp#QVRE6@P!89*LUqDS?Caa8+WoM4.fGin?nSH&D;)eu;6/D"BCVfQKIl7YYlV)sN>N1#7irRk5Ukt8cN?!`")*/@m[.KTErKHK3k'?HdaV3(_%HH2A8B0m4/di)V0^f[(G_ptLQBOcppspqX\Kr'H0iILET1^TaR:QhBbJ6p9DX%(8)qrj;f[tF=Nlr8^OG'JYX_.=7m?]aJ/&YYrC=tcWhU0EM"Z_]O5/f3<#lF!LQ8)4G5sM-B[+n&PCpFZiZ$6^kT/SU>j<[ERbASm5@4>Qn^5m8`Re/463CUOHgSMVPG6Q*;,4OOn/'0Q*TNV%_;Nu#l^;lK$Huu:lgC/!Q>,iBjOpG:2s$^+6A@#,mH]!nK-N4*iOcUH2aV\\Yc"R5`T+^fIMBH!>>>fWb`?sML#oj!boZG5OhbUMVm<]6S5>"m(CaDjidp-F>\>IUAt3*(M:,n>>eRh\]m2DT2*MR,d)rnR_Qu0u'(i/Bep"'EU<,,Un$pWpEe?StJ:jQgU%cfQ)+/2(dQ"L?\Tr:Ja^#ZBc>Z>K)?P^*+I9oYg)]qbA3T=(L6#aY&iZZ<dZISW<&qkeCLHkXYtp;>XsN^We!,=$d7?89"g_t_-V0d34!\-<;^ZPebbIJI[6AS>BG6&r_p^)3\7lp[D#*VPe/8,k+h8D+*M`$,,i>:*T:Ku3kBG7K@E\)^"1sbj;'?e:"').JS&BZCmb#\;Sg((gf6%>^O>IG6FAbe!BQR,8,QYEamrqj=H;n@]hBcOaaogRsORsc2FAY9VIh$Z)"O1hC"a"tO=uKs+',*!eeg]TrYhQcZ@pT7\4@dQP5?\GCnG~>
 endstream
 endobj
 23 0 obj
@@ -120,82 +116,105 @@ endobj
 /Contents 22 0 R
 >>
 endobj
+24 0 obj
+<< /Length 1795 /Filter [ /ASCII85Decode /FlateDecode ]
+ >>
+stream
+Gb!;d968iG&AII3n<RU^Jd@Ir,<%]hSRe2!NHOJB4[:8<0d-i="=6.E52aUh:o(,8oTI<U-:g7B^]!l\Ks0*dS+Ydu"h&UNkACmcaL44We,R%eIU9V(6^WUojORr5kMl>i"ipkR=1?\r7"8<W(O!.+f)Mu)/u/Vq[VN!$lgL0E+Z$!%=\I1Zo^\BFkqIus<UsRcJ;Hl,cPnPc')@)O`T-3^C(KIhr5dtRCi)JAXFI>ELQTgk7W*/9FcnQV1ot1I333gZN5-<N;C\)N.[>h&"D]9M_[\4hfd6m+p0@1FOp67P"^te#<rLdl\Gf4i0X*+=ZfXK$^9bCa@>qi_>1c8%Fc:S@(3\DVR=<m-;+t0.$$+C#+V'7i>J?5bJI/SuIi'bma5<qRkKnDae#S'hHi?Lq_lK8!MLn2<$kh"86.GQ4`s<#aG\Hk@"'ZEY[sj<2qOlk''4&^YAoMOu[ZKK!O&S-[kWM"Xg&+_;]M.66aU?3`Sh!htk!*iHV(1#@)>:6+n3(Cqf^UFA'pgYu@!3g2ngD^.#l(N`E$h1bG0.p*S,V13jtDiEhhL(lk:(nL6O5%1/ib3QDKP/sbLAh,n+(=\VTZA:(*:P-["emdrHnkc9>=3]NpYGY%6agR@&Q7EQj@sG0RTL(4AI_e;D;Z4dSq3oUB%S]a`99'X(rs6qt`M6EENVSh`R8HY7*\"iWIB!F+cILa4c#b@c[1//1kK[3oqnNX8pq^Xl(7?NT:3H`(*R`JZ=rr#m74h!aZEX>f)A]W:V&Bf0Y#@Dcg%6Q3qARo?qZR+#V_:asD=t<\[_G+B";DOiXgr.9Ns[Fg7-b7_R>b7.Q6?8?qV:9(T-0GH^h+JD8S9=K3^/:7ZJo15JWWU_bsH%jm\.K44'PgYg+r//Fs>li$dEK@o%qprH>b/^WbV\WS/>,#_5%Q=.Q[59+d@4af*(/e*OTr60A-M''hseBqM@!>c,-_b<Eq-VE?[DotKHY?c_F"NZA[o?t@g,m!RYK@oi#0'is2.JSb6i3TQm$oWG8iQ2RDVA!p*NP*VdG/\V9\YKmXD''?!9&n%IW./i(d[l#n)9[S<8Z"$<JS/.o_44Ed1I&4>2@*uFS,A!rl4+P>,\O.*+qBnQ>W,l'F3H(1SPVh`G7L&I[b+R;]P[4Qm*AZ76E:JQ&AWKkTC-S<OFia@$[[Po.il$<15-^?eEi]+8L*ku,T7jEo1.h7isHCcR4aCop\+*_d<XnOd\X*>Af&/^&Jf'hPt,1:9!b?1gTdnUHVQq&e4Vob(s)]9J<F**3hr-D&aL&cC\RVB##&?T-ssq?#N>=^=u6S=WVLLBB>F]bY(tdRMI5EkkR]f=`NOM"FDRsCGCNrj8Z3HZ?Ea/=:rX@o5Ht&P`W)1hp'UN0%jSkJ<KbA`,WISKJ-8&V?2XV%$")S80;noif-%T1p$BVuE?*#2_7V]t'ie.PfHA64^f+*@`lh+JcKWEOGTG*cLJ>3p`7(7?S_Yer]O%]I/rGl<eheC<aPEk=Eg8QGYJ0;X=*Y1t$=4%&Pg<2eB,OCVG,OHVX7a`CPS$giDRoX.Bj_sihS<VqJ'cs8jjQqiJc&%>k5s-mg#prOQ<40.:WVM\AAG!VFkX:*hSJq`k^*GekkWcW(u=K`+-O3sK,iIDD0Et2rU=Mk=;qiUo6&gZ'i/#/MgF<*#5uA]k1L5`#MUi`FhflR.JQ7MVA+_*[/sG,ehsaO7.DPg(cV<q2*bLS`PY5ZZ8[`n*=g<oi"EDr]N*"4%df`i;<;fH,U9OpQ2#OLS6^`O^95T\O+I*)!8L!1%K~>
+endstream
+endobj
 25 0 obj
-<<
- /Title (\376\377\0\61\0\40\0\101\0\160\0\141\0\143\0\150\0\145\0\40\0\114\0\165\0\143\0\145\0\156\0\145)
- /Parent 24 0 R
- /Next 26 0 R
- /A 9 0 R
->> endobj
-26 0 obj
-<<
- /Title (\376\377\0\62\0\40\0\114\0\165\0\143\0\145\0\156\0\145\0\40\0\116\0\145\0\167\0\163)
- /Parent 24 0 R
- /First 27 0 R
- /Last 30 0 R
- /Prev 25 0 R
- /Count -4
- /A 11 0 R
->> endobj
+<< /Type /Page
+/Parent 1 0 R
+/MediaBox [ 0 0 612 792 ]
+/Resources 3 0 R
+/Contents 24 0 R
+>>
+endobj
 27 0 obj
 <<
- /Title (\376\377\0\62\0\56\0\61\0\40\0\61\0\71\0\40\0\112\0\165\0\156\0\145\0\40\0\62\0\60\0\60\0\67\0\40\0\55\0\40\0\122\0\145\0\154\0\145\0\141\0\163\0\145\0\40\0\62\0\56\0\62\0\40\0\141\0\166\0\141\0\151\0\154\0\141\0\142\0\154\0\145)
+ /Title (\376\377\0\61\0\40\0\101\0\160\0\141\0\143\0\150\0\145\0\40\0\114\0\165\0\143\0\145\0\156\0\145)
  /Parent 26 0 R
  /Next 28 0 R
- /A 13 0 R
+ /A 9 0 R
 >> endobj
 28 0 obj
 <<
- /Title (\376\377\0\62\0\56\0\62\0\40\0\61\0\70\0\40\0\106\0\145\0\142\0\162\0\165\0\141\0\162\0\171\0\40\0\62\0\60\0\60\0\67\0\40\0\55\0\40\0\114\0\165\0\143\0\145\0\156\0\145\0\40\0\141\0\164\0\40\0\101\0\160\0\141\0\143\0\150\0\145\0\103\0\157\0\156\0\40\0\105\0\165\0\162\0\157\0\160\0\145)
+ /Title (\376\377\0\62\0\40\0\114\0\165\0\143\0\145\0\156\0\145\0\40\0\116\0\145\0\167\0\163)
  /Parent 26 0 R
+ /First 29 0 R
+ /Last 33 0 R
  /Prev 27 0 R
- /Next 29 0 R
- /A 15 0 R
+ /Count -5
+ /A 11 0 R
 >> endobj
 29 0 obj
 <<
- /Title (\376\377\0\62\0\56\0\63\0\40\0\61\0\67\0\40\0\106\0\145\0\142\0\162\0\165\0\141\0\162\0\171\0\40\0\62\0\60\0\60\0\67\0\40\0\55\0\40\0\122\0\145\0\154\0\145\0\141\0\163\0\145\0\40\0\62\0\56\0\61\0\40\0\141\0\166\0\141\0\151\0\154\0\141\0\142\0\154\0\145)
- /Parent 26 0 R
- /Prev 28 0 R
+ /Title (\376\377\0\62\0\56\0\61\0\40\0\62\0\66\0\40\0\101\0\165\0\147\0\165\0\163\0\164\0\40\0\62\0\60\0\60\0\67\0\40\0\55\0\40\0\114\0\165\0\143\0\145\0\156\0\145\0\40\0\141\0\164\0\40\0\101\0\160\0\141\0\143\0\150\0\145\0\103\0\157\0\156\0\40\0\101\0\164\0\154\0\141\0\156\0\164\0\141)
+ /Parent 28 0 R
  /Next 30 0 R
- /A 17 0 R
+ /A 13 0 R
 >> endobj
 30 0 obj
 <<
- /Title (\376\377\0\62\0\56\0\64\0\40\0\63\0\40\0\112\0\141\0\156\0\165\0\141\0\162\0\171\0\40\0\62\0\60\0\60\0\67\0\40\0\55\0\40\0\116\0\151\0\147\0\150\0\164\0\154\0\171\0\40\0\123\0\157\0\165\0\162\0\143\0\145\0\40\0\142\0\165\0\151\0\154\0\144\0\163\0\40\0\141\0\166\0\141\0\151\0\154\0\141\0\142\0\154\0\145)
- /Parent 26 0 R
+ /Title (\376\377\0\62\0\56\0\62\0\40\0\61\0\71\0\40\0\112\0\165\0\156\0\145\0\40\0\62\0\60\0\60\0\67\0\40\0\55\0\40\0\122\0\145\0\154\0\145\0\141\0\163\0\145\0\40\0\62\0\56\0\62\0\40\0\141\0\166\0\141\0\151\0\154\0\141\0\142\0\154\0\145)
+ /Parent 28 0 R
  /Prev 29 0 R
- /A 19 0 R
+ /Next 31 0 R
+ /A 15 0 R
 >> endobj
 31 0 obj
+<<
+ /Title (\376\377\0\62\0\56\0\63\0\40\0\61\0\70\0\40\0\106\0\145\0\142\0\162\0\165\0\141\0\162\0\171\0\40\0\62\0\60\0\60\0\67\0\40\0\55\0\40\0\114\0\165\0\143\0\145\0\156\0\145\0\40\0\141\0\164\0\40\0\101\0\160\0\141\0\143\0\150\0\145\0\103\0\157\0\156\0\40\0\105\0\165\0\162\0\157\0\160\0\145)
+ /Parent 28 0 R
+ /Prev 30 0 R
+ /Next 32 0 R
+ /A 17 0 R
+>> endobj
+32 0 obj
+<<
+ /Title (\376\377\0\62\0\56\0\64\0\40\0\61\0\67\0\40\0\106\0\145\0\142\0\162\0\165\0\141\0\162\0\171\0\40\0\62\0\60\0\60\0\67\0\40\0\55\0\40\0\122\0\145\0\154\0\145\0\141\0\163\0\145\0\40\0\62\0\56\0\61\0\40\0\141\0\166\0\141\0\151\0\154\0\141\0\142\0\154\0\145)
+ /Parent 28 0 R
+ /Prev 31 0 R
+ /Next 33 0 R
+ /A 19 0 R
+>> endobj
+33 0 obj
+<<
+ /Title (\376\377\0\62\0\56\0\65\0\40\0\63\0\40\0\112\0\141\0\156\0\165\0\141\0\162\0\171\0\40\0\62\0\60\0\60\0\67\0\40\0\55\0\40\0\116\0\151\0\147\0\150\0\164\0\154\0\171\0\40\0\123\0\157\0\165\0\162\0\143\0\145\0\40\0\142\0\165\0\151\0\154\0\144\0\163\0\40\0\141\0\166\0\141\0\151\0\154\0\141\0\142\0\154\0\145)
+ /Parent 28 0 R
+ /Prev 32 0 R
+ /A 21 0 R
+>> endobj
+34 0 obj
 << /Type /Font
 /Subtype /Type1
 /Name /F3
 /BaseFont /Helvetica-Bold
 /Encoding /WinAnsiEncoding >>
 endobj
-32 0 obj
+35 0 obj
 << /Type /Font
 /Subtype /Type1
 /Name /F5
 /BaseFont /Times-Roman
 /Encoding /WinAnsiEncoding >>
 endobj
-33 0 obj
+36 0 obj
 << /Type /Font
 /Subtype /Type1
 /Name /F1
 /BaseFont /Helvetica
 /Encoding /WinAnsiEncoding >>
 endobj
-34 0 obj
+37 0 obj
 << /Type /Font
 /Subtype /Type1
 /Name /F2
 /BaseFont /Helvetica-Oblique
 /Encoding /WinAnsiEncoding >>
 endobj
-35 0 obj
+38 0 obj
 << /Type /Font
 /Subtype /Type1
 /Name /F7
@@ -205,105 +224,114 @@ endobj
 1 0 obj
 << /Type /Pages
 /Count 3
-/Kids [6 0 R 21 0 R 23 0 R ] >>
+/Kids [6 0 R 23 0 R 25 0 R ] >>
 endobj
 2 0 obj
 << /Type /Catalog
 /Pages 1 0 R
- /Outlines 24 0 R
+ /Outlines 26 0 R
  /PageMode /UseOutlines
  >>
 endobj
 3 0 obj
 << 
-/Font << /F3 31 0 R /F5 32 0 R /F1 33 0 R /F2 34 0 R /F7 35 0 R >> 
+/Font << /F3 34 0 R /F5 35 0 R /F1 36 0 R /F2 37 0 R /F7 38 0 R >> 
 /ProcSet [ /PDF /ImageC /Text ] >> 
 endobj
 9 0 obj
 <<
 /S /GoTo
-/D [21 0 R /XYZ 85.0 659.0 null]
+/D [23 0 R /XYZ 85.0 659.0 null]
 >>
 endobj
 11 0 obj
 <<
 /S /GoTo
-/D [21 0 R /XYZ 85.0 545.866 null]
+/D [23 0 R /XYZ 85.0 545.866 null]
 >>
 endobj
 13 0 obj
 <<
 /S /GoTo
-/D [21 0 R /XYZ 85.0 514.732 null]
+/D [23 0 R /XYZ 85.0 514.732 null]
 >>
 endobj
 15 0 obj
 <<
 /S /GoTo
-/D [21 0 R /XYZ 85.0 309.479 null]
+/D [23 0 R /XYZ 85.0 291.079 null]
 >>
 endobj
 17 0 obj
 <<
 /S /GoTo
-/D [23 0 R /XYZ 85.0 659.0 null]
+/D [25 0 R /XYZ 85.0 616.6 null]
 >>
 endobj
 19 0 obj
 <<
 /S /GoTo
-/D [23 0 R /XYZ 85.0 525.747 null]
+/D [25 0 R /XYZ 85.0 443.747 null]
 >>
 endobj
-24 0 obj
+21 0 obj
 <<
- /First 25 0 R
- /Last 26 0 R
+/S /GoTo
+/D [25 0 R /XYZ 85.0 310.494 null]
+>>
+endobj
+26 0 obj
+<<
+ /First 27 0 R
+ /Last 28 0 R
 >> endobj
 xref
-0 36
+0 39
 0000000000 65535 f 
-0000007640 00000 n 
-0000007712 00000 n 
-0000007804 00000 n 
+0000008855 00000 n 
+0000008927 00000 n 
+0000009019 00000 n 
 0000000015 00000 n 
 0000000071 00000 n 
-0000000794 00000 n 
-0000000914 00000 n 
-0000000974 00000 n 
-0000007927 00000 n 
-0000001109 00000 n 
-0000007990 00000 n 
-0000001245 00000 n 
-0000008056 00000 n 
-0000001382 00000 n 
-0000008122 00000 n 
-0000001519 00000 n 
-0000008188 00000 n 
-0000001656 00000 n 
-0000008252 00000 n 
-0000001793 00000 n 
-0000003896 00000 n 
-0000004004 00000 n 
-0000005220 00000 n 
-0000008318 00000 n 
-0000005328 00000 n 
-0000005496 00000 n 
-0000005693 00000 n 
-0000005995 00000 n 
-0000006367 00000 n 
-0000006707 00000 n 
-0000007084 00000 n 
-0000007197 00000 n 
-0000007307 00000 n 
-0000007415 00000 n 
-0000007531 00000 n 
+0000000842 00000 n 
+0000000962 00000 n 
+0000001029 00000 n 
+0000009142 00000 n 
+0000001164 00000 n 
+0000009205 00000 n 
+0000001300 00000 n 
+0000009271 00000 n 
+0000001437 00000 n 
+0000009337 00000 n 
+0000001574 00000 n 
+0000009403 00000 n 
+0000001711 00000 n 
+0000009467 00000 n 
+0000001848 00000 n 
+0000009533 00000 n 
+0000001985 00000 n 
+0000004073 00000 n 
+0000004181 00000 n 
+0000006069 00000 n 
+0000009599 00000 n 
+0000006177 00000 n 
+0000006345 00000 n 
+0000006542 00000 n 
+0000006894 00000 n 
+0000007210 00000 n 
+0000007582 00000 n 
+0000007922 00000 n 
+0000008299 00000 n 
+0000008412 00000 n 
+0000008522 00000 n 
+0000008630 00000 n 
+0000008746 00000 n 
 trailer
 <<
-/Size 36
+/Size 39
 /Root 2 0 R
 /Info 4 0 R
 >>
 startxref
-8369
+9650
 %%EOF
diff --git a/docs/skin/images/rc-b-l-15-1body-2menu-3menu.png b/docs/skin/images/rc-b-l-15-1body-2menu-3menu.png
index cdb460a1da7..dd790d31697 100644
Binary files a/docs/skin/images/rc-b-l-15-1body-2menu-3menu.png and b/docs/skin/images/rc-b-l-15-1body-2menu-3menu.png differ
diff --git a/docs/skin/images/rc-b-r-15-1body-2menu-3menu.png b/docs/skin/images/rc-b-r-15-1body-2menu-3menu.png
index 3eff254fd17..790f43fa388 100644
Binary files a/docs/skin/images/rc-b-r-15-1body-2menu-3menu.png and b/docs/skin/images/rc-b-r-15-1body-2menu-3menu.png differ
diff --git a/docs/skin/images/rc-b-r-5-1header-2tab-selected-3tab-selected.png b/docs/skin/images/rc-b-r-5-1header-2tab-selected-3tab-selected.png
index b175f27b16e..1987c0aa476 100644
Binary files a/docs/skin/images/rc-b-r-5-1header-2tab-selected-3tab-selected.png and b/docs/skin/images/rc-b-r-5-1header-2tab-selected-3tab-selected.png differ
diff --git a/docs/skin/images/rc-t-l-5-1header-2searchbox-3searchbox.png b/docs/skin/images/rc-t-l-5-1header-2searchbox-3searchbox.png
index e9f4440d1f5..b69812acfd7 100644
Binary files a/docs/skin/images/rc-t-l-5-1header-2searchbox-3searchbox.png and b/docs/skin/images/rc-t-l-5-1header-2searchbox-3searchbox.png differ
diff --git a/docs/skin/images/rc-t-l-5-1header-2tab-selected-3tab-selected.png b/docs/skin/images/rc-t-l-5-1header-2tab-selected-3tab-selected.png
index f1e015b36c3..07e5ebeb723 100644
Binary files a/docs/skin/images/rc-t-l-5-1header-2tab-selected-3tab-selected.png and b/docs/skin/images/rc-t-l-5-1header-2tab-selected-3tab-selected.png differ
diff --git a/docs/skin/images/rc-t-l-5-1header-2tab-unselected-3tab-unselected.png b/docs/skin/images/rc-t-l-5-1header-2tab-unselected-3tab-unselected.png
index e9f4440d1f5..b69812acfd7 100644
Binary files a/docs/skin/images/rc-t-l-5-1header-2tab-unselected-3tab-unselected.png and b/docs/skin/images/rc-t-l-5-1header-2tab-unselected-3tab-unselected.png differ
diff --git a/docs/skin/images/rc-t-r-15-1body-2menu-3menu.png b/docs/skin/images/rc-t-r-15-1body-2menu-3menu.png
index 29388b5efc9..5e44a80812b 100644
Binary files a/docs/skin/images/rc-t-r-15-1body-2menu-3menu.png and b/docs/skin/images/rc-t-r-15-1body-2menu-3menu.png differ
diff --git a/docs/skin/images/rc-t-r-5-1header-2searchbox-3searchbox.png b/docs/skin/images/rc-t-r-5-1header-2searchbox-3searchbox.png
index 944ed73333d..cbaea9c9a7e 100644
Binary files a/docs/skin/images/rc-t-r-5-1header-2searchbox-3searchbox.png and b/docs/skin/images/rc-t-r-5-1header-2searchbox-3searchbox.png differ
diff --git a/docs/skin/images/rc-t-r-5-1header-2tab-selected-3tab-selected.png b/docs/skin/images/rc-t-r-5-1header-2tab-selected-3tab-selected.png
index c4d4a8c7ce3..6fe87de6193 100644
Binary files a/docs/skin/images/rc-t-r-5-1header-2tab-selected-3tab-selected.png and b/docs/skin/images/rc-t-r-5-1header-2tab-selected-3tab-selected.png differ
diff --git a/docs/skin/images/rc-t-r-5-1header-2tab-unselected-3tab-unselected.png b/docs/skin/images/rc-t-r-5-1header-2tab-unselected-3tab-unselected.png
index 944ed73333d..cbaea9c9a7e 100644
Binary files a/docs/skin/images/rc-t-r-5-1header-2tab-unselected-3tab-unselected.png and b/docs/skin/images/rc-t-r-5-1header-2tab-unselected-3tab-unselected.png differ
diff --git a/src/site/src/documentation/content/xdocs/index.xml b/src/site/src/documentation/content/xdocs/index.xml
index e7b633823ac..8bef9a5464e 100644
--- a/src/site/src/documentation/content/xdocs/index.xml
+++ b/src/site/src/documentation/content/xdocs/index.xml
@@ -22,6 +22,21 @@
 
         <section id="Lucene News">
           <title>Lucene News</title>
+          <section>
+            <title>26 August 2007 - Lucene at ApacheCon Atlanta</title>
+            <p><a href="http://www.us.apachecon.com"><img src="http://www.apache.org/ads/ApacheCon/2007-usa-125x125.png"  alt="ApacheCon US logo" /></a>
+              Lucene will once again be well represented at ApacheCon USA in Atlanta this November 12-16, 2007.  
+            </p>
+            <p>The following talks and trainings are scheduled for this year's conference:
+              <ul>
+                <li>November 12: <a href="http://us.apachecon.com/us2007/program/talk/1859">Lucene Boot Camp</a> by Grant Ingersoll.  An all-day training focusing on getting started with Lucene.</li>
+                <li>November 16, 9:00 am: <a href="http://us.apachecon.com/us2007/program/talk/1992">Apache Solr out of the Box</a> by Chris Hostetter. Introduction to Solr.</li>
+                <li>November 16, 10:00 am: <a href="http://us.apachecon.com/us2007/program/talk/1943">Building a Vertical Search Site using Apache Software</a> by Ken Krugler. Will cover many Lucene-based projects.</li>
+                <li>November 16, 3:00 pm: <a href="http://us.apachecon.com/us2007/program/talk/1953">Apache Lucene Performance</a> by Grant Ingersoll. Tips and techniques for improving Lucene performance.</li>
+                <li>November 16, 4:00 pm: <a href="http://us.apachecon.com/us2007/program/talk/2017"> Advanced Indexing Techniques with Apache Lucene</a> by Michael Busch. Information on payloads and advanced indexing techniques.</li>
+              </ul>
+            </p>
+          </section>
           <section>
             <title>19 June 2007 - Release 2.2 available</title>