From c6cbe9e66ae493f3c0040e7072f83179e424a7a1 Mon Sep 17 00:00:00 2001
From: Yonik Seeley <yonik@apache.org>
Date: Sat, 25 Feb 2006 02:37:53 +0000
Subject: [PATCH] features doc

git-svn-id: https://svn.apache.org/repos/asf/incubator/solr/trunk@380881 13f79535-47bb-0310-9956-ffa450edef68
---
 site/index.html                               |  20 ++-
 site/index.pdf                                | 164 ++++++++++--------
 site/issue_tracking.html                      |   3 +
 site/linkmap.html                             |   9 +
 site/linkmap.pdf                              |  32 ++--
 site/mailing_lists.html                       |   3 +
 site/tutorial.html                            |   3 +
 site/version_control.html                     |   3 +
 site/who.html                                 |   3 +
 .../documentation/content/xdocs/features.xml  | 132 ++++++++++++++
 .../src/documentation/content/xdocs/index.xml |  11 +-
 .../src/documentation/content/xdocs/site.xml  |   1 +
 12 files changed, 288 insertions(+), 96 deletions(-)
 create mode 100755 src/site/src/documentation/content/xdocs/features.xml

diff --git a/site/index.html b/site/index.html
index 952e255de85..b0f8916cde2 100755
--- a/site/index.html
+++ b/site/index.html
@@ -66,6 +66,9 @@ document.write("<text>Last Published:</text> " + document.lastModified);
 <div onclick="SwitchMenu('menu_1.2', 'skin/')" id="menu_1.2Title" class="menutitle">Documentation</div>
 <div id="menu_1.2" class="menuitemgroup">
 <div class="menuitem">
+<a href="features.html">Features</a>
+</div>
+<div class="menuitem">
 <a href="http://wiki.apache.org/solr/FAQ">FAQ</a>
 </div>
 <div class="menuitem">
@@ -139,25 +142,28 @@ document.write("<text>Last Published:</text> " + document.lastModified);
 <h2 class="boxed">Introduction</h2>
 <div class="section">
 <p>
-        Solr is an open source search server based on the
-        <a href="http://lucene.apache.org/java/">Lucene Java</a> search library.
-        It's normally run as a webapp in a servlet container
-        such as <a href="http://tomcat.apache.org">Tomcat</a>.
+        Solr is an open source enterprise search server based on the
+        <a href="http://lucene.apache.org/java/">Lucene Java</a> search library, with XML/HTTP APIs,
+        caching, replication, and a web administration interface.
+        It runs in a Java servlet container such as <a href="http://tomcat.apache.org">Tomcat</a>.
+      </p>
+<p>
+        See the complete <a href="features.html">feature list</a> for more details, then check out the <a href="tutorial.html">tutorial</a>.
       </p>
 </div>
 
     
-<a name="N1001F"></a><a name="news"></a>
+<a name="N1002A"></a><a name="news"></a>
 <h2 class="boxed">News</h2>
 <div class="section">
-<a name="N10025"></a><a name="21+February%2C+2006%3A+nightly+builds"></a>
+<a name="N10030"></a><a name="21+February%2C+2006%3A+nightly+builds"></a>
 <h3 class="boxed">21 February, 2006: nightly builds</h3>
 <p>Solr now has nightly builds.  This automatically creates a
       <a href="http://cvs.apache.org/dist/lucene/solr/nightly/">downloadable version of Solr every
       night</a>.  All unit tests must pass, or a message is sent to
       the developers mailing list and no new version is created.  This
       also updates the <a href="docs/api/">javadoc</a>.</p>
-<a name="N10037"></a><a name="17+January+2006%3A+Solr+Joins+Apache+Incubator"></a>
+<a name="N10042"></a><a name="17+January+2006%3A+Solr+Joins+Apache+Incubator"></a>
 <h3 class="boxed">17 January 2006: Solr Joins Apache Incubator</h3>
 <p>Solr, a search server based on Lucene, has been accepted into the Apache Incubator.
             Solr was originally developed by CNET Networks, and is widely used within CNET
diff --git a/site/index.pdf b/site/index.pdf
index 9cff2179717..3c3b8b9d71d 100755
--- a/site/index.pdf
+++ b/site/index.pdf
@@ -69,10 +69,10 @@ endobj
 >>
 endobj
 16 0 obj
-<< /Length 1545 /Filter [ /ASCII85Decode /FlateDecode ]
+<< /Length 1797 /Filter [ /ASCII85Decode /FlateDecode ]
  >>
 stream
