You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by sa...@apache.org on 2011/02/19 17:50:25 UTC

svn commit: r1072386 [2/3] - in /lucene/dev/branches/branch_3x: ./ dev-tools/idea/lucene/contrib/benchmark/ dev-tools/idea/lucene/contrib/demo/ dev-tools/maven/lucene/contrib/benchmark/ dev-tools/maven/lucene/contrib/demo/ lucene/ lucene/contrib/benchm...

Modified: lucene/dev/branches/branch_3x/lucene/docs/demo2.html
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/lucene/docs/demo2.html?rev=1072386&r1=1072385&r2=1072386&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/lucene/docs/demo2.html (original)
+++ lucene/dev/branches/branch_3x/lucene/docs/demo2.html Sat Feb 19 16:50:23 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-analyzers/index.html">Analyzers</a>
 </div>
@@ -156,6 +153,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">
@@ -263,9 +263,6 @@ document.write("Last Published: " + docu
 <li>
 <a href="#Searching Files">Searching Files</a>
 </li>
-<li>
-<a href="#The Web example...">The Web example...</a>
-</li>
 </ul>
 </div>
 
@@ -287,9 +284,9 @@ how to use Lucene in their applications.
 <div class="section">
 <p>
 Relative to the directory created when you extracted Lucene or retrieved it from Subversion, you
-should see a directory called <span class="codefrag">src</span> which in turn contains a directory called
-<span class="codefrag">demo</span>.  This is the root for all of the Lucene demos.  Under this directory is
-<span class="codefrag">org/apache/lucene/demo</span>.  This is where all the Java sources for the demos live.
+should see a directory called <span class="codefrag">lucene/contrib/demo/</span>.  This is the root for the Lucene
+demo.  Under this directory is <span class="codefrag">src/java/org/apache/lucene/demo/</span>.  This is where all
+the Java sources for the demo live.
 </p>
 <p>
 Within this directory you should see the <span class="codefrag">IndexFiles.java</span> class we executed earlier.
@@ -298,94 +295,111 @@ Bring it up in <span class="codefrag">vi
 </div>
 
 
-<a name="N10037"></a><a name="IndexFiles"></a>
+<a name="N10034"></a><a name="IndexFiles"></a>
 <h2 class="boxed">IndexFiles</h2>
 <div class="section">
 <p>
-As we discussed in the previous walk-through, the <a href="api/demo/org/apache/lucene/demo/IndexFiles.html">IndexFiles</a> class creates a Lucene
+As we discussed in the previous walk-through, the <a href="api/contrib-demo/org/apache/lucene/demo/IndexFiles.html">IndexFiles</a> class creates a Lucene
 Index. Let's take a look at how it does this.
 </p>
 <p>
-The first substantial thing the <span class="codefrag">main</span> function does is instantiate <a href="api/core/org/apache/lucene/index/IndexWriter.html">IndexWriter</a>.  It passes the string
-"<span class="codefrag">index</span>" and a new instance of a class called <a href="api/core/org/apache/lucene/analysis/standard/StandardAnalyzer.html">StandardAnalyzer</a>. 
-The "<span class="codefrag">index</span>" string is the name of the filesystem directory where all index information
-should be stored.  Because we're not passing a full path, this will be created as a subdirectory of
-the current working directory (if it does not already exist). On some platforms, it may be created
-in other directories (such as the user's home directory).
+The <span class="codefrag">main()</span> method parses the command-line parameters, then in preparation for
+instantiating <a href="api/core/org/apache/lucene/index/IndexWriter.html">IndexWriter</a>, opens a 
+<a href="api/core/org/apache/lucene/store/Directory.html">Directory</a> and instantiates
+<a href="api/module-analysis-common/org/apache/lucene/analysis/standard/StandardAnalyzer.html">StandardAnalyzer</a> and
+<a href="api/core/org/apache/lucene/index/IndexWriterConfig.html">IndexWriterConfig</a>.
 </p>
 <p>
-The <a href="api/core/org/apache/lucene/index/IndexWriter.html">IndexWriter</a> is the main
-class responsible for creating indices.  To use it you must instantiate it with a path that it can
-write the index into.  If this path does not exist it will first create it.  Otherwise it will
-refresh the index at that path.  You can also create an index using one of the subclasses of <a href="api/core/org/apache/lucene/store/Directory.html">Directory</a>.  In any case, you must also pass an
-instance of <a href="api/core/org/apache/lucene/analysis/Analyzer.html">org.apache.lucene.analysis.Analyzer</a>.
+The value of the <span class="codefrag">-index</span> command-line parameter is the name of the filesystem directory
+where all index information should be stored.  If <span class="codefrag">IndexFiles</span> is invoked with a 
+relative path given in the <span class="codefrag">-index</span> command-line parameter, or if the <span class="codefrag">-index</span>
+command-line parameter is not given, causing the default relative index path "<span class="codefrag">index</span>"
+to be used, the index path will be created as a subdirectory of the current working directory
+(if it does not already exist).  On some platforms, the index path may be created in a different
+directory (such as the user's home directory).
 </p>
 <p>
-The particular <a href="api/core/org/apache/lucene/analysis/Analyzer.html">Analyzer</a> we
-are using, <a href="api/core/org/apache/lucene/analysis/standard/StandardAnalyzer.html">StandardAnalyzer</a>, is
-little more than a standard Java Tokenizer, converting all strings to lowercase and filtering out
-stop words and characters from the index.  By stop words and characters I mean common language
-words such as articles (a, an, the, etc.) and other strings that may have less value for searching
-(e.g. <b>'s</b>) .  It should be noted that there are different rules for every language, and you
-should use the proper analyzer for each.  Lucene currently provides Analyzers for a number of
-different languages (see the <span class="codefrag">*Analyzer.java</span> sources under <a href="http://svn.apache.org/repos/asf/lucene/dev/trunk/lucene/contrib/analyzers/common/src/java/org/apache/lucene/analysis/">contrib/analyzers/src/java/org/apache/lucene/analysis</a>).
+The <span class="codefrag">-docs</span> command-line parameter value is the location of the directory containing
+files to be indexed.
 </p>
 <p>
-Looking further down in the file, you should see the <span class="codefrag">indexDocs()</span> code.  This recursive
-function simply crawls the directories and uses <a href="api/demo/org/apache/lucene/demo/FileDocument.html">FileDocument</a> to create <a href="api/core/org/apache/lucene/document/Document.html">Document</a> objects.  The <a href="api/core/org/apache/lucene/document/Document.html">Document</a> is simply a data object to
-represent the content in the file as well as its creation time and location.  These instances are
-added to the <span class="codefrag">indexWriter</span>.  Take a look inside <a href="api/demo/org/apache/lucene/demo/FileDocument.html">FileDocument</a>.  It's not particularly
-complicated.  It just adds fields to the <a href="api/core/org/apache/lucene/document/Document.html">Document</a>.
+The <span class="codefrag">-update</span> command-line parameter tells <span class="codefrag">IndexFiles</span> not to delete the
+index if it already exists.  When <span class="codefrag">-update</span> is not given, <span class="codefrag">IndexFiles</span> will
+first wipe the slate clean before indexing any documents.
 </p>
 <p>
-As you can see there isn't much to creating an index.  The devil is in the details.  You may also
-wish to examine the other samples in this directory, particularly the <a href="api/demo/org/apache/lucene/demo/IndexHTML.html">IndexHTML</a> class.  It is a bit more
-complex but builds upon this example.
+Lucene <a href="api/core/org/apache/lucene/store/Directory.html">Directory</a>s are used by the
+<span class="codefrag">IndexWriter</span> to store information in the index.  In addition to the 
+<a href="api/core/org/apache/lucen/store/FSDirectory.html">FSDirectory</a> implementation we are using,
+there are several other <span class="codefrag">Directory</span> subclasses that can write to RAM, to databases, etc.
+</p>
+<p>
+Lucene <a href="api/core/org/apache/lucene/analysis/Analyzer.html">Analyzer</a>s are processing pipelines
+that break up text into indexed tokens, a.k.a. terms, and optionally perform other operations on these
+tokens, e.g. downcasing, synonym insertion, filtering out unwanted tokens, etc.  The <span class="codefrag">Analyzer</span>
+we are using is <span class="codefrag">StandardAnalyzer</span>, which creates tokens using the Word Break rules from the
+Unicode Text Segmentation algorithm specified in <a href="http://unicode.org/reports/tr29/">Unicode
+Standard Annex #29</a>; converts tokens to lowercase; and then filters out stopwords.  Stopwords are
+common language words such as articles (a, an, the, etc.) and other tokens that may have less value for
+searching.  It should be noted that there are different rules for every language, and you should use the
+proper analyzer for each.  Lucene currently provides Analyzers for a number of different languages (see
+the <span class="codefrag">*Analyzer.java</span> sources under 
+<a href="http://svn.apache.org/repos/asf/lucene/dev/trunk/lucene/contrib/analyzers/common/src/java/org/apache/lucene/analysis/">lucene/contrib/analyzers/common/src/java/org/apache/lucene/analysis/</a>).
+</p>
+<p>
+The <span class="codefrag">IndexWriterConfig</span> instance holds all configuration for <span class="codefrag">IndexWriter</span>.  For
+example, we set the <span class="codefrag">OpenMode</span> to use here based on the value of the <span class="codefrag">-update</span>
+command-line parameter.
+</p>
+<p>
+Looking further down in the file, after <span class="codefrag">IndexWriter</span> is instantiated, you should see the
+<span class="codefrag">indexDocs()</span> code.  This recursive function crawls the directories and creates
+<a href="api/core/org/apache/lucene/document/Document.html">Document</a> objects.  The 
+<span class="codefrag">Document</span> is simply a data object to represent the text content from the file as well as
+its creation time and location.  These instances are added to the <span class="codefrag">IndexWriter</span>.  If
+the <span class="codefrag">-update</span> command-line parameter is given, the <span class="codefrag">IndexWriter</span> 
+<span class="codefrag">OpenMode</span> will be set to <span class="codefrag">OpenMode.CREATE_OR_APPEND</span>, and rather than
+adding documents to the index, the <span class="codefrag">IndexWriter</span> will <strong>update</strong> them
+in the index by attempting to find an already-indexed document with the same identifier (in our
+case, the file path serves as the identifier); deleting it from the index if it exists; and then
+adding the new document to the index.
 </p>
 </div>
 
 
-<a name="N100A0"></a><a name="Searching Files"></a>
+<a name="N100DB"></a><a name="Searching Files"></a>
 <h2 class="boxed">Searching Files</h2>
 <div class="section">
 <p>
-The <a href="api/demo/org/apache/lucene/demo/SearchFiles.html">SearchFiles</a> class is
-quite simple.  It primarily collaborates with an <a href="api/core/org/apache/lucene/search/IndexSearcher.html">IndexSearcher</a>, <a href="api/core/org/apache/lucene/analysis/standard/StandardAnalyzer.html">StandardAnalyzer</a>
-(which is used in the <a href="api/core/org/apache/lucene/demo/IndexFiles.html">IndexFiles</a> class as well) and a
-<a href="api/core/org/apache/lucene/queryParser/QueryParser.html">QueryParser</a>.  The
+The <a href="api/contrib-demo/org/apache/lucene/demo/SearchFiles.html">SearchFiles</a> class is
+quite simple.  It primarily collaborates with an 
+<a href="api/core/org/apache/lucene/search/IndexSearcher.html">IndexSearcher</a>, 
+<a href="api/modules-analysis-common/org/apache/lucene/analysis/standard/StandardAnalyzer.html">StandardAnalyzer</a> (which is used in the
+<a href="api/contrib-demo/org/apache/lucene/demo/IndexFiles.html">IndexFiles</a> class as well)
+and a <a href="api/core/org/apache/lucene/queryParser/QueryParser.html">QueryParser</a>.  The
 query parser is constructed with an analyzer used to interpret your query text in the same way the
-documents are interpreted: finding the end of words and removing useless words like 'a', 'an' and
-'the'.  The <a href="api/core/org/apache/lucene/search/Query.html">Query</a> object contains
-the results from the <a href="api/core/org/apache/lucene/queryParser/QueryParser.html">QueryParser</a> which is passed to
-the searcher.  Note that it's also possible to programmatically construct a rich <a href="api/core/org/apache/lucene/search/Query.html">Query</a> object without using the query
+documents are interpreted: finding word boundaries, downcasing, and removing useless words like
+'a', 'an' and 'the'.  The <a href="api/core/org/apache/lucene/search/Query.html">Query</a>
+object contains the results from the
+<a href="api/core/org/apache/lucene/queryParser/QueryParser.html">QueryParser</a> which is passed
+to the searcher.  Note that it's also possible to programmatically construct a rich 
+<a href="api/core/org/apache/lucene/search/Query.html">Query</a> object without using the query
 parser.  The query parser just enables decoding the <a href="queryparsersyntax.html">Lucene query
-syntax</a> into the corresponding <a href="api/core/org/apache/lucene/search/Query.html">Query</a> object. Search can be executed in 
-two different ways: 
+syntax</a> into the corresponding <a href="api/core/org/apache/lucene/search/Query.html">Query</a>
+object. Search can be executed in two different ways:
+</p>
 <ul>
 
 <li>Streaming: A <a href="api/core/org/apache/lucene/search/Collector.html">Collector</a> subclass
 simply prints out the document ID and score for each matching document.</li>
 
-<li>Paging: Using a <a href="api/core/org/apache/lucene/search/TopScoreDocCollector.html">TopScoreDocCollector</a>
- the search results are printed in pages, sorted by score (i. e. relevance).</li>
+<li>Paging: Using the <span class="codefrag">IndexSearcher.search(query,n)</span> method that returns 
+<a href="api/core/org/apache/lucene/search/TopDocs.html">TopDocs</a> with max <span class="codefrag">n</span> hits,
+the search results are printed in pages, sorted by score (i.e. relevance).</li>
 
-</ul>  
-
-</p>
-</div>
-
-
-<a name="N100E2"></a><a name="The Web example..."></a>
-<h2 class="boxed">The Web example...</h2>
-<div class="section">
-<p>
-
-<a href="demo3.html">read on&gt;&gt;&gt;</a>
-
-</p>
+</ul>
 </div>
 
-
 </div>
 <!--+
     |end content

Modified: lucene/dev/branches/branch_3x/lucene/docs/demo2.pdf
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/lucene/docs/demo2.pdf?rev=1072386&r1=1072385&r2=1072386&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/lucene/docs/demo2.pdf (original)
+++ lucene/dev/branches/branch_3x/lucene/docs/demo2.pdf Sat Feb 19 16:50:23 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 2972 /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%&>BAQ/%Xua-nB=(lfkFtgf$1g&C")M:RD!^sSE[r5c42GT2B,4e8L]\GY<S[...@4->`o"l5U-XsYnV&@aNl^QS0h^J#lg9IY"V6&kcHR1/%hN\!%cZd.=[6Ig#MQI^HJY)H_FcMngRhh\2S<WoQ:3hDV].7!,pb,]>=/O@9;TY/=/W).V:6[jS`OL=H`S"0SX@r10ImG`F!ZNGC21OS#D"//lY_gSLEgYZRhfo!^OVLqX&M)5(ZE/]^X0Vo6LoZM73I7[YEJ7u6@R^co/.68Xf6fo'mVEoNH#d8fbkMmcU(;r/%_:+JGNlUbgI.aG19)JMNQAnGZ:D2iDQ\m\/#l1e[_[#'4m[D0o?4J-?hb3"!EJG"7h_l-87KU]M!b"/gsn7BKV$PgEDj:TS`DWpQO:0kWV$Euq/5Ek<#W;Y^D#iA,q]=D7H2&Oj/C\^%[lrh.^T<HBTB#P_t.c1bX\Q+G9Kkpk-dM]'>K<r#Eie.pbq;(eH@UIH+&t<5<H6</pSp)!XFW3/?<t.+'jjLV;O$*n-=I=1\.1iSfrP1>\F\b@Tp/*5qJ4HXrr?VR[E.q3"5',V?]k%S/f,'jW:j"44pLlG9bM'aum^nbZM-PfbV7UOOc9!,GqRi64rH)N'WK%,U=Gg0EPs,M7J7<I_6Oc5724>c6kTC1PClPp5J>?eWAE>bA-Y\YS<MNR7_[b(<F8*@fPn-SKSGDp<X9b4_b[oJf.G>(c[7"CU)R.dfR3H9K]C;LJU.(n+'Rl3QQO%XI9iZ*A+NBh@i@EMn6`3p,GK`Aa'\MGZa.X=rFqDd8TU=XKh:21-jDurPtYX=/80#-G=eI*JnFRLG!iUi]Y5cIQT(FHt1K=MP2U
 <^sIn=QF0>i/i><n]>*/*Jt9oZF+CJeM:MO2:O:m7_-F$_DNpP^[@OW:2MBD;1<mF7kkX7uQ+dA-U+b!GfCM*PMQ"IsL,jZ>6rL^b`C=[A$JltMgjqSL$@qX\D9#C`"T>Wb?oT]7X$JIS6=j-`^eGem0s:8(`do9C6W"Q`+/O,KJd;qtrke4]_l8QnLZ[-`Om%?O;%V+-s"&HcHXE#>D@[@f56EpiIL/89$o:R!@sB_[,Qen'3B:qUhuiq7&us`(>sb#8AQ.pW&5ag=$%RlAVEI18_\C9SCpH4t(I=[^^Ie5h.+G+pZt('JD!*.`(Js`1:iC<3SU8/56Y?_$Q7-fWGV6kOnV3c)@i\9e<<A]$7Oh,uMuOS4"5iEqWbJ9sAZ?j0(a:XDNA2[m'fG'41]l;@BSUB""m,iT\k"7YUl+Oq4gHU(@nSC-qN<%K7^9di3cBn4-$0,d3^f(1D_SZ7\;g#F!7EQqP71KuAhnbm&*:$bZiI$jKbfqJe$l(TD)A->\+b$ETW'Js^sif!]f.g*]K=M+R*9f7M_:YE6;8@fItf0e'DZ8'817F]k9J`Oag?>]mM:Pm;b\1ji,$*(*UVrr[rdp4:5FmrV0WE\X#Ca3]QRe-B&`Ihq+>dLTt15i&<YRqfS_kjkl\1lYS_X(\TeM84_QFE:'-$oM3\`ZQalTCcNP%=8.m9e:::rup/])"D/j``oI/MfP'140cGFBEQ8n-n]`7ogmbu&JIt%C[maJ'EJ)!g#6=Q?rX@WEC6p%Un4q*+;-Im$_KHiVlk^C<uh_3itela.W)S@U)g6t;1gH@Si`-)2'%qJuUBn$0LGQTBK.E;WgGlgDD`o=#XH!/Nn)W];*^mdd$-3JX"+)\\h8k\LSLnLo_9%#Fh;=-h0edNcLFCd]R2?Lq@,;BuQ(^.K:%u:%"#Q'Zm%5_/4"CB-KG-B6P%6AN4o8L/M[(*unB9nl!VST\I6soHmr'fgA?Zu&tbU9]&_>!
 ,\G%m\AW,-PPi&\t8E>LG&47GB()bNOSS#Pdkr8HgGB'k#c!m6CM]!(Ti-ntb5Y^i5N/D9>BP6Q4L*s_T9l?)*=H6glXF7^rG$PVFq1em('Ka$[m2&P<OILKM)N4N&i_/[jT:<fns^$L-MaX'KqT_QTZ;5lt/Pe[\XQ!)+-;GlRIo*sl'"*L`+>eRPaY9-'j+-2s>pIRA)+N?=iHL)3.6rTl([&7kP)DX3s\qdfW?Sto?:JC#MlT/[se67+^+0GKJP=)OZRDNhbYYJK'3[L\Dj'HA2rhD*?G<o&[J,uEn57l0\W&_Ll\d2sClsTL@3?a4k?(7e4KT^LNoCYndUl\j:PDasVXA*dCEgLFP,,.2OkOP$7$dNQaAM"\nV?A!A2*IAQ`"TH7RU*\IUZ-T1q.jrnoe<U@m%IlGBQHkR_F-+ZD4p9q1[O.YP(B@_C:EALpb\,4V7E_!l6Z:afg5lur!uA:Dokk`W345[RRZn7;JWPS`>Pj_._,_SSjSR'd]:MCk=F0rS*hlg%_rd`r0?(mq+GW:-gn@C?niE4Y9;#t>2q)>YSG!m2,C'FQs2+;Je$"Za5@%7oDp-J;iY=/lVjc*0M=FIAZIW58hoIC#b#]o".V-KX3lg0\)*!fZ.C.ajjY=?:&i^_CsQG*9sG5GG)f)M&#ZqP3Q#\:P--VC.F,aS#k.3XO7/bp2s3?Fji>,r(_h=;0-LV>P$kZV0e0'p,C$%ns2JrTbgjhN]15MH*^1\]#F+M\]$krKT0W^/k2=lr31dlIhNKnM!bRTTG*[./j/\X:X'7?*#DF9HhqS>/P:sZB2]CLr?Wm)E>O@ZV[lZoWJbc]8n&A*B*_@FbJC%-,c&)":<b%Erm/>=t:WFF#DT)eMK]feK")QSM+hme;[.-J(e/HUT9g.BLVg:#>K+cpEZ^#OYE%=0FqN:6X;*R+Y8io9jD8orDVV3-XEr4,%VSmYu9h2J^@%eStCMPch9lm[2/H:2gk0
 ?<~>
 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 
+0000009455 00000 n 
+0000009534 00000 n 
+0000009626 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 
-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 
+0000000732 00000 n 
+0000000852 00000 n 
+0000000898 00000 n 
+0000009760 00000 n 
+0000001033 00000 n 
+0000009823 00000 n 
+0000001169 00000 n 
+0000009889 00000 n 
+0000001306 00000 n 
+0000009955 00000 n 
+0000001443 00000 n 
+0000003927 00000 n 
+0000004035 00000 n 
+0000007100 00000 n 
+0000007208 00000 n 
+0000007930 00000 n 
+0000010019 00000 n 
+0000008038 00000 n 
+0000008211 00000 n 
+0000008446 00000 n 
+0000008612 00000 n 
+0000008793 00000 n 
+0000008906 00000 n 
+0000009016 00000 n 
+0000009124 00000 n 
+0000009230 00000 n 
+0000009346 00000 n 
 trailer
 <<
-/Size 34
+/Size 33
 /Root 2 0 R
 /Info 4 0 R
 >>
 startxref
-8952
+10070
 %%EOF

Modified: lucene/dev/branches/branch_3x/lucene/docs/fileformats.html
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/lucene/docs/fileformats.html?rev=1072386&r1=1072385&r2=1072386&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/lucene/docs/fileformats.html (original)
+++ lucene/dev/branches/branch_3x/lucene/docs/fileformats.html Sat Feb 19 16:50:23 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-analyzers/index.html">Analyzers</a>
 </div>
@@ -156,6 +153,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/branch_3x/lucene/docs/gettingstarted.html
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/lucene/docs/gettingstarted.html?rev=1072386&r1=1072385&r2=1072386&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/lucene/docs/gettingstarted.html (original)
+++ lucene/dev/branches/branch_3x/lucene/docs/gettingstarted.html Sat Feb 19 16:50:23 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-analyzers/index.html">Analyzers</a>
 </div>
@@ -156,6 +153,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">
@@ -263,7 +263,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
@@ -287,25 +287,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/branch_3x/lucene/docs/gettingstarted.pdf
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/lucene/docs/gettingstarted.pdf?rev=1072386&r1=1072385&r2=1072386&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/lucene/docs/gettingstarted.pdf (original)
+++ lucene/dev/branches/branch_3x/lucene/docs/gettingstarted.pdf Sat Feb 19 16:50:23 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/branch_3x/lucene/docs/index.html
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/lucene/docs/index.html?rev=1072386&r1=1072385&r2=1072386&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/lucene/docs/index.html (original)
+++ lucene/dev/branches/branch_3x/lucene/docs/index.html Sat Feb 19 16:50:23 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-analyzers/index.html">Analyzers</a>
 </div>
@@ -154,6 +151,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/branch_3x/lucene/docs/linkmap.html
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/lucene/docs/linkmap.html?rev=1072386&r1=1072385&r2=1072386&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/lucene/docs/linkmap.html (original)
+++ lucene/dev/branches/branch_3x/lucene/docs/linkmap.html Sat Feb 19 16:50:23 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-analyzers/index.html">Analyzers</a>
 </div>
@@ -154,6 +151,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">
@@ -310,12 +310,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>
@@ -361,6 +355,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/branch_3x/lucene/docs/linkmap.pdf
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/lucene/docs/linkmap.pdf?rev=1072386&r1=1072385&r2=1072386&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/lucene/docs/linkmap.pdf (original)
+++ lucene/dev/branches/branch_3x/lucene/docs/linkmap.pdf Sat Feb 19 16:50:23 2011
@@ -5,10 +5,10 @@
 /Producer (FOP 0.20.5) >>
 endobj
 5 0 obj
-<< /Length 1057 /Filter [ /ASCII85Decode /FlateDecode ]
+<< /Length 1058 /Filter [ /ASCII85Decode /FlateDecode ]
  >>
 stream
-Gau1.d8&FM'Sc)R'Y/mTHF@<Fa^n\2#"%#j\uRP[+a$@!9tJ7pg7Eb:daiT"nIufT1j6h;J&ab9,bE:O+"kG2'**[\EWjoo2M/c_#R+%R:lqV97N_t>*6_L#pTrU@nFL%HUKHA5].'bX<P$`poCTaRmak*[4f^*L/('pn5D&^=FJ])U]sD9?UBiPEHFnH/Zq>qM4(m\uW\8Q!rLgXdY=6b0+KJT0Opbcs/^.'q/IX"8=LFmVA7F#,E*u0GG+*q,hQbsH9OA)A6+&8.5sY.khJ=rR.3o6^j.E56#=3MWLfjdG`,*OZ7Q1H^$A'CNTnPX!W"8m%c8I2`DlG/MC+*7V6BEJF2HnV`CWV*oR\3d^FeF0>nn)+qkJ:+Slkdn<W"5Ud15J6_+IhJ,ot]>@b8#R>a0nFFf5u'[.\fNSlM<O'Wggih'f+K/=o(4YERkHna;E<]GsYPgVRR]V-[Q8[Y\g)mG1rN.-%n>&i&]\kIDQKM;H]OB[Wq-rrTg><eA4!kbMh\=ZRfXqr/PK].U=,4AF9eLO%_A&pL+#cBjhuACZ'fJlJZH33\j?X:U]J?I:Oo.h_eeEk[jA9!"RP+JBCel%8<e/r;DC0K8W!+)C)M(E^Vl^[>U)'K[.0=?)<P-O76:Y<4q$7c9[17?24cQBss(BG_eo)!SEj]&[mQKX1[u]`1=lVK!3b<e.I//bG*6g$kUHK;gbJC/^9IZpMdhHRChEQ.P\FE&p>gTRUj928).s*\enbNWXhX'9E(=IIc2q[N8<l&nr4^r2dh4[@#W_J0-GER5"b$6i[M(:>Sb6+@*gT,:K>TuKN"@b:f6TIc(BlK]Tg1j%@*\r-*:a"9UhM85$mC>eQ9(qDb3d5qj..7B9@'/I+6uEYGtXE+tQX.(N3GQFfMZn:-^D+:@$qfoW((9G%W]YP:*(*l*qkO1h_-<*.8i%eaZbA6a/Wna#G9m3#s596,I;sKRcP*qlF-(DUeCEF71-H8<5H
 XbW%6<`aO.u:,?s=>;*s:g))W4oqko7#;KWa>PA?3)g'r=0pW?`B$1uUL]/+.45NX~>
+Gatn&d8&FM'Sc)R'Y/mTHF@<Fa^n\22MAG3mB4GcKu>9g2!GX^BRBU/8R'pu-;smI`/aWmn(?eCfCRPR_mSrA!hd#+:S@QJ9VD,65ou9JaG\Of,7sW$oMuq"a2KeMr6h(o+I$dsDY*F5'6!Q^._[QppXNG30<.q>;Da`s:N(A#SZ.B`kA8i!+92h5c>Jp/NKTt"c%Ys5lc0)n2s;g)B9@0s8?0qCi51jqEcVq]WSo*2X%(UN7-nXu:@-'<:*U=(#PL6<kpsRoW0W,m#fnaSgKhZhKg]?br9O:H,fn760oLRCQn@"1k_?lH5nF/Q['6G6FhqEba_i?t/J`V3N^`Pr&#'?a7VS.#Q4/SK$&[h_#MPM-YP1&,*_f*%DS]#-l6JDY"u-B(A;_uk+*]Sj\H:^Ld'cK*RVo9!AJ>H!>sEb?WZI^;5,0]oV14#a-EZbK)'_0sccA^UkP(b1A<1."[Oj>k6$m!0$),X"\;Bs"Q`su/<#-ji/KR!uiH8'flJS*G`VB(l=lqMErkL@MQ0o2"AF9eLO%_A&O'r!QBmpo3;?QBNBpOI-)p1#(X4()jVp7o%Q#Z?W0<[mDRbCP,6JJ;+3/t>h&?F#[=&ge1E@pfK\]F?)2ok;Ga\\fa1JMN80ui`,,'hJfRf*L2`Klb+nKE)l0*U6LH(cJ\=qu=H]c8.OqVli*BPO+BG_@"A&;T\^4"J;66AS`Nr&i*>0HG3nh0D&q9N<0rZBfm1mlhaE<D;2m=7T'-8%1L1+CL/\%PJs5(.4>=S]#SU-CHE>VpV0OYKecDj,?p+%&$"3Dnb5#C,@7'4u?F=IE]&U(a)5?]/tMb+0n64Lc<hl>#)W"Q;&GX1OY"&RCbh9?@75q$*!j0jSPHmZ5_q)-n`6>&[G-lZ/FkN(0'*B/>"^pbG`tf\=3>5YIj2X%EZ6hW(1#D#Vbpdm]@ko-?F<(QKf#$Y/qgs#W6MALf+d=l:!n060Gt\[XW&"IJWqiLFLX
 r$m@F0c'`QcSo*N+*&"A#G`HQLk.993BmV!*`kSpR":p.9].q=r=K_B\"Zl:*#HZl[~>
 endstream
 endobj
 6 0 obj
@@ -87,19 +87,19 @@ endobj
 xref
 0 14
 0000000000 65535 f 
-0000003126 00000 n 
-0000003190 00000 n 
-0000003240 00000 n 
+0000003127 00000 n 
+0000003191 00000 n 
+0000003241 00000 n 
 0000000015 00000 n 
 0000000071 00000 n 
-0000001220 00000 n 
-0000001326 00000 n 
-0000002463 00000 n 
-0000002569 00000 n 
-0000002681 00000 n 
-0000002791 00000 n 
-0000002902 00000 n 
-0000003010 00000 n 
+0000001221 00000 n 
+0000001327 00000 n 
+0000002464 00000 n 
+0000002570 00000 n 
+0000002682 00000 n 
+0000002792 00000 n 
+0000002903 00000 n 
+0000003011 00000 n 
 trailer
 <<
 /Size 14
@@ -107,5 +107,5 @@ trailer
 /Info 4 0 R
 >>
 startxref
-3362
+3363
 %%EOF

Modified: lucene/dev/branches/branch_3x/lucene/docs/lucene-contrib/index.html
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/lucene/docs/lucene-contrib/index.html?rev=1072386&r1=1072385&r2=1072386&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/lucene/docs/lucene-contrib/index.html (original)
+++ lucene/dev/branches/branch_3x/lucene/docs/lucene-contrib/index.html Sat Feb 19 16:50:23 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-analyzers/index.html">Analyzers</a>
 </div>
@@ -156,6 +153,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">
@@ -267,6 +267,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>
@@ -377,78 +380,84 @@ 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="N10062"></a><a name="db"></a>
+<a name="N10062"></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="N10075"></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="N10071"></a><a name="highlighter"></a>
+<a name="N10084"></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="N10080"></a><a name="icu"></a>
+<a name="N10093"></a><a name="icu"></a>
 <h3 class="boxed">icu</h3>
 <p>Provides integration with ICU (International Components for Unicode) for
                 stronger Unicode and internationalization support. </p>
 <p>See <a href="../api/contrib-icu/index.html">icu javadoc</a>
 </p>
-<a name="N1008F"></a><a name="instantiated"></a>
+<a name="N100A2"></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="N1009E"></a><a name="lucli"></a>
+<a name="N100B1"></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="N100AD"></a><a name="memory"></a>
+<a name="N100C0"></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="N100BC"></a><a name="misc"></a>
+<a name="N100CF"></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="N100CB"></a><a name="queryparser"></a>
+<a name="N100DE"></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="N100DA"></a><a name="queries"></a>
+<a name="N100ED"></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="N100E9"></a><a name="remote"></a>
+<a name="N100FC"></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="N100F8"></a><a name="spatial"></a>
+<a name="N1010B"></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="N10107"></a><a name="spellchecker"></a>
+<a name="N1011A"></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="N10116"></a><a name="swing"></a>
+<a name="N10129"></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="N10125"></a><a name="wordnet"></a>
+<a name="N10138"></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="N10134"></a><a name="xml-query-parser"></a>
+<a name="N10147"></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/branch_3x/lucene/docs/lucene-contrib/index.pdf
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/lucene/docs/lucene-contrib/index.pdf?rev=1072386&r1=1072385&r2=1072386&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/lucene/docs/lucene-contrib/index.pdf (original)
+++ lucene/dev/branches/branch_3x/lucene/docs/lucene-contrib/index.pdf Sat Feb 19 16:50:23 2011
@@ -5,10 +5,10 @@
 /Producer (FOP 0.20.5) >>
 endobj
 5 0 obj
-<< /Length 941 /Filter [ /ASCII85Decode /FlateDecode ]
+<< /Length 958 /Filter [ /ASCII85Decode /FlateDecode ]
  >>
 stream
-Gb!$G9lldX&;KZO$6>[i<IGtja!T7T3k]XXXmL[I3G*lZ!Sl3'oj*Cket+=P9,0Q1>@pt-_kL3c\kRefpQC>o16QMWAj>j:OiMtc"tr^aqjS'5Pr^8VSpXmn4Cn95glSq"@Q:jnEm.73g?X6\\uVm7.3<BJ:Qg0]OX%_M8%og87>c,bqr,uiTlaQgHYQQ!a6u$1B<&*TqGW'RbPjI7[R8#J)"miI*%e=f>rmue$2PeM!nX1Hs0-u!VU?M/=c#^lHd.h?<1MA#,eT4<?,UAU<hB;XVY,^kB')GSd#4:%U243Qo?8UHX#eS6QeX<"c5e7#`WN]?ji6g$VTO,[XEjA.Df9NZ]E&j[71[2m4>;ZMGau_(LFokGB5T`UXkBXc<6]KZpg*F"/)f<P`p3f4b]49#"jEZ*6Diq6;1+KJhbC@/-hROY]/U>Vd6'@F0<2G_5qB7dCcp&0OS?h*&Mm?VaPqJW'OMpQZ?RbIFphC(KBjiA16.Hh-*uMhIW+q&F7N'9bW8mUHV4VcV2V`PjObZOKRM81hLT%-@4g%'=<qJk/1,CKe$dItUP.g*BhjGbBmhJ@>I&S7LoeI=@doYXN:CU\k(lld,qb-p)qpW=)To\m)BNfd*TPV/bX&"W#3Ku>h?1(aR)OapFs;mhe#(>Ej+R,f_.ltrLH[6_Eb]QZ8B.MYRA34XmD5#54B(E=rarMhZ]*`@%$hMTfX)`A^aPn).B5o<7D=rP"jl0VObc`$0aE[N?Ku-$);e5VDk>841Q[8aHSL;7&q9;m[9KcaSsCmB4CqmXR&nT>nl$Gh]1joegVd5_,Oge4K*UgA72eP%_:RVrDN9S4\hG%\-rakuN%7=1X[iLom$7@K5+EPgF>[r^r=FjI/]!eq>:JE"]A?Ze<c>U:X?jVVf>hV.$<^FEV3U/pE+?AUD;_`"1)i9Krrp@bnGW~>
+Gb!$G_/c#!&;KX9KoXHpW[*Z/a!T7T3k]XXXmL[I3G*lZ!Sl1QqQ<3flc^(4V(s*Q/[Hu'A'qJ%h58#DqiHVi16QMWAj>j:OiMtc"tr^aqjWH[%96*M4o)hgGf]HH\KPa^@lUsoEm.73g?X6\\uVm7.3<BJ:Qg0]OYu+$,G,Dm[A5oarGZKE:qA9T4gh<!j7aP)1KE$:rCOlZH%2=jgS*[bdX?Tb7uMT=/fdHC"T=DaJSW[5J(VLKe'K-J=c#^lHd-+=;XoK:-fIKbj]Qt3A``0;Bj-"rDp2Ib*dSDSQ]qs'@\+IVB3",_p7+3VbIOB9d<ORZB=W$[K;nFt5&6a;dbC7\,o6Q6XJc.ZRKl=P)mc`OU=/4)%d0N#)o[cYH"[o,nYf^]&'HQD"l,5*8uCa];>dSAgm.Bs9]PdI=QXR!mfgpYAKI634>VjJo&J77qr2sm8Yfne4?&-NWjW!E0=&l>4H!@\HXsC73K,g.ZXf@>a-XiZ/?Yf&DRGLNE4#sV,tQBBRj=%H3D.qVN&RXb0IS&T$4ab*(`XkXA^dg+&Yk#-dH4M-C7kb5@A+El=Yrn`eoDH\54-N52+i*WRc\_5Rb"Bg]/o])H4_kohMa50V]D0M7L>Bj0YY5E?Y4^PR>&='7d+PfAta32"4Oe:f>&p;AoXO3o.?-0BiF/];*oWN@'qJt6bb)EEb]QZ8B.MYRA34XmD5#u^,,SK^DUn3*9mo^_,;H\S+^>%(aZOB7J5lZa;<%.!4RMICtah.BU&!a2k.tbI\]0"c>jsDlm.auBeSV1;8VdM\TY%(g=((RNG$l[3$)cuV89LmflLA6S8#">2nN?IR$<ajL2;LG_6)N*'Z5'%1_r-8BL@kS8J<CA!Zq!!poZfN)Z+V6me$GhP)h32Ql90XhE?8$S+s,BFt[!NI^uYCeHQ_nXscmmbH^$GDGf0(AcH="F@?-:=U6+S~>
 endstream
 endobj
 6 0 obj
@@ -41,6 +41,7 @@ endobj
 40 0 R
 42 0 R
 44 0 R
+46 0 R
 ]
 endobj
 8 0 obj
@@ -86,7 +87,7 @@ endobj
 16 0 obj
 << /Type /Annot
 /Subtype /Link
-/Rect [ 108.0 486.866 135.5 474.866 ]
+/Rect [ 108.0 486.866 150.164 474.866 ]
 /C [ 0 0 0 ]
 /Border [ 0 0 0 ]
 /A 17 0 R
@@ -96,7 +97,7 @@ endobj
 18 0 obj
 << /Type /Annot
 /Subtype /Link
-/Rect [ 108.0 468.666 176.168 456.666 ]
+/Rect [ 108.0 468.666 135.5 456.666 ]
 /C [ 0 0 0 ]
 /Border [ 0 0 0 ]
 /A 19 0 R
@@ -106,7 +107,7 @@ endobj
 20 0 obj
 << /Type /Annot
 /Subtype /Link
-/Rect [ 108.0 450.466 138.164 438.466 ]
+/Rect [ 108.0 450.466 176.168 438.466 ]
 /C [ 0 0 0 ]
 /Border [ 0 0 0 ]
 /A 21 0 R
@@ -116,7 +117,7 @@ endobj
 22 0 obj
 << /Type /Annot
 /Subtype /Link
-/Rect [ 108.0 432.266 178.832 420.266 ]
+/Rect [ 108.0 432.266 138.164 420.266 ]
 /C [ 0 0 0 ]
 /Border [ 0 0 0 ]
 /A 23 0 R
@@ -126,7 +127,7 @@ endobj
 24 0 obj
 << /Type /Annot
 /Subtype /Link
-/Rect [ 108.0 414.066 144.836 402.066 ]
+/Rect [ 108.0 414.066 178.832 402.066 ]
 /C [ 0 0 0 ]
 /Border [ 0 0 0 ]
 /A 25 0 R
@@ -136,7 +137,7 @@ endobj
 26 0 obj
 << /Type /Annot
 /Subtype /Link
-/Rect [ 108.0 395.866 163.496 383.866 ]
+/Rect [ 108.0 395.866 144.836 383.866 ]
 /C [ 0 0 0 ]
 /Border [ 0 0 0 ]
 /A 27 0 R
@@ -146,7 +147,7 @@ endobj
 28 0 obj
 << /Type /Annot
 /Subtype /Link
-/Rect [ 108.0 377.666 151.168 365.666 ]
+/Rect [ 108.0 377.666 168.496 365.666 ]
 /C [ 0 0 0 ]
 /Border [ 0 0 0 ]
 /A 29 0 R
@@ -156,7 +157,7 @@ endobj
 30 0 obj
 << /Type /Annot
 /Subtype /Link
-/Rect [ 108.0 359.466 185.14 347.466 ]
+/Rect [ 108.0 359.466 151.168 347.466 ]
 /C [ 0 0 0 ]
 /Border [ 0 0 0 ]
 /A 31 0 R
@@ -166,7 +167,7 @@ endobj
 32 0 obj
 << /Type /Annot
 /Subtype /Link
-/Rect [ 108.0 341.266 163.156 329.266 ]
+/Rect [ 108.0 341.266 185.14 329.266 ]
 /C [ 0 0 0 ]
 /Border [ 0 0 0 ]
 /A 33 0 R
@@ -176,7 +177,7 @@ endobj
 34 0 obj
 << /Type /Annot
 /Subtype /Link
-/Rect [ 108.0 323.066 161.824 311.066 ]
+/Rect [ 108.0 323.066 163.156 311.066 ]
 /C [ 0 0 0 ]
 /Border [ 0 0 0 ]
 /A 35 0 R
@@ -186,7 +187,7 @@ endobj
 36 0 obj
 << /Type /Annot
 /Subtype /Link
-/Rect [ 108.0 304.866 159.832 292.866 ]
+/Rect [ 108.0 304.866 161.824 292.866 ]
 /C [ 0 0 0 ]
 /Border [ 0 0 0 ]
 /A 37 0 R
@@ -196,7 +197,7 @@ endobj
 38 0 obj
 << /Type /Annot
 /Subtype /Link
-/Rect [ 108.0 286.666 188.476 274.666 ]
+/Rect [ 108.0 286.666 159.832 274.666 ]
 /C [ 0 0 0 ]
 /Border [ 0 0 0 ]
 /A 39 0 R
@@ -206,7 +207,7 @@ endobj
 40 0 obj
 << /Type /Annot
 /Subtype /Link
-/Rect [ 108.0 268.466 157.168 256.466 ]
+/Rect [ 108.0 268.466 188.476 256.466 ]
 /C [ 0 0 0 ]
 /Border [ 0 0 0 ]
 /A 41 0 R
@@ -216,7 +217,7 @@ endobj
 42 0 obj
 << /Type /Annot
 /Subtype /Link
-/Rect [ 108.0 250.266 167.824 238.266 ]
+/Rect [ 108.0 250.266 157.168 238.266 ]
 /C [ 0 0 0 ]
 /Border [ 0 0 0 ]
 /A 43 0 R
@@ -226,7 +227,7 @@ endobj
 44 0 obj
 << /Type /Annot
 /Subtype /Link
-/Rect [ 108.0 232.066 211.804 220.066 ]
+/Rect [ 108.0 232.066 167.824 220.066 ]
 /C [ 0 0 0 ]
 /Border [ 0 0 0 ]
 /A 45 0 R
@@ -234,25 +235,20 @@ endobj
 >>
 endobj
 46 0 obj
-<< /Length 1856 /Filter [ /ASCII85Decode /FlateDecode ]
- >>
-stream
-Gau0DgMZ%0&:O:S#lBhd#qbH1m8Go;[U!\cmD^_S1ju#C3p'Tm?&FN'IXO`;D'VbLS@/\7S$^6s1M<le...@Cr>=[:u^!a/dHS(rJ3hU.g<<,lEe&!3(5<:htRC'>)\=[o1n1P]j1J_ocAD(m=#!O:iKrK#4UL1"akP?0;>[K@Lf)YiK!^jUZ#E;%ckIA%-],J>tKu3u!07,@Oi`FpkBfqX.H=Q7>VZ:<3\4qt$+`k?8?F'gs=GPQGQ7p;"$/eUu=T3ZR%k:PnJ*L[H2'Dk92;#8Dcb4A[DYhj>0/n)toO1B*SRo8IOs2b\+BOr8NWR2\IF4U%8.#4FDbKpWFB3'<'Vi=Nj4Qa+?'^DnEaPgE,mepp+?JK7V]h6p5/Bd8m-JQGHudYH,E&K<p8_TVYM5jV)9VJQlmiB*8/'Ah!A3(\;Q<Cg$g9X+-SFogPS9o`3f1/@GB@lLo-/B>Cs$5j0r05:URf5*S(/2]pJN.O8[Ood,/)>Cg^QJF"s:M6',1=mgSe!"i%W`@tqK?Apt'@-pXe7f&$JI@cC83t@-Sn3urE"-+rQl@IL7G6kG"W!ekM"?jR8p='2JXdq0+i@g-Aqh2[:X0'"#0pn!58L@/Yec@a,jY$?N*(m8FRr^6.lLZSn'<aQN5qDFZ+Mi(qgLT^M7"H7N5":>l%`uaLO&\)cqQaS0Wq\MqfCg
 Ql4d]boJ+oLN-%R]lSeiokS\=.:.3fA-^=,jY;]P?s)^WP'@LPCdS@Ws3<Q@...@88>EO*l\rI"[p7#q*iNX7S"_Z/>1d1&s%ST/0*==9,Z?iQ"6A^U"6`uu1K)+3N\TV?`JPN`;g?EQn7TjmsQh\Cr,Wi/'B],/mXuatO1),\WI`@gD9/>@Z$Kuc-`^k[;H</5TO^e;c3bU>P78IQKL.*3Ee82XNN<P7^Wt!PD;,1d1YmP3NOp]V:.T32eOq=u[HnC%?[\ZD&N*D(@TSue5=O8qWG/j):Y:uC&T:n!)#uk^TkJbM=FCBs;;pQ\;XV-^G;RT+X1P4I5c.XntYp(k;ZA]$Y7:BSX5SJ9PQ,i;KH>uXr6@oUcN4R]RI-H35(Q?>faqD5oAG?mn2M&XH#+%3"Zk(UjG])SGZN=uto&m#!CZIKH9kp"9!&!Sj0VPp.8ZD/GXS>iWJ\ne>_qXAQ>H7XMdCod>K[HqBgCDq;jZMW+)/I"$;bOHt7_Wp+<olS\iCO.m.n?=SdCpd)ef6`P8"QA'q%"["Cg-~>
-endstream
-endobj
-47 0 obj
-<< /Type /Page
-/Parent 1 0 R
-/MediaBox [ 0 0 612 792 ]
-/Resources 3 0 R
-/Contents 46 0 R
+<< /Type /Annot
+/Subtype /Link
+/Rect [ 108.0 213.866 211.804 201.866 ]
+/C [ 0 0 0 ]
+/Border [ 0 0 0 ]
+/A 47 0 R
+/H /I
 >>
 endobj
 48 0 obj
-<< /Length 1335 /Filter [ /ASCII85Decode /FlateDecode ]
+<< /Length 1856 /Filter [ /ASCII85Decode /FlateDecode ]
  >>
 stream
-Gau1.968iG&:j6G'g12+'nSBdU[?QF3phli.&WpILkI$3I&J0%fDYAJ^'m7B-W3j%8!X-q\VpF[`S8r&kLJS\"UVX,H+/Sa_L[parc?Kc?4%Sq&X'rn@(l?>\G`9)-&=U+^UY-]Tl=GJ=l<Tl...@gDl7>4$@6%2<l&D;ofAL:#4u'"l^0ckp#(DLP>=HAmp
 %+YaD)P?ndFiA:I_3[BAZD-_9F*?npdMtobr?l)U>-aRcbZ6Ms$(QID?l\Ma*__B3bX0M(iR7oQ"O5/-c1IUE:.Ws:Q%6T8@rKE-dakP=G`ZJB$Sfa2r[;k[-H?'0LB\XjT>-smIo7#1/4nIg-"q_"#iB]hM2ka0@frJXSFI95j:f@%U03cV<h/HG\NQJhWTC-!'E%F\QiKTqi^u!Jk9Jjgf)e4o&E&@)ND1-!>3?Z-?8dINt_@U260+##I=Gid;eT?2<\Z>GMVAjOPk=,>W7Kp%IMQsOhe``EMiHVA0J#YEOP;:G/IFXWt?W3(3QKNG=l`Qed#5jNC7FlJY!@-*U&-~>
+Gau0DgMZ%0&:O:S#lBhd#qbH1m8Go;[U!\cmD^_S1ju#C3p'Tm?&FN'IXO`;D'VbLS@/\7S$^6s1M<le...@Cr>=[:u^!a/dHS(rJ3hU.g<<,lEe&!3(5<:htRC'>)\=[o1n1P]j1J_ocAD(m=#!O:iKrK#4UL1"akP?0;>[K@Lf)YiK!^jUZ#E;%ckIA%-],J>tKu3u!07,@Oi`FpkBfqX.H=Q7>VZ:<3\4qt$+`k?8?F'gs=GPQGQ7p;"$/eUu=T3ZR%k:PnJ*L[H2'Dk92;#8Dcb4A[DYhj>0/n)toO1B*SRo8IOs2b\+BOr8NWR2\IF4U%8.#4FDbKpWFB3'<'Vi=Nj4Qa+?'^DnEaPgE,mepp+?JK7V]h6p5/Bd8m-JQGHudYH,E&K<p8_TVYM5jV)9VJQlmiB*8/'Ah!A3(\;Q<Cg$g9X+-SFogPS9o`3f1/@GB@lLo-/B>Cs$5j0r05:URf5*S(/2]pJN.O8[Ood,/)>Cg^QJF"s:M6',1=mgSe!"i%W`@tqK?Apt'@-pXe7f&$JI@cC83t@-Sn3urE"-+rQl@IL7G6kG"W!ekM"?jR8p='2JXdq0+i@g-Aqh2[:X0'"#0pn!58L@/Yec@a,jY$?N*(m8FRr^6.lLZSn'<aQN5qDFZ+Mi(qgLT^M7"H7N5":>l%`uaLO&\)cqQaS0Wq\MqfCg
 Ql4d]boJ+oLN-%R]lSeiokS\=.:.3fA-^=,jY;]P?s)^WP'@LPCdS@Ws3<Q@...@88>EO*l\rI"[p7#q*iNX7S"_Z/>1d1&s%ST/0*==9,Z?iQ"6A^U"6`uu1K)+3N\TV?`JPN`;g?EQn7TjmsQh\Cr,Wi/'B],/mXuatO1),\WI`@gD9/>@Z$Kuc-`^k[;H</5TO^e;c3bU>P78IQKL.*3Ee82XNN<P7^Wt!PD;,1d1YmP3NOp]V:.T32eOq=u[HnC%?[\ZD&N*D(@TSue5=O8qWG/j):Y:uC&T:n!)#uk^TkJbM=FCBs;;pQ\;XV-^G;RT+X1P4I5c.XntYp(k;ZA]$Y7:BSX5SJ9PQ,i;KH>uXr6@oUcN4R]RI-H35(Q?>faqD5oAG?mn2M&XH#+%3"Zk(UjG])SGZN=uto&m#!CZIKH9kp"9!&!Sj0VPp.8ZD/GXS>iWJ\ne>_qXAQ>H7XMdCod>K[HqBgCDq;jZMW+)/I"$;bOHt7_Wp+<olS\iCO.m.n?=SdCpd)ef6`P8"QA'q%"["Cg-~>
 endstream
 endobj
 49 0 obj
@@ -264,10 +260,10 @@ endobj
 >>
 endobj
 50 0 obj
-<< /Length 1262 /Filter [ /ASCII85Decode /FlateDecode ]
+<< /Length 1292 /Filter [ /ASCII85Decode /FlateDecode ]
  >>
 stream
-Gau1.9lo&I&;KZM'f[Nr21eVQ*"u,=Br@Ln@boHR-k`9$;M7Ag<h3UT,q0IW.b[oN*fhU!7:KW:cXHp'=Kd0[YJ.+e.cLEf.OCIT.#Qq_aStdj'GS`XU.1j$lLX;YZO[=rKm3:'4,GA<0@nkm)'1!k8(%+)A2kb7XnV&F)neI8C9MBA=`*Ht/\5B.Li9T1E.KmDC@PO#-X-Or2Ai>o9S;.Ojdt/k2L!PUfgAf-r%u>G)hO81+WU1DK$sX(Ou,J'.FI^Q?Tt45r$fV41k-u/OZ[S*7[/rDKRsM49A(_\@Mm%?r77k0nW5W1C4)_+m5!d*MKgHo6,[?pK=!BWQqBE:IIC(blKEiW\m3eN9TKQ/AQ'SSqoO8+h!'4LOiV@Q;]]/To9-JA0Yfn*2VWp)F47'\,p8lmdqNQhHc_o*KPij:O2"\S?YH%X+bP]1Y0+CcZ6nICX)ctj[oq`TX#f!7^>uH)B!8r[#$n<;.3sp$nNm*X`UJ1b/=FGUX/D:#ZD8*;9BSWRB8*F6i_)^6ia0t>\jqi[U]Lp#58J69khaml\r_-IYVj[NH!eK4@ZK+unp`=r6iM<56?8HZ\/p24n0!R""PcAkW4fHNOau@&$ULsC^u25SA&d7QCYN6&HV7eFWe65@<\:eKUUFL<q"";8QOsgKDFtolR\oq-KQoglg@T\X4=8FEpe45'K\?O8Kt_jL&FkS81eFi=`'oPpb-"2J;Gc,Mc8G6;GH&rkc0F(?HBYbZgSJ-'=C%70l#E"s5,enQbr33Y5*B=<S:!=\BF.edn72Mp<>Fk8q;5!7eI5b1Qe)j\E=?XYe6,!nk!9e,69#B*ZoBE@5V*nPg9)u,HZn0Oks*QE)4W\78_b1ShicTda`ms^aT"Pi_2/o8\qt(\o/mM;/V0](-4.:&,S<".:At"f(a-rFra9JC?lfHdXNOc^Q^=bUXX]ga/p>MfW6k`kMHNM9/X5qgERBSp$1)tC'XgGuMA]L^iB!F
 )W0LWk7c@GaZ#iU\-tY+57QJAFTA&s!>\?iKDH9j8]=OZ\46)e+EW=7/43cpD*CC,IQmYXZCIoM>(lY3U[.rK"Z@"bV6bc1PM"s-uI-Ke()fAAe)ncQ6K9`2RE))=hPt!Hk]ntLc7!^IaJioWDPkJjirfraW52f5"Oq@ap%?"Y5GJ=i+he"'h&ciY0*KP-`iN^elDD3tDHK5!4P.HG]'"M\(11pkTZ\J83D!`rm]IS3'X,H585!N(J/f8W<?EE($rh'Vb]_`L;H@:J~>
+Gau0CgN)%,&:N/3n1gN6;-XD]DmiSkdV3@B=F"ZX!)\i2L)1SXm(-Q]jimp=C(dB9GU.Q#/G<Jt_(KuG>l:s6r3[Zh(-Zr#$mV:<BaWa&[/XJ?RNWhGi_6X]r3j-7WWOQ'#.&fl'a^T'@(BFuc3_B18U<lm;2TY)/<euKg`(;8mbK@2<i4#`V064CTg/4&?J#!Anjg"`\OV45aqSGZqo]:[Ig++sP.5@LqVfK,AAHG<;Bp(r&Jcoa/ec*Jj=tCAOX.;(9b9f.`jI8]&7D"T#U-a+cE':qM+#>A0L8Bo52:0kNh_S7?<?":<BQpkeP%2Oo`!s6S*F[p\!-X%>+<9FD.*Kq?*,L7hIr8E\f!_cX#)i00Yt[0XQ5,;6ou&S+YrKPc?O9.D6Ub+cC6\[o`W6FULtjB3%+a@Ad"HV9I,)!C'9_S2&fO?6Ii/4C8O.C39+L.:(dLAbm4C1!o.(c&$CAcl]=V@H*_YIgU`gX+0FEpf!TL)$M-(`]XsbHJnH(n0iH66l8<kFP/@e*q)n-\*-"%1O9Ri6lulIGa$7c?,p?Nh.-9Mp69&V6Em[CjRR/pP:I`#(%WA&1-KJuA],@ElM(,jYGL6]_Ul9O/,Ib^;ZCP\>Kl?*FL5LaVoF]2Bb$L3I9HeiFI(!0ITu=0tD&KQpo>=.cRGs#NF`+0j&gNgls)@>]hgClOcVT9<YuTt\Ms8&P?1.%$<;r+G5#jMEfB2\DM<BkBFgX([4m(C066\/P.V\uBKP1<Fg0&LLmq_*!'ua:4fXPOhW/d1q;\C<(''_Qi5/Z;<l:?UiWZ&&kDmaMQh?cKq9Hh6j\UpPJ+Mrl1naYnrbEZs=6i](.YeTLsS<upPU@qk6_?7R#9lt.IJe490SIYFJq!Y:?\Zai<Hqh_BCMt26KMtH=2X[BGrm6L5^>-)ra`22LN[WM_V\7-+TG?XjKMkn\Xp9SSZ9TeV+YW1rJH5^Bd<#0laYLfbd*8]p.eJ0sf_jr
 $`qn%N;*P9U35,qFM6#-kh&hNL,r_tZ:L#UF\ceYuARR)Fb;57fd1LcEo8p$),FA`?H)'O99Xo\k`CGLd%N$hWmb&Y@',2+?&Z=;<`U...@4>&#;]:hm4EUD,#rgn66BFqBg4R<Va\hgM;:/k.N#9Yf7^rLL3C*M8[rF)[KP<A9E1^"cK1`XL9Ws'O.Un^$V!Yd9\C]Wfq^:"P/\:USf+Fu)P=73$-YmralAZobSUFj`r1eGOaDDCT-(UE#i)UPUdD]u)gGHo59Q)2<\:4P*d!.Y~>
 endstream
 endobj
 51 0 obj
@@ -279,10 +275,10 @@ endobj
 >>
 endobj
 52 0 obj
-<< /Length 568 /Filter [ /ASCII85Decode /FlateDecode ]
+<< /Length 1292 /Filter [ /ASCII85Decode /FlateDecode ]
  >>
 stream
-GasId?#SI?'Rf_Z\<#lADR^MlIU&qMdaUkUlA%r8+)!tR:PkVTVd9?$n<^q+X3.a,!1.ada'9D%f-5K4#e'`G:3)'tZ7PTS+kuuY:GJ%^3"(eh?#oc*H;;PVeVg7,idRWS,ciM*rZUJ5--(rN-k>`^G&Qc%0CO(P^!pq*fd7.*1!aH;Y:e`6MJp04L-!p;Ksh^aD(Abl!SeGST)<R;KBe\r*`\Ch2EBl.WIWE'pJ`s3W/12:#t\V<q=h+c5Fnp'SKEhQ=Vn-03p-7&:a<U1-pI-:b0:2j8Nlg7^jF[Rh@>e1@'_YOIk+G$i2g&de1**<.5KeG9k0skA^le8q>'t9J5,D@VSV68'AZPBUf$k3kI6Jb+8B<e6$ngpG=;7cM!'C88$golRk'3'auIU_c7<*nLZY3\\>lULQ&h,9c%jp@&Q>XhO;gP>gXnDoD"OmM>bG,M`*9R=P0)p<`.iVjRO]PVgHneISk7;GT6B_oW]n/.EkCX(<k@tj2jY3iB.OFh(nBhUjA^p'lV6t[>Vrafcdg`+AR/_D[bh>:EM"FkI=BLcNPW,SE*`F(~>
+Gau1.hijNf&BE],=6MB,W>5@7nX/,(dWX?49B*Fh%iAh]/I"_\3S2$[$O.lepgVS!F*"eAT\\.I^9#m-<f8&$Mm!MG[da<:OUt2_'LhL@AG:?u3QEnPaD/(gHs1pmmK15/nEtc"-kU$0@C97"IM%,qMG=O*_\!Jo[7A!Hq8mGsbCd6mb3m_6dr3Wsoe,.OVVDr5R9*P'f4Etplr-i/QJP^:`S%-4of)darJ=RiSAjS(M_XW9XY9SH.t(/9mbjnu3l*:CKVRs@:tiTUOsl"M(1"ZLq'-f874F8:@Sq]5j?^=c7/<fe@EO748_GP(MSY.9[&JZd"#r%:J0LS08r,Zl-\s,b_,Si]]_=&0F)$\P]F%Z.0G.S)BrS/AG$f/]U$EeJ0Nlfc!7cMjWR^_(.CHRlrgdbkH]abf[beEddC)^fO5@'WVG#7\MR9PL"<^"8agaF=58:[B<n`q@X=lt[WiE"1eKfjen`VN';\/#>>*;S=`3I!^9p/+fQ:u%&SsmB:-k8CtbG$2#Qdi.3&rFC*G&T(6;BIPZm.55ZR+Wa^J=`[0j3D0s^K38F:4%(K9jWa'!=.NE<?9k^<E@G&5U_NC\2@(,DWSHHI/b-^\gK?gd6</go!V);g"U=U)P&afIp5j^calg%KqEBi2q?d_dhc[u_'4K_1&4)NJJdf&A0D4X:Y[R5_-nLD-6_t:+WF]o'X;$S1I83(\AF=q@3stWi]K/*=jph,maV7dHS4bi$s^b2)En**6f@P88&-?oUg5j\8&/[Em>k$KKSR@[ESBW7"Lq!AXOO?T30,ahL9pBClg_f4m6(e<>o]BbeutSY8(2_=iq%(QcQe%]8]T0YU2d7.,K(4O\Z=<SKU@@F'-HK/W=R>i3pg5R`8VVT/oLp3,*!>.g^GTATJmgRR:+sr:#1K/iB"*KG=pJPD.'T8A]GqlGg%XF2jN?^n=\G[Y*(`ZK*j+gj%"JoJ.JM/37Y=L?TG/)&QgK*.moc
 @N3%cZqIHX>PD9]X*4jMV>["t&(Q;:8]A;cKCu>Zr^X=QF$uLJfmL5q!P5FdFi)mLh?I+hP;9'>)nVhmfa1br0P4'G0;Llno0-H.0,8>c?ap'$(5GZtH5_3Q*M'M/l[csjSpMP5Sb/Tlm:a&Z_.:pqMpgL4"GhMJ*1[^HuV^WcPXuK%bCkjR6dVTgsGh]%T<%"V"MrFST^ChthQ:W?a'!U>'_LAEn0,B!ep2(sR?/>KfOueL5&ij_b'W3n&@eKG]C==/$l[AA,[:MNs9%1)?E(1q]p1t2UdBh-'X51P'8qLp~>
 endstream
 endobj
 53 0 obj
@@ -293,186 +289,209 @@ endobj
 /Contents 52 0 R
 >>
 endobj
+54 0 obj
+<< /Length 723 /Filter [ /ASCII85Decode /FlateDecode ]
+ >>
+stream
+Gatn#6#W5H'Z]Zi$6S"i?>X2)I;Gs\daUkUb+[7l!t>`K,'I^kG1ic8&/(IuY+7C<"M]`jhV\>Tjs#^IA^P!U:t]/VOi2cIOsKEZj5"rL6jbYDOB(Kf\rA?!?,.km@.r9D,=:,ifeUGC,2E/'g+VM$'$O1\7c-u/Sh"*<U)E@aS1Mm1A$j[en[UtD<N0!W1X>c8V4B)QmZ^L1=)R,plg7#Q"fLPhb!*R:&eeYC,q:=jN+Mt3TCTiML)R`A(k`S_7bsUIdbQpL![1dB[i^(46A'W<5]X6$!Trpn^D)fTn)%5%-GTrD.jdLa"PYiCd)q%d8&2WnJ[=tNa@7bl^d'm4\'0f1RqWEa<H!8lF]D`G<YObY(@SWX]63^hDH#1I(Ea6G7bD$)q>]At/:i$^5E:b&fhRf&F>?,UCL,7-\'",NS(opE^<M`P^lnXP6_$KkDPQZKmebja4`?(@8#WINE,^qT+'=d5a08KIW=Y`)S5VI2S:2I/\c6^;K;Gj=geAhd-5'\kh':@O*LfNI2Q'*Q-G=LHD&EpHcoBqDMcF+H9gPW_ol"3!R_:Z=dV*9oLXF;r_X%)]Q9`RtDAXejYUpC<aJ;;I5bs%NS%K_"j1tp+*^6tSBZbSh_'PV(9K3Zdh<f/j0$S!@X)c`X:.=@!GKPc'.)q+)ZGDqm#b:2?40s%T\IC<8ZdhM4.\e.h<nBP!HT+6l>(08I!,pX7J?FPH~>
+endstream
+endobj
 55 0 obj
+<< /Type /Page
+/Parent 1 0 R
+/MediaBox [ 0 0 612 792 ]
+/Resources 3 0 R
+/Contents 54 0 R
+>>
+endobj
+57 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 54 0 R
- /First 56 0 R
- /Last 73 0 R
- /Count -18
+ /Parent 56 0 R
+ /First 58 0 R
+ /Last 76 0 R
+ /Count -19
  /A 9 0 R
 >> endobj
-56 0 obj
-<<
- /Title (\376\377\0\61\0\56\0\61\0\40\0\141\0\156\0\141\0\154\0\171\0\172\0\145\0\162\0\163)
- /Parent 55 0 R
- /Next 57 0 R
- /A 11 0 R
->> endobj
-57 0 obj
-<<
- /Title (\376\377\0\61\0\56\0\62\0\40\0\141\0\156\0\164)
- /Parent 55 0 R
- /Prev 56 0 R
- /Next 58 0 R
- /A 13 0 R
->> endobj
 58 0 obj
 <<
- /Title (\376\377\0\61\0\56\0\63\0\40\0\142\0\145\0\156\0\143\0\150\0\155\0\141\0\162\0\153)
- /Parent 55 0 R
- /Prev 57 0 R
+ /Title (\376\377\0\61\0\56\0\61\0\40\0\141\0\156\0\141\0\154\0\171\0\172\0\145\0\162\0\163)
+ /Parent 57 0 R
  /Next 59 0 R
- /A 15 0 R
+ /A 11 0 R
 >> endobj
 59 0 obj
 <<
- /Title (\376\377\0\61\0\56\0\64\0\40\0\144\0\142)
- /Parent 55 0 R
+ /Title (\376\377\0\61\0\56\0\62\0\40\0\141\0\156\0\164)
+ /Parent 57 0 R
  /Prev 58 0 R
  /Next 60 0 R
- /A 17 0 R
+ /A 13 0 R
 >> endobj
 60 0 obj
 <<
- /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 55 0 R
+ /Title (\376\377\0\61\0\56\0\63\0\40\0\142\0\145\0\156\0\143\0\150\0\155\0\141\0\162\0\153)
+ /Parent 57 0 R
  /Prev 59 0 R
  /Next 61 0 R
- /A 19 0 R
+ /A 15 0 R
 >> endobj
 61 0 obj
 <<
- /Title (\376\377\0\61\0\56\0\66\0\40\0\151\0\143\0\165)
- /Parent 55 0 R
+ /Title (\376\377\0\61\0\56\0\64\0\40\0\144\0\145\0\155\0\157)
+ /Parent 57 0 R
  /Prev 60 0 R
  /Next 62 0 R
- /A 21 0 R
+ /A 17 0 R
 >> endobj
 62 0 obj
 <<
- /Title (\376\377\0\61\0\56\0\67\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 55 0 R
+ /Title (\376\377\0\61\0\56\0\65\0\40\0\144\0\142)
+ /Parent 57 0 R
  /Prev 61 0 R
  /Next 63 0 R
- /A 23 0 R
+ /A 19 0 R
 >> endobj
 63 0 obj
 <<
- /Title (\376\377\0\61\0\56\0\70\0\40\0\154\0\165\0\143\0\154\0\151)
- /Parent 55 0 R
+ /Title (\376\377\0\61\0\56\0\66\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 57 0 R
  /Prev 62 0 R
  /Next 64 0 R
- /A 25 0 R
+ /A 21 0 R
 >> endobj
 64 0 obj
 <<
- /Title (\376\377\0\61\0\56\0\71\0\40\0\155\0\145\0\155\0\157\0\162\0\171)
- /Parent 55 0 R
+ /Title (\376\377\0\61\0\56\0\67\0\40\0\151\0\143\0\165)
+ /Parent 57 0 R
  /Prev 63 0 R
  /Next 65 0 R
- /A 27 0 R
+ /A 23 0 R
 >> endobj
 65 0 obj
 <<
- /Title (\376\377\0\61\0\56\0\61\0\60\0\40\0\155\0\151\0\163\0\143)
- /Parent 55 0 R
+ /Title (\376\377\0\61\0\56\0\70\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 57 0 R
  /Prev 64 0 R
  /Next 66 0 R
- /A 29 0 R
+ /A 25 0 R
 >> endobj
 66 0 obj
 <<
- /Title (\376\377\0\61\0\56\0\61\0\61\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 55 0 R
+ /Title (\376\377\0\61\0\56\0\71\0\40\0\154\0\165\0\143\0\154\0\151)
+ /Parent 57 0 R
  /Prev 65 0 R
  /Next 67 0 R
- /A 31 0 R
+ /A 27 0 R
 >> endobj
 67 0 obj
 <<
- /Title (\376\377\0\61\0\56\0\61\0\62\0\40\0\161\0\165\0\145\0\162\0\151\0\145\0\163)
- /Parent 55 0 R
+ /Title (\376\377\0\61\0\56\0\61\0\60\0\40\0\155\0\145\0\155\0\157\0\162\0\171)
+ /Parent 57 0 R
  /Prev 66 0 R
  /Next 68 0 R
- /A 33 0 R
+ /A 29 0 R
 >> endobj
 68 0 obj
 <<
- /Title (\376\377\0\61\0\56\0\61\0\63\0\40\0\162\0\145\0\155\0\157\0\164\0\145)
- /Parent 55 0 R
+ /Title (\376\377\0\61\0\56\0\61\0\61\0\40\0\155\0\151\0\163\0\143)
+ /Parent 57 0 R
  /Prev 67 0 R
  /Next 69 0 R
- /A 35 0 R
+ /A 31 0 R
 >> endobj
 69 0 obj
 <<
- /Title (\376\377\0\61\0\56\0\61\0\64\0\40\0\163\0\160\0\141\0\164\0\151\0\141\0\154)
- /Parent 55 0 R
+ /Title (\376\377\0\61\0\56\0\61\0\62\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 57 0 R
  /Prev 68 0 R
  /Next 70 0 R
- /A 37 0 R
+ /A 33 0 R
 >> endobj
 70 0 obj
 <<
- /Title (\376\377\0\61\0\56\0\61\0\65\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 55 0 R
+ /Title (\376\377\0\61\0\56\0\61\0\63\0\40\0\161\0\165\0\145\0\162\0\151\0\145\0\163)
+ /Parent 57 0 R
  /Prev 69 0 R
  /Next 71 0 R
- /A 39 0 R
+ /A 35 0 R
 >> endobj
 71 0 obj
 <<
- /Title (\376\377\0\61\0\56\0\61\0\66\0\40\0\163\0\167\0\151\0\156\0\147)
- /Parent 55 0 R
+ /Title (\376\377\0\61\0\56\0\61\0\64\0\40\0\162\0\145\0\155\0\157\0\164\0\145)
+ /Parent 57 0 R
  /Prev 70 0 R
  /Next 72 0 R
- /A 41 0 R
+ /A 37 0 R
 >> endobj
 72 0 obj
 <<
- /Title (\376\377\0\61\0\56\0\61\0\67\0\40\0\167\0\157\0\162\0\144\0\156\0\145\0\164)
- /Parent 55 0 R
+ /Title (\376\377\0\61\0\56\0\61\0\65\0\40\0\163\0\160\0\141\0\164\0\151\0\141\0\154)
+ /Parent 57 0 R
  /Prev 71 0 R
  /Next 73 0 R
- /A 43 0 R
+ /A 39 0 R
 >> endobj
 73 0 obj
 <<
- /Title (\376\377\0\61\0\56\0\61\0\70\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 55 0 R
+ /Title (\376\377\0\61\0\56\0\61\0\66\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 57 0 R
  /Prev 72 0 R
- /A 45 0 R
+ /Next 74 0 R
+ /A 41 0 R
 >> endobj
 74 0 obj
+<<
+ /Title (\376\377\0\61\0\56\0\61\0\67\0\40\0\163\0\167\0\151\0\156\0\147)
+ /Parent 57 0 R
+ /Prev 73 0 R
+ /Next 75 0 R
+ /A 43 0 R
+>> endobj
+75 0 obj
+<<
+ /Title (\376\377\0\61\0\56\0\61\0\70\0\40\0\167\0\157\0\162\0\144\0\156\0\145\0\164)
+ /Parent 57 0 R
+ /Prev 74 0 R
+ /Next 76 0 R
+ /A 45 0 R
+>> endobj
+76 0 obj
+<<
+ /Title (\376\377\0\61\0\56\0\61\0\71\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 57 0 R
+ /Prev 75 0 R
+ /A 47 0 R
+>> endobj
+77 0 obj
 << /Type /Font
 /Subtype /Type1
 /Name /F3
 /BaseFont /Helvetica-Bold
 /Encoding /WinAnsiEncoding >>
 endobj
-75 0 obj
+78 0 obj
 << /Type /Font
 /Subtype /Type1
 /Name /F5
 /BaseFont /Times-Roman
 /Encoding /WinAnsiEncoding >>
 endobj
-76 0 obj
+79 0 obj
 << /Type /Font
 /Subtype /Type1
 /Name /F1
 /BaseFont /Helvetica
 /Encoding /WinAnsiEncoding >>
 endobj
-77 0 obj
+80 0 obj
 << /Type /Font
 /Subtype /Type1
 /Name /F2
 /BaseFont /Helvetica-Oblique
 /Encoding /WinAnsiEncoding >>
 endobj
-78 0 obj
+81 0 obj
 << /Type /Font
 /Subtype /Type1
 /Name /F7
@@ -482,226 +501,235 @@ endobj
 1 0 obj
 << /Type /Pages
 /Count 5
-/Kids [6 0 R 47 0 R 49 0 R 51 0 R 53 0 R ] >>
+/Kids [6 0 R 49 0 R 51 0 R 53 0 R 55 0 R ] >>
 endobj
 2 0 obj
 << /Type /Catalog
 /Pages 1 0 R
- /Outlines 54 0 R
+ /Outlines 56 0 R
  /PageMode /UseOutlines
  >>
 endobj
 3 0 obj
 << 
-/Font << /F3 74 0 R /F5 75 0 R /F1 76 0 R /F2 77 0 R /F7 78 0 R >> 
+/Font << /F3 77 0 R /F5 78 0 R /F1 79 0 R /F2 80 0 R /F7 81 0 R >> 
 /ProcSet [ /PDF /ImageC /Text ] >> 
 endobj
 9 0 obj
 <<
 /S /GoTo
-/D [47 0 R /XYZ 85.0 659.0 null]
+/D [49 0 R /XYZ 85.0 659.0 null]
 >>
 endobj
 11 0 obj
 <<
 /S /GoTo
-/D [47 0 R /XYZ 85.0 339.066 null]
+/D [49 0 R /XYZ 85.0 339.066 null]
 >>
 endobj
 13 0 obj
 <<
 /S /GoTo
-/D [47 0 R /XYZ 85.0 266.613 null]
+/D [49 0 R /XYZ 85.0 266.613 null]
 >>
 endobj
 15 0 obj
 <<
 /S /GoTo
-/D [47 0 R /XYZ 85.0 194.16 null]
+/D [49 0 R /XYZ 85.0 194.16 null]
 >>
 endobj
 17 0 obj
 <<
 /S /GoTo
-/D [49 0 R /XYZ 85.0 637.8 null]
+/D [51 0 R /XYZ 85.0 637.8 null]
 >>
 endobj
 19 0 obj
 <<
 /S /GoTo
-/D [49 0 R /XYZ 85.0 565.347 null]
+/D [51 0 R /XYZ 85.0 552.147 null]
 >>
 endobj
 21 0 obj
 <<
 /S /GoTo
-/D [49 0 R /XYZ 85.0 492.894 null]
+/D [51 0 R /XYZ 85.0 479.694 null]
 >>
 endobj
 23 0 obj
 <<
 /S /GoTo
-/D [49 0 R /XYZ 85.0 407.241 null]
+/D [51 0 R /XYZ 85.0 407.241 null]
 >>
 endobj
 25 0 obj
 <<
 /S /GoTo
-/D [49 0 R /XYZ 85.0 321.588 null]
+/D [51 0 R /XYZ 85.0 321.588 null]
 >>
 endobj
 27 0 obj
 <<
 /S /GoTo
-/D [49 0 R /XYZ 85.0 249.135 null]
+/D [51 0 R /XYZ 85.0 235.935 null]
 >>
 endobj
 29 0 obj
 <<
 /S /GoTo
-/D [49 0 R /XYZ 85.0 176.682 null]
+/D [51 0 R /XYZ 85.0 163.482 null]
 >>
 endobj
 31 0 obj
 <<
 /S /GoTo
-/D [51 0 R /XYZ 85.0 616.6 null]
+/D [53 0 R /XYZ 85.0 616.6 null]
 >>
 endobj
 33 0 obj
 <<
 /S /GoTo
-/D [51 0 R /XYZ 85.0 530.947 null]
+/D [53 0 R /XYZ 85.0 530.947 null]
 >>
 endobj
 35 0 obj
 <<
 /S /GoTo
-/D [51 0 R /XYZ 85.0 458.494 null]
+/D [53 0 R /XYZ 85.0 445.294 null]
 >>
 endobj
 37 0 obj
 <<
 /S /GoTo
-/D [51 0 R /XYZ 85.0 386.041 null]
+/D [53 0 R /XYZ 85.0 372.841 null]
 >>
 endobj
 39 0 obj
 <<
 /S /GoTo
-/D [51 0 R /XYZ 85.0 313.588 null]
+/D [53 0 R /XYZ 85.0 300.388 null]
 >>
 endobj
 41 0 obj
 <<
 /S /GoTo
-/D [51 0 R /XYZ 85.0 241.135 null]
+/D [53 0 R /XYZ 85.0 227.935 null]
 >>
 endobj
 43 0 obj
 <<
 /S /GoTo
-/D [51 0 R /XYZ 85.0 168.682 null]
+/D [53 0 R /XYZ 85.0 155.482 null]
 >>
 endobj
 45 0 obj
 <<
 /S /GoTo
-/D [53 0 R /XYZ 85.0 637.8 null]
+/D [55 0 R /XYZ 85.0 616.6 null]
 >>
 endobj
-54 0 obj
+47 0 obj
+<<
+/S /GoTo
+/D [55 0 R /XYZ 85.0 544.147 null]
+>>
+endobj
+56 0 obj
 <<
- /First 55 0 R
- /Last 55 0 R
+ /First 57 0 R
+ /Last 57 0 R
 >> endobj
 xref
-0 79
+0 82
 0000000000 65535 f 
-0000013466 00000 n 
-0000013552 00000 n 
-0000013644 00000 n 
+0000013914 00000 n 
+0000014000 00000 n 
+0000014092 00000 n 
 0000000015 00000 n 
 0000000071 00000 n 
-0000001103 00000 n 
-0000001223 00000 n 
-0000001374 00000 n 
-0000013767 00000 n 
-0000001509 00000 n 
-0000013830 00000 n 
-0000001646 00000 n 
-0000013896 00000 n 
-0000001783 00000 n 
-0000013962 00000 n 
-0000001920 00000 n 
-0000014027 00000 n 
-0000002055 00000 n 
-0000014091 00000 n 
-0000002192 00000 n 
-0000014157 00000 n 
-0000002329 00000 n 
-0000014223 00000 n 
-0000002466 00000 n 
-0000014289 00000 n 
-0000002603 00000 n 
-0000014355 00000 n 
-0000002740 00000 n 
-0000014421 00000 n 
-0000002877 00000 n 
-0000014487 00000 n 
-0000003013 00000 n 
-0000014551 00000 n 
-0000003150 00000 n 
-0000014617 00000 n 
-0000003287 00000 n 
-0000014683 00000 n 
-0000003424 00000 n 
-0000014749 00000 n 
-0000003561 00000 n 
-0000014815 00000 n 
-0000003698 00000 n 
-0000014881 00000 n 
-0000003835 00000 n 
-0000014947 00000 n 
-0000003972 00000 n 
-0000005921 00000 n 
-0000006029 00000 n 
-0000007457 00000 n 
-0000007565 00000 n 
-0000008920 00000 n 
-0000009028 00000 n 
-0000009688 00000 n 
-0000015011 00000 n 
-0000009796 00000 n 
-0000009997 00000 n 
-0000010153 00000 n 
-0000010287 00000 n 
-0000010457 00000 n 
-0000010585 00000 n 
-0000010767 00000 n 
-0000010901 00000 n 
-0000011089 00000 n 
-0000011235 00000 n 
-0000011387 00000 n 
+0000001120 00000 n 
+0000001240 00000 n 
+0000001398 00000 n 
+0000014215 00000 n 
+0000001533 00000 n 
+0000014278 00000 n 
+0000001670 00000 n 
+0000014344 00000 n 
+0000001807 00000 n 
+0000014410 00000 n 
+0000001944 00000 n 
+0000014475 00000 n 
+0000002081 00000 n 
+0000014539 00000 n 
+0000002216 00000 n 
+0000014605 00000 n 
+0000002353 00000 n 
+0000014671 00000 n 
+0000002490 00000 n 
+0000014737 00000 n 
+0000002627 00000 n 
+0000014803 00000 n 
+0000002764 00000 n 
+0000014869 00000 n 
+0000002901 00000 n 
+0000014935 00000 n 
+0000003038 00000 n 
+0000014999 00000 n 
+0000003174 00000 n 
+0000015065 00000 n 
+0000003311 00000 n 
+0000015131 00000 n 
+0000003448 00000 n 
+0000015197 00000 n 
+0000003585 00000 n 
+0000015263 00000 n 
+0000003722 00000 n 
+0000015329 00000 n 
+0000003859 00000 n 
+0000015395 00000 n 
+0000003996 00000 n 
+0000015459 00000 n 
+0000004133 00000 n 
+0000006082 00000 n 
+0000006190 00000 n 
+0000007575 00000 n 
+0000007683 00000 n 
+0000009068 00000 n 
+0000009176 00000 n 
+0000009991 00000 n 
+0000015525 00000 n 
+0000010099 00000 n 
+0000010300 00000 n 
+0000010456 00000 n 
+0000010590 00000 n 
+0000010760 00000 n 
+0000010900 00000 n 
+0000011028 00000 n 
+0000011210 00000 n 
+0000011344 00000 n 
 0000011532 00000 n 
-0000011719 00000 n 
-0000011882 00000 n 
-0000012039 00000 n 
-0000012202 00000 n 
-0000012395 00000 n 
-0000012546 00000 n 
-0000012709 00000 n 
-0000012910 00000 n 
-0000013023 00000 n 
-0000013133 00000 n 
-0000013241 00000 n 
-0000013357 00000 n 
+0000011678 00000 n 
+0000011835 00000 n 
+0000011980 00000 n 
+0000012167 00000 n 
+0000012330 00000 n 
+0000012487 00000 n 
+0000012650 00000 n 
+0000012843 00000 n 
+0000012994 00000 n 
+0000013157 00000 n 
+0000013358 00000 n 
+0000013471 00000 n 
+0000013581 00000 n 
+0000013689 00000 n 
+0000013805 00000 n 
 trailer
 <<
-/Size 79
+/Size 82
 /Root 2 0 R
 /Info 4 0 R
 >>
 startxref
-15062
+15576
 %%EOF

Modified: lucene/dev/branches/branch_3x/lucene/docs/queryparsersyntax.html
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/lucene/docs/queryparsersyntax.html?rev=1072386&r1=1072385&r2=1072386&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/lucene/docs/queryparsersyntax.html (original)
+++ lucene/dev/branches/branch_3x/lucene/docs/queryparsersyntax.html Sat Feb 19 16:50:23 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-analyzers/index.html">Analyzers</a>
 </div>
@@ -156,6 +153,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/branch_3x/lucene/docs/scoring.html
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/lucene/docs/scoring.html?rev=1072386&r1=1072385&r2=1072386&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/lucene/docs/scoring.html (original)
+++ lucene/dev/branches/branch_3x/lucene/docs/scoring.html Sat Feb 19 16:50:23 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-analyzers/index.html">Analyzers</a>
 </div>
@@ -156,6 +153,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/branch_3x/lucene/docs/systemrequirements.html
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/lucene/docs/systemrequirements.html?rev=1072386&r1=1072385&r2=1072386&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/lucene/docs/systemrequirements.html (original)
+++ lucene/dev/branches/branch_3x/lucene/docs/systemrequirements.html Sat Feb 19 16:50:23 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-analyzers/index.html">Analyzers</a>
 </div>
@@ -154,6 +151,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">