-Gatm;>E>7C'Roe[R("D?11@=Nhi]B,AQ;09f2<^E5)`q$VT"M;A^UMS*l*"1/6IoFXgD\jq7c<f3B'-<2kROJs#'n;i[>A6qj!+_^FG$a6HVGoJ,&nRZAAZ%&?R5UQ`@ZHb7nMSP1#NLk-rTjmH35186GW'p2Lb-r<<hkO-*kO'_&[\gEZOc'r.tS>Md91qGPh>9:Ma&>k+9\9t'eK<7W:A4qe;q,HXIN=A=Ve@=02hP&a$'3,h'k]_&:.jf_D;YMI<p<TTZ)Z"RuKR2k_-I'O$#B.BAp0EbAt/@KF-fm?chON-2rblc*UE[3sZaqZ":jS_AtUa6P(\`^Z^Oc@q<$ubVg9k'#\dO@[VWiqT""OJrT.&8?BWrNs8Q]5>:]m2AGTf?uo*9$t_?_&9)T']-K53%0nImSop\FO>(r:pac%?DXsV"V<0K+?)_kjXq@h3l^u"];Q"=r.paXo46t't)-j*%=m?NTg/'O,5S09+W#iTQd]#W#h9a"i^i+/`"!J@d57`T>CK,F<^&JC57Zj.X_Y2XWE[);IN+=^^!:J*V<Ff<iZs&l'Mgo4e8;kd"q.GfVH@j$-61WDNe2.8VWI&3SK/P+_UfNcL/gZUAGCG*!H+N'].OB:j:<8.7$[oVcVXt@Q<1g<"(PS/VR/D7AEC)<RSalIW</kZ_@o^\iiaPE)XBDWO$-Vf1Yh%f$nl3OXi9ucBr;W/#``X7j8,7>510<A]t;]R@LjsaIPoI/mkZXF0:O/?"\WnU#lnp5[uCt+\("2.oHhiWL@s0bVmB,fYhp@QOmU9&Tr;8d!OH&oX`(#WDh<,7UN!;$)"0r.aU+8G22m;!>^sGEBC&mgRL=^!"_Iqc#3$Nhhooe#_V:T\O1C)O,uL:K*nJCI^udWFPb&b3B^$-ljHP,6_]oE$$`**IaJiIC7C=W2+maU;k\so;cTbI\oP%j+)P#G4dt;J]r>h!g"^CG)]'q_0Sd3C`*,j#B>kpQ+]t6`;Ht?l[;D67&K/X&^Sb5HUj4ACl$<f`.n&!ZdV7rNT0dgq@M).^p>6+-J>nGsrm!+7e"\%<rdj;dFii(MEM5Y$s2^m$L+u)'r9Xqs_YBd52E#52G-K>#hj^A+c`?GYg+)Ps<hR?TIkh<?ZnFkrlqHfhea>"HURLLemG8H[4-"(-S&JY.NfT[g;Zjj2k('#Ahc(pom&@uq=g=EBX"L,^5&N$[o[F&k++piCPhA5NVF/@jj@Ii34oY6LdhWIcFmI2"EW);94ANsU9._K*-;JB`qLH=)VEEK_Vp[^/'QPoBgdOjZVoD[cD/Pt>OZ]h>njN8J8aPMOG,8uT8YJf$am>\qeX<PZ9RV-*#n6PfmUR/3&T\ROFtk$KErN:gif:\]0[n(9k+dp&jic5d+$uU92c$BtOUkfdWXJaF1%<kd?NI>12oLkKiL0\sF!nJZEMT316fL??iLs5\K>FHQX;-R;=E:PM+5Q1l*',/!7@drfiemP3<sSY<42gWmn1d)-+5CA^RM+GeF%l[h)k$aqgP/0X/:-^kX_j]4.B8s="2H_f'E~>
+Gatm<9on$e&A@sBka2>V6W+UEop,a61dN$r)Zq\=p-;8U>E(2EUpS/@q[Opq*6FB0+Me,k-;D351Rud>ZX1=LYPqg)P,&Bn"8>kNk5Ih,9nL/sKB4b9HQT=e8n]=l!P_(a5/1V?@A*sc%Q:@p=)ZZj=*JZ"gk#.9M?_fM+M\KqqPtfnj"aa*K0Pt_niV0=4.'Y&WlEP6Rl*W?4V.N%efT69=blMG6lZPs83'MiKHqf%-t'\8*g:V67,2j4WCu8S$gU$Xb($Q))Qdi3RS<UdXr;-eVQaa[C1X[k?COHEQo<+P*"a=gAuDoR^#5Hh_`/f%ih-8t4:_(9?m1A;12N32j2AbgpsPYiFOr\9?ic>INUWplFL=LtiGbU`.d870S,e3sp_$p:(e"$5]r3%'UH/^=SOj*5K(MR2:J_fGUWh0p^N1rph$Ioa+>e(iFXVb;o'+]Nlh.s+p%nZ?73J#@G"&f-4%:=7,#cd0?XS@Mn#_Z_H@tq_I8L`f0rfHqZXZ$4HVg-M+jqLU[^,]#//,>F8DP\R#X'-O4I-m/B6Db'U;FW[>AR>O(EA2d8gM>uP_LH'n'4?qG^A5V`EPK[(NEaL_729ri:6bS195BL$.(%"XXBh*2;]Lk'MEG^@R8F1!#R)h;pT`KU[L-Z;9r`sJKD15>-l..+TYW`Y-MBJ$C_%bLnlb4"Ro2A>kG=fi2Ui/_35NX;QE8.[''ooFKWHt8fUe!%`j@1S^+sD>hM$E,YLE@OVGKi#UMn3ZD'/Dj"\1j:#"0p:utpt3]$QkA0g%+(#$_D>$pa$QJ/U]6^d&#pC_J16U'h2>qE/kPh.bQSh;31Q&+makf!:Q"N6A<WD;EB:/K[Y+U4KVo>$doI&Ap#*N+<\WVjjkX(&\VasU/XgS2oqR"[lY&Z:9"OEBP8?&(tE1aV*cgJQKk^Xt"4^To"gf=Oo/!m\?3g6&?IhoZ?Q'l?H@@D9X@nAYl!$q05#XG\"RA`."[VB4cVJlL%]@o_)0=.=4bA1(WB4hApf#n]lT@S0NIQ6CYJ%TeeBd'VIt$]<UafT%Prc?9L+:*C7ZF+_-gRn2E4@7es'WhY\XBeBGI(a,RD7`,]p0*5N^dOD>/9#&WLdgH-VWEHMGXQlu5Bf3E:dt5)XE5s],*>*o4-D:VP4,ZM)HV#S[a3k.g9NgnIkV,U0YKP?Ig8_sM;;2;/rP#]'bCd+1ki)Z']#MFl<c(^E`qdWkm"<sUKiTZ."-tW/)(Z0FI-@&>Iu]4%[EB9dY4Q_:V\>/5kXF"HakS8]HoZtJ(=BOFI%36a3tC,$=9>3^q<sgsKQ2YmIcmSopPa\<q?L3u]Zt,Z_c*5g5I0Mb,(c[=rUp<[ngR5b:nVg__.#Nl<3AD<QKN7er)ab[dWp7kkmKN*LFR'uWi=6PobJO%">7I"H@q)7GJ0B'Q1(+:q\^BiNr"9c`XT2q14<gi'$Q,(Z+"BjZ=N"UH))CKJ@\nM<+\h//ZNfS0a'KLCP0?Mqt]%d2kJ:!2IGk"J;aU$=QCA6[3Hp-+W_0,@ifHPK;fpn$CM_Dm[U._&ef95eEBdpW[`@!IcZ^MDFbj4c,S7'4%aU_3iEK5^S]A$Lt#LM4@k:DIco.-R.;@(f4-r1`VEf+0UHrD5_2L:aTij4bKJ>Fm9Q@3R)ICoo:ZR^cLDt\a(J?M#^A`+q6Y'a48ShQ,rh*.,X8&Pi'7e2Z&!?&K@(j-;32(1jHL85eqYX%=$48kS72EV&b@N>#Q/>mqf'=>52EEWe.9f$)74Hd[oM;`'8<)pIA-!D*OeIQh*l+>Ep%q2G-0p~>
 endstream
 endobj
 17 0 obj
@@ -91,12 +91,14 @@ endobj
 21 0 R
 22 0 R
 23 0 R
+24 0 R
+25 0 R
 ]
 endobj
 19 0 obj
 << /Type /Annot
 /Subtype /Link
-/Rect [ 327.936 629.666 387.576 617.666 ]
+/Rect [ 378.252 629.666 437.892 617.666 ]
 /C [ 0 0 0 ]
 /Border [ 0 0 0 ]
 /A << /URI (http://lucene.apache.org/java/)
@@ -107,7 +109,7 @@ endobj
 20 0 obj
 << /Type /Annot
 /Subtype /Link
-/Rect [ 311.94 616.466 348.6 604.466 ]
+/Rect [ 210.636 603.266 247.296 591.266 ]
 /C [ 0 0 0 ]
 /Border [ 0 0 0 ]
 /A << /URI (http://tomcat.apache.org)
@@ -118,10 +120,10 @@ endobj
 21 0 obj
 << /Type /Annot
 /Subtype /Link
-/Rect [ 365.316 534.079 536.616 522.079 ]
+/Rect [ 174.984 582.066 225.972 570.066 ]
 /C [ 0 0 0 ]
 /Border [ 0 0 0 ]
-/A << /URI (http://cvs.apache.org/dist/lucene/solr/nightly/)
+/A << /URI (features.html)
 /S /URI >>
 /H /I
 >>
@@ -129,10 +131,10 @@ endobj
 22 0 obj
 << /Type /Annot
 /Subtype /Link
-/Rect [ 90.0 520.879 114.672 508.879 ]
+/Rect [ 401.604 582.066 436.272 570.066 ]
 /C [ 0 0 0 ]
 /Border [ 0 0 0 ]
-/A << /URI (http://cvs.apache.org/dist/lucene/solr/nightly/)
+/A << /URI (tutorial.html)
 /S /URI >>
 /H /I
 >>
@@ -140,7 +142,29 @@ endobj
 23 0 obj
 << /Type /Annot
 /Subtype /Link
-/Rect [ 283.968 507.679 321.288 495.679 ]
+/Rect [ 365.316 499.679 536.616 487.679 ]
+/C [ 0 0 0 ]
+/Border [ 0 0 0 ]
+/A << /URI (http://cvs.apache.org/dist/lucene/solr/nightly/)
+/S /URI >>
+/H /I
+>>
+endobj
+24 0 obj
+<< /Type /Annot
+/Subtype /Link
+/Rect [ 90.0 486.479 114.672 474.479 ]
+/C [ 0 0 0 ]
+/Border [ 0 0 0 ]
+/A << /URI (http://cvs.apache.org/dist/lucene/solr/nightly/)
+/S /URI >>
+/H /I
+>>
+endobj
+25 0 obj
+<< /Type /Annot
+/Subtype /Link
+/Rect [ 283.968 473.279 321.288 461.279 ]
 /C [ 0 0 0 ]
 /Border [ 0 0 0 ]
 /A << /URI (docs/api/)
@@ -148,66 +172,66 @@ endobj
 /H /I
 >>
 endobj
-25 0 obj
-<<
- /Title (\376\377\0\61\0\40\0\111\0\156\0\164\0\162\0\157\0\144\0\165\0\143\0\164\0\151\0\157\0\156)
- /Parent 24 0 R
- /Next 26 0 R
- /A 9 0 R
->> endobj
-26 0 obj
-<<
- /Title (\376\377\0\62\0\40\0\116\0\145\0\167\0\163)
- /Parent 24 0 R
- /First 27 0 R
- /Last 28 0 R
- /Prev 25 0 R
- /Count -2
- /A 11 0 R
->> endobj
 27 0 obj
 <<
- /Title (\376\377\0\62\0\56\0\61\0\40\0\62\0\61\0\40\0\106\0\145\0\142\0\162\0\165\0\141\0\162\0\171\0\54\0\40\0\62\0\60\0\60\0\66\0\72\0\40\0\156\0\151\0\147\0\150\0\164\0\154\0\171\0\40\0\142\0\165\0\151\0\154\0\144\0\163)
+ /Title (\376\377\0\61\0\40\0\111\0\156\0\164\0\162\0\157\0\144\0\165\0\143\0\164\0\151\0\157\0\156)
  /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\67\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\66\0\72\0\40\0\123\0\157\0\154\0\162\0\40\0\112\0\157\0\151\0\156\0\163\0\40\0\101\0\160\0\141\0\143\0\150\0\145\0\40\0\111\0\156\0\143\0\165\0\142\0\141\0\164\0\157\0\162)
+ /Title (\376\377\0\62\0\40\0\116\0\145\0\167\0\163)
  /Parent 26 0 R
+ /First 29 0 R
+ /Last 30 0 R
  /Prev 27 0 R
- /A 15 0 R
+ /Count -2
+ /A 11 0 R
 >> endobj
 29 0 obj
+<<
+ /Title (\376\377\0\62\0\56\0\61\0\40\0\62\0\61\0\40\0\106\0\145\0\142\0\162\0\165\0\141\0\162\0\171\0\54\0\40\0\62\0\60\0\60\0\66\0\72\0\40\0\156\0\151\0\147\0\150\0\164\0\154\0\171\0\40\0\142\0\165\0\151\0\154\0\144\0\163)
+ /Parent 28 0 R
+ /Next 30 0 R
+ /A 13 0 R
+>> endobj
+30 0 obj
+<<
+ /Title (\376\377\0\62\0\56\0\62\0\40\0\61\0\67\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\66\0\72\0\40\0\123\0\157\0\154\0\162\0\40\0\112\0\157\0\151\0\156\0\163\0\40\0\101\0\160\0\141\0\143\0\150\0\145\0\40\0\111\0\156\0\143\0\165\0\142\0\141\0\164\0\157\0\162)
+ /Parent 28 0 R
+ /Prev 29 0 R
+ /A 15 0 R
+>> endobj
+31 0 obj
 << /Type /Font
 /Subtype /Type1
 /Name /F3
 /BaseFont /Helvetica-Bold
 /Encoding /WinAnsiEncoding >>
 endobj
-30 0 obj
+32 0 obj
 << /Type /Font
 /Subtype /Type1
 /Name /F5
 /BaseFont /Times-Roman
 /Encoding /WinAnsiEncoding >>
 endobj
-31 0 obj
+33 0 obj
 << /Type /Font
 /Subtype /Type1
 /Name /F1
 /BaseFont /Helvetica
 /Encoding /WinAnsiEncoding >>
 endobj
-32 0 obj
+34 0 obj
 << /Type /Font
 /Subtype /Type1
 /Name /F2
 /BaseFont /Helvetica-Oblique
 /Encoding /WinAnsiEncoding >>
 endobj
-33 0 obj
+35 0 obj
 << /Type /Font
 /Subtype /Type1
 /Name /F7
@@ -222,13 +246,13 @@ 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 29 0 R /F5 30 0 R /F1 31 0 R /F2 32 0 R /F7 33 0 R >> 
+/Font << /F3 31 0 R /F5 32 0 R /F1 33 0 R /F2 34 0 R /F7 35 0 R >> 
 /ProcSet [ /PDF /ImageC /Text ] >> 
 endobj
 9 0 obj
@@ -240,68 +264,70 @@ endobj
 11 0 obj
 <<
 /S /GoTo
-/D [17 0 R /XYZ 85.0 593.466 null]
+/D [17 0 R /XYZ 85.0 559.066 null]
 >>
 endobj
 13 0 obj
 <<
 /S /GoTo
-/D [17 0 R /XYZ 85.0 562.332 null]
+/D [17 0 R /XYZ 85.0 527.932 null]
 >>
 endobj
 15 0 obj
 <<
 /S /GoTo
-/D [17 0 R /XYZ 85.0 484.679 null]
+/D [17 0 R /XYZ 85.0 450.279 null]
 >>
 endobj
-24 0 obj
+26 0 obj
 <<
- /First 25 0 R
- /Last 26 0 R
+ /First 27 0 R
+ /Last 28 0 R
 >> endobj
 xref
-0 34
+0 36
 0000000000 65535 f 
-0000005662 00000 n 
-0000005727 00000 n 
-0000005819 00000 n 
+0000006265 00000 n 
+0000006330 00000 n 
+0000006422 00000 n 
 0000000015 00000 n 
 0000000071 00000 n 
 0000000697 00000 n 
 0000000817 00000 n 
 0000000863 00000 n 
-0000005942 00000 n 
+0000006545 00000 n 
 0000000998 00000 n 
-0000006005 00000 n 
+0000006608 00000 n 
 0000001135 00000 n 
-0000006071 00000 n 
+0000006674 00000 n 
 0000001272 00000 n 
-0000006137 00000 n 
+0000006740 00000 n 
 0000001409 00000 n 
-0000003047 00000 n 
-0000003170 00000 n 
-0000003225 00000 n 
-0000003409 00000 n 
-0000003584 00000 n 
-0000003785 00000 n 
-0000003983 00000 n 
-0000006203 00000 n 
-0000004146 00000 n 
-0000004309 00000 n 
-0000004465 00000 n 
-0000004753 00000 n 
-0000005106 00000 n 
-0000005219 00000 n 
-0000005329 00000 n 
-0000005437 00000 n 
-0000005553 00000 n 
+0000003299 00000 n 
+0000003422 00000 n 
+0000003491 00000 n 
+0000003675 00000 n 
+0000003853 00000 n 
+0000004020 00000 n 
+0000004187 00000 n 
+0000004388 00000 n 
+0000004586 00000 n 
+0000006806 00000 n 
+0000004749 00000 n 
+0000004912 00000 n 
+0000005068 00000 n 
+0000005356 00000 n 
+0000005709 00000 n 
+0000005822 00000 n 
+0000005932 00000 n 
+0000006040 00000 n 
+0000006156 00000 n 
 trailer
 <<
-/Size 34
+/Size 36
 /Root 2 0 R
 /Info 4 0 R
 >>
 startxref
-6254
+6857
 %%EOF
diff --git a/site/issue_tracking.html b/site/issue_tracking.html
index 7678717bf80..50713b65a4b 100755
--- a/site/issue_tracking.html
+++ b/site/issue_tracking.html
@@ -66,6 +66,9 @@ document.write("<text>Last Published:</text> " + document.lastModified);
 <div onclick="SwitchMenu('menu_1.2', 'skin/')" id="menu_1.2Title" class="menutitle">Documentation</div>
 <div id="menu_1.2" class="menuitemgroup">
 <div class="menuitem">
+<a href="features.html">Features</a>
+</div>
+<div class="menuitem">
 <a href="http://wiki.apache.org/solr/FAQ">FAQ</a>
 </div>
 <div class="menuitem">
diff --git a/site/linkmap.html b/site/linkmap.html
index 77df022e3fd..ec7c0b31c0d 100755
--- a/site/linkmap.html
+++ b/site/linkmap.html
@@ -66,6 +66,9 @@ document.write("<text>Last Published:</text> " + document.lastModified);
 <div onclick="SwitchMenu('menu_1.2', 'skin/')" id="menu_1.2Title" class="menutitle">Documentation</div>
 <div id="menu_1.2" class="menuitemgroup">
 <div class="menuitem">
+<a href="features.html">Features</a>
+</div>
+<div class="menuitem">
 <a href="http://wiki.apache.org/solr/FAQ">FAQ</a>
 </div>
 <div class="menuitem">
@@ -158,6 +161,12 @@ document.write("<text>Last Published:</text> " + document.lastModified);
 </li>
 <ul>
     
+<ul>
+<li>
+<a href="features.html">Features</a>&nbsp;&nbsp;&nbsp;_________________________&nbsp;&nbsp;<em>features</em>
+</li>
+</ul>
+    
 <ul>
 <li>
 <a href="http://wiki.apache.org/solr/FAQ">FAQ</a>&nbsp;&nbsp;&nbsp;_________________________&nbsp;&nbsp;<em>faq</em>
diff --git a/site/linkmap.pdf b/site/linkmap.pdf
index 3197f276b40..1f0d2e11795 100755
--- a/site/linkmap.pdf
+++ b/site/linkmap.pdf
@@ -36,10 +36,10 @@ endobj
 >>
 endobj
 10 0 obj
-<< /Length 1005 /Filter [ /ASCII85Decode /FlateDecode ]
+<< /Length 1030 /Filter [ /ASCII85Decode /FlateDecode ]
  >>
 stream
-Gatn&bAs(+'Sc?EKpKitMXD*M-`JoDUn'>NRRPuq-s3ol#]]nmmFt]IC4m8CK%`!b@6";-dJ;2K1^ZE7_/k."$5K;.g+nVf/OuK9+CBc[5Ar2?&0cp\i6;-T?L?&mLR9iY)t4Dd%SieWA0CuV:5DpO!pdWjE*j$B9,VlM$P5IPY=BENK,LZ+*(B]I2;QW^])=FSPpS#>A+1L,=3VcD3q,S]6Q&iir$A(*^ci;6Qo%'V(r@HU%Eg[sGUma=i,?o]8@96ffj&K/e(c\#L@N=2B-1'bM+L#@&RrGP78fS(@CTN_(e?n9II7um%EJC_m`K6GP_KD]\d:Dk-)q&P8Vl6$\i4>>T?K\U2eSgn4e3j&RU>)c6:*Op[]s,3h0T;bcR7^-=#$Bo4n2D)H?qSM:qVj9DWBQ:o7AS.RnZSS+tsEs:Mjh+@Q^,*gm@=-hI?J0,*W?D'NY'US-Yl55MRWIaaZVI,[Tf(,>9Z,6Z.^'V9K[E:7XTVKj[';EZ]Rc:?!Eeb\o*q(S'(\1!R,9/i-j3Dj.FuX,XnS))B(2.I8[Jbu?a,+=01E]Sen<6qW5nE,K$heEZ/Fgp&2MT$VL"H&U%N_#pS0W09'[f%i/i-Ug$MP73/,1=hYKh86;SnWe`]I)mh)7BuHUb#,>%`s-r!X6Wnn6fZ?:Q-T/h;osfBo>TcZo2,/7QJ>5W3?t>C\M%4#A>@_L>RXgaeYQDlTJsF[C#Z)q5i&_>$0s$YpQ<Me9')/"Y'7.m]Fqa&07%B410CC&dnEu.0he['4S<Di`g_f&Pg!]8oi)F:#Z.\3p$]j_?5]Y+@b4\FY\d,#-?;SOF<-/[Q+sZG-b]0lkc-GBRp_1#Pe?CSh'0n?c?[r_c3JsV$+Zl;\4;aGXko%Dp[s=IN)BI%!#:WTHS5Mh3u\M:'Q`KJ$$Bjh^[l!L.I24Ycg;@iEAo'IM/F#E9K/>WFmP1Xm&GH`\T_RmGM0:iSY110RWa<e]C<h;0_pW0_Cg%^!)%kgUA~>
+Gatn&bAs(+'Sc?EKpKt-WpZ4MPLQ"DdS?5bc(aTI'J)=&"?B_Mp?aBG28TZ261#PB0KT6SOa_Co&kDEMkV5D#Bn[sKNXXt1aH9L''H8b*kLDSK1kGu=cMT?Uc1s*V&5rc?$Z;`cd7G=k>tTX:)rc!n^aAUar"k!g/#3)e!TF@RoaQXGi0^l[hSeP7Z[L<)qt!aQ=#R8),Oc_l+1`i8D;b"+%qSQDnX#%e%`JDR"&(bK+Um<@nW)]M+ab[,G0++HO-/.=@']*;mBXSbb)Z#4fOl:)]SK-9Ka=qLe2"/m^G(IW0T^fQL>9fdG8uNF=',!t.+JP@V@,F[-(53H8Vg]N]!5Dt*pcQQ5A"*(JPMZ;m&t+Y+e]et]6!p=]*ThBU6pe\r/B$d%)aN5gYq6f61I#(R7lfMmfcXd/t\P,7A/4BTXJl43Lrm=pXAd8DeVpG(Ufi,k5EKB5\Ril4@P%QQoC=hcSNCj5#>@Na%7JPnYe+hqt,@\KbD^KbUFlq`uG]CPq,arboK.YKjY"VC*._YNfu1"/2#iS*^+;:lb%EKDG:ZlRVb+IK@ZoYdP2hKg!\D>1><(>5tV>J73?e)M1,mT0uB?*c80*6F*#C5g]^$FIH1\qWqi#25+4<$o1_Hn(MR$sbToOo;T8pHM(^AQ1;0hfaiD'b^+ASXc%lakgiqt'=FEX"bH4T!D02Y1S8p@HRkM2u]-S[MWX:]6jc#;Pje6YhPYYJ<;E8WcbZ&c9K3f>]VbQ;K!:#IH9%ZCS]8o(>=00ECFAXDD&#R,Io46uY<<eqW#+F4?A-.s.4m&_>Fd:b,bb/K1K5.'"!(MKjD"'"Tou]5t')S]$k[!0&QFOt'8m`YHdeGo=Ik]W]]PmKQD2F:8KTbdRHb]">VQO;#Fo?k6pHj>n!WLWFjA,0lCkd6]!6/]];1XTq`e3Xck2(iE"3!A`mR!JUmI)7Tgf84(Ak1bmc#MVb#`681hq>`KfU=(%?b:IRCl7/ndae/nXmBHB/^*u[X'GpH>MA)YY$dm65:.:AH2~>
 endstream
 endobj
 11 0 obj
@@ -129,25 +129,25 @@ endobj
 xref
 0 20
 0000000000 65535 f 
-0000002849 00000 n 
-0000002914 00000 n 
-0000003006 00000 n 
+0000002874 00000 n 
+0000002939 00000 n 
+0000003031 00000 n 
 0000000015 00000 n 
 0000000071 00000 n 
 0000000519 00000 n 
 0000000639 00000 n 
 0000000664 00000 n 
-0000003140 00000 n 
+0000003165 00000 n 
 0000000799 00000 n 
-0000001897 00000 n 
-0000003203 00000 n 
-0000002005 00000 n 
-0000002182 00000 n 
-0000002295 00000 n 
-0000002405 00000 n 
-0000002516 00000 n 
-0000002624 00000 n 
-0000002740 00000 n 
+0000001922 00000 n 
+0000003228 00000 n 
+0000002030 00000 n 
+0000002207 00000 n 
+0000002320 00000 n 
+0000002430 00000 n 
+0000002541 00000 n 
+0000002649 00000 n 
+0000002765 00000 n 
 trailer
 <<
 /Size 20
@@ -155,5 +155,5 @@ trailer
 /Info 4 0 R
 >>
 startxref
-3254
+3279
 %%EOF
diff --git a/site/mailing_lists.html b/site/mailing_lists.html
index c150082bba0..2d63cdd651f 100755
--- a/site/mailing_lists.html
+++ b/site/mailing_lists.html
@@ -66,6 +66,9 @@ document.write("<text>Last Published:</text> " + document.lastModified);
 <div onclick="SwitchMenu('menu_1.2', 'skin/')" id="menu_1.2Title" class="menutitle">Documentation</div>
 <div id="menu_1.2" class="menuitemgroup">
 <div class="menuitem">
+<a href="features.html">Features</a>
+</div>
+<div class="menuitem">
 <a href="http://wiki.apache.org/solr/FAQ">FAQ</a>
 </div>
 <div class="menuitem">
diff --git a/site/tutorial.html b/site/tutorial.html
index 524e37c6427..ef5bdb8e916 100755
--- a/site/tutorial.html
+++ b/site/tutorial.html
@@ -66,6 +66,9 @@ document.write("<text>Last Published:</text> " + document.lastModified);
 <div onclick="SwitchMenu('menu_selected_1.2', 'skin/')" id="menu_selected_1.2Title" class="menutitle" style="background-image: url('skin/images/chapter_open.gif');">Documentation</div>
 <div id="menu_selected_1.2" class="selectedmenuitemgroup" style="display: block;">
 <div class="menuitem">
+<a href="features.html">Features</a>
+</div>
+<div class="menuitem">
 <a href="http://wiki.apache.org/solr/FAQ">FAQ</a>
 </div>
 <div class="menuitem">
diff --git a/site/version_control.html b/site/version_control.html
index 9f3864bde1e..2170dcd4676 100755
--- a/site/version_control.html
+++ b/site/version_control.html
@@ -66,6 +66,9 @@ document.write("<text>Last Published:</text> " + document.lastModified);
 <div onclick="SwitchMenu('menu_1.2', 'skin/')" id="menu_1.2Title" class="menutitle">Documentation</div>
 <div id="menu_1.2" class="menuitemgroup">
 <div class="menuitem">
+<a href="features.html">Features</a>
+</div>
+<div class="menuitem">
 <a href="http://wiki.apache.org/solr/FAQ">FAQ</a>
 </div>
 <div class="menuitem">
diff --git a/site/who.html b/site/who.html
index 0eb058d5b1d..ade78d36a86 100755
--- a/site/who.html
+++ b/site/who.html
@@ -66,6 +66,9 @@ document.write("<text>Last Published:</text> " + document.lastModified);
 <div onclick="SwitchMenu('menu_1.2', 'skin/')" id="menu_1.2Title" class="menutitle">Documentation</div>
 <div id="menu_1.2" class="menuitemgroup">
 <div class="menuitem">
+<a href="features.html">Features</a>
+</div>
+<div class="menuitem">
 <a href="http://wiki.apache.org/solr/FAQ">FAQ</a>
 </div>
 <div class="menuitem">
diff --git a/src/site/src/documentation/content/xdocs/features.xml b/src/site/src/documentation/content/xdocs/features.xml
new file mode 100755
index 00000000000..ce6431d0247
--- /dev/null
+++ b/src/site/src/documentation/content/xdocs/features.xml
@@ -0,0 +1,132 @@
+<?xml version="1.0"?>
+
+<!DOCTYPE document PUBLIC "-//APACHE//DTD Documentation V2.0//EN" 
+          "http://forrest.apache.org/dtd/document-v20.dtd">
+
+<document>
+
+<header>
+  <title>Introduction to The Solar Enterprise Search Server</title> 
+</header> 
+
+<body>
+
+<section>
+<title>Solr in a Nutshell</title>
+  <p>
+  Solar is a standalone enterprise search server with a web-services like API. You put documents in it (called "indexing") via XML over HTTP. You query it via HTTP GET and receive XML results.
+  </p>
+  <ul>
+    <li> Advanced Full-Text Search Capabilities </li>
+    <li> Optimized for High Volume Web Traffic </li>
+    <li> Standards Based Open Interfaces - XML and HTTP </li>
+    <li> Comprehensive HTML Administration Interfaces </li>
+    <li> Scalability - Efficient Replication to other Solar Search Servers </li>
+    <li> Flexible and Adaptable with XML configuration </li>
+    <li> Extensible Plugin Architecture </li>
+  </ul>
+</section>
+
+<section>
+<title>Solar Uses the Lucene Search Library and Extends it!</title>
+  <ul>
+    <li> A Real Data Schema, with Dynamic Fields, Unique Keys </li>
+    <li> Powerful Extensions to the Lucene Query Language </li>
+    <li> Support for Dynamic Result Grouping and Filtering </li>
+    <li> Advanced, Configurable Text Analysis </li>
+    <li> Highly Configurable and User Extensible Caching </li>
+    <li> Performance Optimizations </li>
+    <li> External Configuration via XML </li>
+    <li> An Administration Interface </li>
+    <li> Monitorable Logging </li>
+    <li> Fast Incremental Updates and Snapshot Distribution </li>
+  </ul>
+</section>
+
+<section>
+<title>Detailed Features</title>
+
+  <section><title>Schema</title>
+    <ul>
+      <li>Defines the field types and fields of documents</li>
+      <li>Can drive more intelligent processing</li>
+      <li>Declarative Lucene Analyzer specification</li>
+      <li>Dynamic Fields enables on-the-fly addition of fields</li>
+      <li>CopyField functionality allows indexing a single field multiple ways, or combining multiple fields into a single searchable field</li>
+      <li>Explicit types eliminates the need for guessing types of fields</li>
+      <li>External file-based configuration of stopword lists, synonym lists, and protected word lists</li>
+    </ul>
+  </section>
+
+  <section><title>Query</title>
+    <ul>
+      <li>Sort specifications added to query language</li>
+      <li>Constant scoring range and prefix queries - no idf, coord, or lengthNorm factors, and no restriction on the number of terms the query matches.</li>
+      <li>Function Query - influence the score by a function of a field's numeric value or ordinal</li>
+      <li>Performance Optimizations</li>
+    </ul>
+  </section>
+
+  <section><title>Core</title>
+    <ul>
+      <li>Pluggable query handlers and extensible XML data format</li>
+      <li>Document uniqueness enforcement based on unique key field</li>
+      <li>Batches updates and deletes for high performance</li>
+      <li>User configurable commands triggered on index changes</li>
+      <li>Searcher concurrency control</li>
+      <li>Correct handling of numeric types for both sorting and range queries</li>
+      <li>Ability to control where docs with the sort field missing will be placed</li>
+      <li>Support for dynamic grouping of search results</li>
+    </ul>
+  </section>
+
+  <section><title>Caching</title>
+    <ul>
+      <li>Configurable Query Result, Filter, and Document cache instances</li>
+      <li>Pluggable Cache implementations</li>
+      <li>Cache warming in background
+        <ul><li> When a new searcher is opened, configurable searches are run against
+            it in order to warm it up to avoid
+            slow first hits.  During warming, the current searcher handles live requests.
+        </li></ul>
+      </li>
+      <li>Autowarming in background
+        <ul>
+          <li>The most recently accessed items in the caches of the current
+            searcher are re-populated in the new searcher, enabing high cache hit
+            rates across index/searcher changes.</li>
+        </ul>
+      </li>
+      <li>Fast/small filter implementation</li>
+      <li>User level caching with autowarming support</li>
+    </ul>
+  </section>
+
+  <section><title>Replication</title>
+    <ul>
+      <li>Efficient distribution of index parts that have changed via rsync transport</li>
+      <li>Pull strategy allows for easy addition of searchers</li>
+      <li>Configurable distribution interval allows tradeoff between timeliness and cache utilization</li>
+    </ul>
+  </section>
+
+  <section><title>Admin Interface</title>
+    <ul>
+      <li>Comprehensive statistics on cache utilization, updates, and queries</li>
+      <li>Text analysis debugger, showing result of every stage in an analyzer</li>
+      <li>Web Query Interface w/ debugging output
+        <ul>
+          <li>parsed query output</li>
+          <li>Lucene explain() document score detailing</li>
+          <li>explain score for documents outside of the requested range to debug why a given document wasn't ranked higher.</li>
+        </ul>
+      </li>
+    </ul>
+  </section>
+
+
+
+</section>
+
+</body>
+</document>
diff --git a/src/site/src/documentation/content/xdocs/index.xml b/src/site/src/documentation/content/xdocs/index.xml
index b5f113bf306..c322a0b4a08 100755
--- a/src/site/src/documentation/content/xdocs/index.xml
+++ b/src/site/src/documentation/content/xdocs/index.xml
@@ -24,10 +24,13 @@
     <section id="intro">
       <title>Introduction</title>
       <p>
-        Solr is an open source search server based on the
-        <a href="http://lucene.apache.org/java/">Lucene Java</a> search library.
-        It's normally run as a webapp in a servlet container
-        such as <a href="http://tomcat.apache.org">Tomcat</a>.
+        Solr is an open source enterprise search server based on the
+        <a href="http://lucene.apache.org/java/">Lucene Java</a> search library, with XML/HTTP APIs,
+        caching, replication, and a web administration interface.
+        It runs in a Java servlet container such as <a href="http://tomcat.apache.org">Tomcat</a>.
+      </p>
+      <p>
+        See the complete <a href="features.html">feature list</a> for more details, then check out the <a href="tutorial.html">tutorial</a>.
       </p>
     </section>
 
diff --git a/src/site/src/documentation/content/xdocs/site.xml b/src/site/src/documentation/content/xdocs/site.xml
index 332ac315640..65a90b44afc 100755
--- a/src/site/src/documentation/content/xdocs/site.xml
+++ b/src/site/src/documentation/content/xdocs/site.xml
@@ -42,6 +42,7 @@ See http://forrest.apache.org/docs/linking.html for more info
   </about>
 
   <docs label="Documentation">
+    <features    label="Features"         href="features.html" />
     <faq         label="FAQ"              href="ext:faq" />
     <wiki        label="Wiki"             href="ext:wiki" />
     <tutorial    label="Tutorial"         href="tutorial.html" />