You are viewing a plain text version of this content. The canonical link for it is here.
Posted to java-commits@lucene.apache.org by rm...@apache.org on 2010/01/21 03:46:03 UTC

svn commit: r901505 - in /lucene/java/trunk: ./ contrib/ contrib/analyzers/common/ contrib/analyzers/common/src/java/org/apache/lucene/analysis/snowball/ contrib/analyzers/common/src/java/org/tartarus/ contrib/analyzers/common/src/java/org/tartarus/sno...

Author: rmuir
Date: Thu Jan 21 02:45:09 2010
New Revision: 901505

URL: http://svn.apache.org/viewvc?rev=901505&view=rev
Log:
LUCENE-2226: move contrib/snowball to contrib/analyzers

Added:
    lucene/java/trunk/contrib/analyzers/common/README.txt
      - copied, changed from r901487, lucene/java/trunk/contrib/snowball/README.txt
    lucene/java/trunk/contrib/analyzers/common/SNOWBALL-LICENSE.txt
      - copied unchanged from r901487, lucene/java/trunk/contrib/snowball/SNOWBALL-LICENSE.txt
    lucene/java/trunk/contrib/analyzers/common/src/java/org/apache/lucene/analysis/snowball/
    lucene/java/trunk/contrib/analyzers/common/src/java/org/apache/lucene/analysis/snowball/SnowballAnalyzer.java
      - copied unchanged from r901487, lucene/java/trunk/contrib/snowball/src/java/org/apache/lucene/analysis/snowball/SnowballAnalyzer.java
    lucene/java/trunk/contrib/analyzers/common/src/java/org/apache/lucene/analysis/snowball/SnowballFilter.java
      - copied unchanged from r901487, lucene/java/trunk/contrib/snowball/src/java/org/apache/lucene/analysis/snowball/SnowballFilter.java
    lucene/java/trunk/contrib/analyzers/common/src/java/org/apache/lucene/analysis/snowball/package.html
      - copied, changed from r901487, lucene/java/trunk/contrib/snowball/src/java/org/apache/lucene/analysis/snowball/package.html
    lucene/java/trunk/contrib/analyzers/common/src/java/org/tartarus/
    lucene/java/trunk/contrib/analyzers/common/src/java/org/tartarus/snowball/
    lucene/java/trunk/contrib/analyzers/common/src/java/org/tartarus/snowball/Among.java
      - copied unchanged from r901487, lucene/java/trunk/contrib/snowball/src/java/org/tartarus/snowball/Among.java
    lucene/java/trunk/contrib/analyzers/common/src/java/org/tartarus/snowball/SnowballProgram.java
      - copied unchanged from r901487, lucene/java/trunk/contrib/snowball/src/java/org/tartarus/snowball/SnowballProgram.java
    lucene/java/trunk/contrib/analyzers/common/src/java/org/tartarus/snowball/TestApp.java
      - copied unchanged from r901487, lucene/java/trunk/contrib/snowball/src/java/org/tartarus/snowball/TestApp.java
    lucene/java/trunk/contrib/analyzers/common/src/java/org/tartarus/snowball/ext/
    lucene/java/trunk/contrib/analyzers/common/src/java/org/tartarus/snowball/ext/DanishStemmer.java
      - copied unchanged from r901487, lucene/java/trunk/contrib/snowball/src/java/org/tartarus/snowball/ext/DanishStemmer.java
    lucene/java/trunk/contrib/analyzers/common/src/java/org/tartarus/snowball/ext/DutchStemmer.java
      - copied unchanged from r901487, lucene/java/trunk/contrib/snowball/src/java/org/tartarus/snowball/ext/DutchStemmer.java
    lucene/java/trunk/contrib/analyzers/common/src/java/org/tartarus/snowball/ext/EnglishStemmer.java
      - copied unchanged from r901487, lucene/java/trunk/contrib/snowball/src/java/org/tartarus/snowball/ext/EnglishStemmer.java
    lucene/java/trunk/contrib/analyzers/common/src/java/org/tartarus/snowball/ext/FinnishStemmer.java
      - copied unchanged from r901487, lucene/java/trunk/contrib/snowball/src/java/org/tartarus/snowball/ext/FinnishStemmer.java
    lucene/java/trunk/contrib/analyzers/common/src/java/org/tartarus/snowball/ext/FrenchStemmer.java
      - copied unchanged from r901487, lucene/java/trunk/contrib/snowball/src/java/org/tartarus/snowball/ext/FrenchStemmer.java
    lucene/java/trunk/contrib/analyzers/common/src/java/org/tartarus/snowball/ext/German2Stemmer.java
      - copied unchanged from r901487, lucene/java/trunk/contrib/snowball/src/java/org/tartarus/snowball/ext/German2Stemmer.java
    lucene/java/trunk/contrib/analyzers/common/src/java/org/tartarus/snowball/ext/GermanStemmer.java
      - copied unchanged from r901487, lucene/java/trunk/contrib/snowball/src/java/org/tartarus/snowball/ext/GermanStemmer.java
    lucene/java/trunk/contrib/analyzers/common/src/java/org/tartarus/snowball/ext/HungarianStemmer.java
      - copied unchanged from r901487, lucene/java/trunk/contrib/snowball/src/java/org/tartarus/snowball/ext/HungarianStemmer.java
    lucene/java/trunk/contrib/analyzers/common/src/java/org/tartarus/snowball/ext/ItalianStemmer.java
      - copied unchanged from r901487, lucene/java/trunk/contrib/snowball/src/java/org/tartarus/snowball/ext/ItalianStemmer.java
    lucene/java/trunk/contrib/analyzers/common/src/java/org/tartarus/snowball/ext/KpStemmer.java
      - copied unchanged from r901487, lucene/java/trunk/contrib/snowball/src/java/org/tartarus/snowball/ext/KpStemmer.java
    lucene/java/trunk/contrib/analyzers/common/src/java/org/tartarus/snowball/ext/LovinsStemmer.java
      - copied unchanged from r901487, lucene/java/trunk/contrib/snowball/src/java/org/tartarus/snowball/ext/LovinsStemmer.java
    lucene/java/trunk/contrib/analyzers/common/src/java/org/tartarus/snowball/ext/NorwegianStemmer.java
      - copied unchanged from r901487, lucene/java/trunk/contrib/snowball/src/java/org/tartarus/snowball/ext/NorwegianStemmer.java
    lucene/java/trunk/contrib/analyzers/common/src/java/org/tartarus/snowball/ext/PorterStemmer.java
      - copied unchanged from r901487, lucene/java/trunk/contrib/snowball/src/java/org/tartarus/snowball/ext/PorterStemmer.java
    lucene/java/trunk/contrib/analyzers/common/src/java/org/tartarus/snowball/ext/PortugueseStemmer.java
      - copied unchanged from r901487, lucene/java/trunk/contrib/snowball/src/java/org/tartarus/snowball/ext/PortugueseStemmer.java
    lucene/java/trunk/contrib/analyzers/common/src/java/org/tartarus/snowball/ext/RomanianStemmer.java
      - copied unchanged from r901487, lucene/java/trunk/contrib/snowball/src/java/org/tartarus/snowball/ext/RomanianStemmer.java
    lucene/java/trunk/contrib/analyzers/common/src/java/org/tartarus/snowball/ext/RussianStemmer.java
      - copied unchanged from r901487, lucene/java/trunk/contrib/snowball/src/java/org/tartarus/snowball/ext/RussianStemmer.java
    lucene/java/trunk/contrib/analyzers/common/src/java/org/tartarus/snowball/ext/SpanishStemmer.java
      - copied unchanged from r901487, lucene/java/trunk/contrib/snowball/src/java/org/tartarus/snowball/ext/SpanishStemmer.java
    lucene/java/trunk/contrib/analyzers/common/src/java/org/tartarus/snowball/ext/SwedishStemmer.java
      - copied unchanged from r901487, lucene/java/trunk/contrib/snowball/src/java/org/tartarus/snowball/ext/SwedishStemmer.java
    lucene/java/trunk/contrib/analyzers/common/src/java/org/tartarus/snowball/ext/TurkishStemmer.java
      - copied unchanged from r901487, lucene/java/trunk/contrib/snowball/src/java/org/tartarus/snowball/ext/TurkishStemmer.java
    lucene/java/trunk/contrib/analyzers/common/src/resources/org/apache/lucene/analysis/snowball/
    lucene/java/trunk/contrib/analyzers/common/src/resources/org/apache/lucene/analysis/snowball/danish_stop.txt
      - copied unchanged from r901487, lucene/java/trunk/contrib/snowball/src/resources/org/apache/lucene/analysis/snowball/danish_stop.txt
    lucene/java/trunk/contrib/analyzers/common/src/resources/org/apache/lucene/analysis/snowball/dutch_stop.txt
      - copied unchanged from r901487, lucene/java/trunk/contrib/snowball/src/resources/org/apache/lucene/analysis/snowball/dutch_stop.txt
    lucene/java/trunk/contrib/analyzers/common/src/resources/org/apache/lucene/analysis/snowball/english_stop.txt
      - copied unchanged from r901487, lucene/java/trunk/contrib/snowball/src/resources/org/apache/lucene/analysis/snowball/english_stop.txt
    lucene/java/trunk/contrib/analyzers/common/src/resources/org/apache/lucene/analysis/snowball/finnish_stop.txt
      - copied unchanged from r901487, lucene/java/trunk/contrib/snowball/src/resources/org/apache/lucene/analysis/snowball/finnish_stop.txt
    lucene/java/trunk/contrib/analyzers/common/src/resources/org/apache/lucene/analysis/snowball/french_stop.txt
      - copied unchanged from r901487, lucene/java/trunk/contrib/snowball/src/resources/org/apache/lucene/analysis/snowball/french_stop.txt
    lucene/java/trunk/contrib/analyzers/common/src/resources/org/apache/lucene/analysis/snowball/german_stop.txt
      - copied unchanged from r901487, lucene/java/trunk/contrib/snowball/src/resources/org/apache/lucene/analysis/snowball/german_stop.txt
    lucene/java/trunk/contrib/analyzers/common/src/resources/org/apache/lucene/analysis/snowball/hungarian_stop.txt
      - copied unchanged from r901487, lucene/java/trunk/contrib/snowball/src/resources/org/apache/lucene/analysis/snowball/hungarian_stop.txt
    lucene/java/trunk/contrib/analyzers/common/src/resources/org/apache/lucene/analysis/snowball/italian_stop.txt
      - copied unchanged from r901487, lucene/java/trunk/contrib/snowball/src/resources/org/apache/lucene/analysis/snowball/italian_stop.txt
    lucene/java/trunk/contrib/analyzers/common/src/resources/org/apache/lucene/analysis/snowball/norwegian_stop.txt
      - copied unchanged from r901487, lucene/java/trunk/contrib/snowball/src/resources/org/apache/lucene/analysis/snowball/norwegian_stop.txt
    lucene/java/trunk/contrib/analyzers/common/src/resources/org/apache/lucene/analysis/snowball/portuguese_stop.txt
      - copied unchanged from r901487, lucene/java/trunk/contrib/snowball/src/resources/org/apache/lucene/analysis/snowball/portuguese_stop.txt
    lucene/java/trunk/contrib/analyzers/common/src/resources/org/apache/lucene/analysis/snowball/russian_stop.txt
      - copied unchanged from r901487, lucene/java/trunk/contrib/snowball/src/resources/org/apache/lucene/analysis/snowball/russian_stop.txt
    lucene/java/trunk/contrib/analyzers/common/src/resources/org/apache/lucene/analysis/snowball/spanish_stop.txt
      - copied unchanged from r901487, lucene/java/trunk/contrib/snowball/src/resources/org/apache/lucene/analysis/snowball/spanish_stop.txt
    lucene/java/trunk/contrib/analyzers/common/src/resources/org/apache/lucene/analysis/snowball/swedish_stop.txt
      - copied unchanged from r901487, lucene/java/trunk/contrib/snowball/src/resources/org/apache/lucene/analysis/snowball/swedish_stop.txt
    lucene/java/trunk/contrib/analyzers/common/src/test/org/apache/lucene/analysis/snowball/   (with props)
    lucene/java/trunk/contrib/analyzers/common/src/test/org/apache/lucene/analysis/snowball/TestSnowball.java
      - copied unchanged from r901487, lucene/java/trunk/contrib/snowball/src/test/org/apache/lucene/analysis/snowball/TestSnowball.java
    lucene/java/trunk/contrib/analyzers/common/src/test/org/apache/lucene/analysis/snowball/TestSnowballVocab.java
      - copied unchanged from r901487, lucene/java/trunk/contrib/snowball/src/test/org/apache/lucene/analysis/snowball/TestSnowballVocab.java
Removed:
    lucene/java/trunk/contrib/snowball/
Modified:
    lucene/java/trunk/NOTICE.txt
    lucene/java/trunk/README.txt
    lucene/java/trunk/contrib/CHANGES.txt
    lucene/java/trunk/contrib/analyzers/common/build.xml
    lucene/java/trunk/docs/contributions.html
    lucene/java/trunk/docs/demo.html
    lucene/java/trunk/docs/demo2.html
    lucene/java/trunk/docs/demo3.html
    lucene/java/trunk/docs/demo4.html
    lucene/java/trunk/docs/fileformats.html
    lucene/java/trunk/docs/gettingstarted.html
    lucene/java/trunk/docs/index.html
    lucene/java/trunk/docs/linkmap.html
    lucene/java/trunk/docs/linkmap.pdf
    lucene/java/trunk/docs/lucene-contrib/index.html
    lucene/java/trunk/docs/lucene-contrib/index.pdf
    lucene/java/trunk/docs/queryparsersyntax.html
    lucene/java/trunk/docs/scoring.html
    lucene/java/trunk/docs/systemrequirements.html
    lucene/java/trunk/src/site/src/documentation/content/xdocs/lucene-contrib/index.xml
    lucene/java/trunk/src/site/src/documentation/content/xdocs/site.xml

Modified: lucene/java/trunk/NOTICE.txt
URL: http://svn.apache.org/viewvc/lucene/java/trunk/NOTICE.txt?rev=901505&r1=901504&r2=901505&view=diff
==============================================================================
--- lucene/java/trunk/NOTICE.txt (original)
+++ lucene/java/trunk/NOTICE.txt Thu Jan 21 02:45:09 2010
@@ -5,10 +5,10 @@
 The Apache Software Foundation (http://www.apache.org/).
 
 The snowball stemmers in
-  contrib/snowball/src/java/net/sf/snowball
+  contrib/analyzers/common/src/java/net/sf/snowball
 were developed by Martin Porter and Richard Boulton.
 The snowball stopword lists in
-  contrib/snowball/src/resources/org/apache/lucene/analysis/snowball
+  contrib/analyzers/common/src/resources/org/apache/lucene/analysis/snowball
 were developed by Martin Porter and Richard Boulton.
 The full snowball package is available from
   http://snowball.tartarus.org/

Modified: lucene/java/trunk/README.txt
URL: http://svn.apache.org/viewvc/lucene/java/trunk/README.txt?rev=901505&r1=901504&r2=901505&view=diff
==============================================================================
--- lucene/java/trunk/README.txt (original)
+++ lucene/java/trunk/README.txt Thu Jan 21 02:45:09 2010
@@ -25,7 +25,7 @@
 
 contrib/*
   Contributed code which extends and enhances Lucene, but is not
-  part of the core library.  Of special note are the JAR files in the analyzers and snowball directory which
+  part of the core library.  Of special note are the JAR files in the analyzers directory which
   contain various analyzers that people may find useful in place of the StandardAnalyzer.
 
 

Modified: lucene/java/trunk/contrib/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/java/trunk/contrib/CHANGES.txt?rev=901505&r1=901504&r2=901505&view=diff
==============================================================================
--- lucene/java/trunk/contrib/CHANGES.txt (original)
+++ lucene/java/trunk/contrib/CHANGES.txt Thu Jan 21 02:45:09 2010
@@ -15,6 +15,10 @@
    preserved, but some protected/public member variables changed type. This 
    does NOT affect java code/class files produced by the snowball compiler, 
    but technically is a backwards compatibility break.  (Robert Muir)
+   
+ * LUCENE-2226: Moved contrib/snowball functionality into contrib/analyzers.
+   Be sure to remove any old obselete lucene-snowball jar files from your
+   classpath!  (Robert Muir)
     
 Changes in runtime behavior
 
@@ -94,14 +98,10 @@
 
 Build
 
- * LUCENE-2117: SnowballAnalyzer now holds a runtime-dependency on
-   contrib-analyzers to correctly handle the unique Turkish casing behavior.
-   (Robert Muir via Simon Willnauer)  
-
  * LUCENE-2124: Moved the JDK-based collation support from contrib/collation 
    into core, and moved the ICU-based collation support into contrib/icu.  
    (Steven Rowe, Robert Muir)
-
+   
 Optimizations
 
  * LUCENE-2157: DelimitedPayloadTokenFilter no longer copies the buffer

Copied: lucene/java/trunk/contrib/analyzers/common/README.txt (from r901487, lucene/java/trunk/contrib/snowball/README.txt)
URL: http://svn.apache.org/viewvc/lucene/java/trunk/contrib/analyzers/common/README.txt?p2=lucene/java/trunk/contrib/analyzers/common/README.txt&p1=lucene/java/trunk/contrib/snowball/README.txt&r1=901487&r2=901505&rev=901505&view=diff
==============================================================================
--- lucene/java/trunk/contrib/snowball/README.txt (original)
+++ lucene/java/trunk/contrib/analyzers/common/README.txt Thu Jan 21 02:45:09 2010
@@ -1,4 +1,4 @@
-Lucene Snowball README file
+Lucene Contrib Analyzers README file
 
 This project provides pre-compiled version of the Snowball stemmers
 based on revision 500 of the Tartarus Snowball repository,

Modified: lucene/java/trunk/contrib/analyzers/common/build.xml
URL: http://svn.apache.org/viewvc/lucene/java/trunk/contrib/analyzers/common/build.xml?rev=901505&r1=901504&r2=901505&view=diff
==============================================================================
--- lucene/java/trunk/contrib/analyzers/common/build.xml (original)
+++ lucene/java/trunk/contrib/analyzers/common/build.xml Thu Jan 21 02:45:09 2010
@@ -35,4 +35,20 @@
     <path refid="junit-path"/>
     <pathelement location="${build.dir}/classes/java"/>
   </path>	
+
+  <target name="compile-test" depends="download-snowball-vocab-tests, common.compile-test" />
+  <property name="snowball.vocab.rev" value="500"/>
+  <property name="snowball.vocab.url" 
+            value="svn://svn.tartarus.org/snowball/trunk/data"/>
+  <property name="snowball.vocab.dir" value="src/test/org/apache/lucene/analysis/snowball"/>
+		
+  <target name="download-snowball-vocab-tests" depends="compile-core"
+	      description="Downloads Snowball vocabulary tests">
+	<sequential>
+	  <mkdir dir="${snowball.vocab.dir}"/>
+	    <exec dir="${snowball.vocab.dir}" executable="${svn.exe}" failifexecutionfails="false" failonerror="true">
+	      <arg line="checkout --trust-server-cert --non-interactive -r ${snowball.vocab.rev} ${snowball.vocab.url}"/>
+	    </exec>
+	</sequential>
+  </target>
 </project>

Copied: lucene/java/trunk/contrib/analyzers/common/src/java/org/apache/lucene/analysis/snowball/package.html (from r901487, lucene/java/trunk/contrib/snowball/src/java/org/apache/lucene/analysis/snowball/package.html)
URL: http://svn.apache.org/viewvc/lucene/java/trunk/contrib/analyzers/common/src/java/org/apache/lucene/analysis/snowball/package.html?p2=lucene/java/trunk/contrib/analyzers/common/src/java/org/apache/lucene/analysis/snowball/package.html&p1=lucene/java/trunk/contrib/snowball/src/java/org/apache/lucene/analysis/snowball/package.html&r1=901487&r2=901505&rev=901505&view=diff
==============================================================================
--- lucene/java/trunk/contrib/snowball/src/java/org/apache/lucene/analysis/snowball/package.html (original)
+++ lucene/java/trunk/contrib/analyzers/common/src/java/org/apache/lucene/analysis/snowball/package.html Thu Jan 21 02:45:09 2010
@@ -20,5 +20,34 @@
 {@link org.apache.lucene.analysis.TokenFilter} and {@link
 org.apache.lucene.analysis.Analyzer} implementations that use Snowball
 stemmers.
+<p>
+This project provides pre-compiled version of the Snowball stemmers
+based on revision 500 of the Tartarus Snowball repository,
+together with classes integrating them with the Lucene search engine.
+</p>
+<p>
+A few changes has been made to the static Snowball code and compiled stemmers:
+</p>
+<ul>
+  <li>Class SnowballProgram is made abstract and contains new abstract method stem() to avoid reflection in Lucene filter class SnowballFilter.</li>
+  <li>All use of StringBuffers has been refactored to StringBuilder for speed.</li>
+  <li>Snowball BSD license header has been added to the Java classes to avoid having RAT adding ASL headers.</li>
+</ul>
+<p>
+See the Snowball <a href ="http://snowball.tartarus.org/">home page</a> for more information about the algorithms.
+</p>
+
+<p>
+<b>IMPORTANT NOTICE ON BACKWARDS COMPATIBILITY!</b>
+</p>
+<p>
+An index created using the Snowball module in Lucene 2.3.2 and below
+might not be compatible with the Snowball module in Lucene 2.4 or greater.
+</p>
+<p>
+For more information about this issue see:
+https://issues.apache.org/jira/browse/LUCENE-1142
+</p>
+
 </body>
 </html>

Propchange: lucene/java/trunk/contrib/analyzers/common/src/test/org/apache/lucene/analysis/snowball/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Thu Jan 21 02:45:09 2010
@@ -0,0 +1 @@
+data

Modified: lucene/java/trunk/docs/contributions.html
URL: http://svn.apache.org/viewvc/lucene/java/trunk/docs/contributions.html?rev=901505&r1=901504&r2=901505&view=diff
==============================================================================
--- lucene/java/trunk/docs/contributions.html (original)
+++ lucene/java/trunk/docs/contributions.html Thu Jan 21 02:45:09 2010
@@ -186,9 +186,6 @@
 <a href="api/contrib-remote/index.html">Remote</a>
 </div>
 <div class="menuitem">
-<a href="api/contrib-snowball/index.html">Snowball</a>
-</div>
-<div class="menuitem">
 <a href="api/contrib-spatial/index.html">Spatial</a>
 </div>
 <div class="menuitem">

Modified: lucene/java/trunk/docs/demo.html
URL: http://svn.apache.org/viewvc/lucene/java/trunk/docs/demo.html?rev=901505&r1=901504&r2=901505&view=diff
==============================================================================
--- lucene/java/trunk/docs/demo.html (original)
+++ lucene/java/trunk/docs/demo.html Thu Jan 21 02:45:09 2010
@@ -186,9 +186,6 @@
 <a href="api/contrib-remote/index.html">Remote</a>
 </div>
 <div class="menuitem">
-<a href="api/contrib-snowball/index.html">Snowball</a>
-</div>
-<div class="menuitem">
 <a href="api/contrib-spatial/index.html">Spatial</a>
 </div>
 <div class="menuitem">

Modified: lucene/java/trunk/docs/demo2.html
URL: http://svn.apache.org/viewvc/lucene/java/trunk/docs/demo2.html?rev=901505&r1=901504&r2=901505&view=diff
==============================================================================
--- lucene/java/trunk/docs/demo2.html (original)
+++ lucene/java/trunk/docs/demo2.html Thu Jan 21 02:45:09 2010
@@ -186,9 +186,6 @@
 <a href="api/contrib-remote/index.html">Remote</a>
 </div>
 <div class="menuitem">
-<a href="api/contrib-snowball/index.html">Snowball</a>
-</div>
-<div class="menuitem">
 <a href="api/contrib-spatial/index.html">Spatial</a>
 </div>
 <div class="menuitem">

Modified: lucene/java/trunk/docs/demo3.html
URL: http://svn.apache.org/viewvc/lucene/java/trunk/docs/demo3.html?rev=901505&r1=901504&r2=901505&view=diff
==============================================================================
--- lucene/java/trunk/docs/demo3.html (original)
+++ lucene/java/trunk/docs/demo3.html Thu Jan 21 02:45:09 2010
@@ -186,9 +186,6 @@
 <a href="api/contrib-remote/index.html">Remote</a>
 </div>
 <div class="menuitem">
-<a href="api/contrib-snowball/index.html">Snowball</a>
-</div>
-<div class="menuitem">
 <a href="api/contrib-spatial/index.html">Spatial</a>
 </div>
 <div class="menuitem">

Modified: lucene/java/trunk/docs/demo4.html
URL: http://svn.apache.org/viewvc/lucene/java/trunk/docs/demo4.html?rev=901505&r1=901504&r2=901505&view=diff
==============================================================================
--- lucene/java/trunk/docs/demo4.html (original)
+++ lucene/java/trunk/docs/demo4.html Thu Jan 21 02:45:09 2010
@@ -186,9 +186,6 @@
 <a href="api/contrib-remote/index.html">Remote</a>
 </div>
 <div class="menuitem">
-<a href="api/contrib-snowball/index.html">Snowball</a>
-</div>
-<div class="menuitem">
 <a href="api/contrib-spatial/index.html">Spatial</a>
 </div>
 <div class="menuitem">

Modified: lucene/java/trunk/docs/fileformats.html
URL: http://svn.apache.org/viewvc/lucene/java/trunk/docs/fileformats.html?rev=901505&r1=901504&r2=901505&view=diff
==============================================================================
--- lucene/java/trunk/docs/fileformats.html (original)
+++ lucene/java/trunk/docs/fileformats.html Thu Jan 21 02:45:09 2010
@@ -186,9 +186,6 @@
 <a href="api/contrib-remote/index.html">Remote</a>
 </div>
 <div class="menuitem">
-<a href="api/contrib-snowball/index.html">Snowball</a>
-</div>
-<div class="menuitem">
 <a href="api/contrib-spatial/index.html">Spatial</a>
 </div>
 <div class="menuitem">

Modified: lucene/java/trunk/docs/gettingstarted.html
URL: http://svn.apache.org/viewvc/lucene/java/trunk/docs/gettingstarted.html?rev=901505&r1=901504&r2=901505&view=diff
==============================================================================
--- lucene/java/trunk/docs/gettingstarted.html (original)
+++ lucene/java/trunk/docs/gettingstarted.html Thu Jan 21 02:45:09 2010
@@ -186,9 +186,6 @@
 <a href="api/contrib-remote/index.html">Remote</a>
 </div>
 <div class="menuitem">
-<a href="api/contrib-snowball/index.html">Snowball</a>
-</div>
-<div class="menuitem">
 <a href="api/contrib-spatial/index.html">Spatial</a>
 </div>
 <div class="menuitem">

Modified: lucene/java/trunk/docs/index.html
URL: http://svn.apache.org/viewvc/lucene/java/trunk/docs/index.html?rev=901505&r1=901504&r2=901505&view=diff
==============================================================================
--- lucene/java/trunk/docs/index.html (original)
+++ lucene/java/trunk/docs/index.html Thu Jan 21 02:45:09 2010
@@ -184,9 +184,6 @@
 <a href="api/contrib-remote/index.html">Remote</a>
 </div>
 <div class="menuitem">
-<a href="api/contrib-snowball/index.html">Snowball</a>
-</div>
-<div class="menuitem">
 <a href="api/contrib-spatial/index.html">Spatial</a>
 </div>
 <div class="menuitem">

Modified: lucene/java/trunk/docs/linkmap.html
URL: http://svn.apache.org/viewvc/lucene/java/trunk/docs/linkmap.html?rev=901505&r1=901504&r2=901505&view=diff
==============================================================================
--- lucene/java/trunk/docs/linkmap.html (original)
+++ lucene/java/trunk/docs/linkmap.html Thu Jan 21 02:45:09 2010
@@ -184,9 +184,6 @@
 <a href="api/contrib-remote/index.html">Remote</a>
 </div>
 <div class="menuitem">
-<a href="api/contrib-snowball/index.html">Snowball</a>
-</div>
-<div class="menuitem">
 <a href="api/contrib-spatial/index.html">Spatial</a>
 </div>
 <div class="menuitem">
@@ -434,12 +431,6 @@
 <a href="api/contrib-remote/index.html">Remote</a>&nbsp;&nbsp;___________________&nbsp;&nbsp;<em>javadoc-contrib-remote</em>
 </li>
 </ul>
-            
-<ul>
-<li>
-<a href="api/contrib-snowball/index.html">Snowball</a>&nbsp;&nbsp;___________________&nbsp;&nbsp;<em>javadoc-contrib-snowball</em>
-</li>
-</ul>
 		    
 <ul>
 <li>

Modified: lucene/java/trunk/docs/linkmap.pdf
URL: http://svn.apache.org/viewvc/lucene/java/trunk/docs/linkmap.pdf?rev=901505&r1=901504&r2=901505&view=diff
==============================================================================
--- lucene/java/trunk/docs/linkmap.pdf (original)
+++ lucene/java/trunk/docs/linkmap.pdf Thu Jan 21 02:45:09 2010
@@ -20,10 +20,10 @@
 >>
 endobj
 7 0 obj
-<< /Length 1167 /Filter [ /ASCII85Decode /FlateDecode ]
+<< /Length 1136 /Filter [ /ASCII85Decode /FlateDecode ]
  >>
 stream
-GatUtgMYb*&;KZP'Y8*6biM,Qkcuf*"Vr\oM%"KWm:*oQ[%iU33L!e#DnjdN(?NsIki?KCB`=(B5;SNfXr"jTBS8'id<`E...@qcJGu>H3Is5#g"tS>WO64Itu89B,qNf93)QS/s:.KX6Wk0md8->M2eX]&=,=#nYEY3!,;"RurYKdbg5Mh<>u%1FY<$`e8X5ZBkg^g0-ZTp4$(H.r:b;l,'(
 EMq@Aq7+*6I?/sESXP*XU9I$[6mG_REZ2Jisk*XZV&OE-:#(e5_(u3g@Gd:!Gqi-/=FZcOb0-H'KO>%T@^4J'(;gkYUB:\L_RkC=Hp\d1NkRq;0fd0fdX%Vs@+L>dP<nla^p#O8q4WV\RgOmUbh2BAdFP?C5<bCLn:`FB,]Dhml*+R\~>
+GatUt?'!]!'Sc)P'tJ-6nG4C/aCSR-.oi_$)3DGX[]8+jR-]KZEC),SI\!Z6*7e4Ibgjgso013?O,q3Uc/Od!N=Z:Jg?]S/g+Q8*bo_fsM9SIY).5.Y2M^Lg2r?<dDkeUF'UjNbq/f7#bet4(iK*<NgZX!kq.M&+X2L)`L'/'>D1R2u0=`[`AQfkWc@.D;:8(HMYEJO:KS.pnpfSV0I0kWr#p<@&$?O9U0B&Zo!algU<i%:lAYI7F'au%&!uou]=0P09Mb9095R6Sl8a/p&6R$7fD1t"1b95c]j9ZAV0Up+C]C:a.Q-t*#f.=:#9A.76.kM:s>jCM1q?Ug$@lIZKe9<oJM/Lf[]=n0Ap?HjHrs?K.SUV-L3rpEIFrU>+oL>tN1/"sBpkGPd0B&[ZDGRHsZHcu%Nen/kZR+b$eY(m[N.p$9l_E,YdO1;D2pM^eBEAfTb?VAKFaUtE3[_lBUigr4[_]0b)jA:M`YImALl[cEB.pC5=g>`BQT2DWXtVp@+!\VIB)7rZB1KASAGC1cO<iHoR<+ri'd"qMcBe<1l><6[HNnC4KIq143bWat8OAq!p%RWFj-8b_`r?GR+smL6L.S=HG[$W%EaIJg6f*fZV0>ZWecN,rhS)ss3fIW6Wg?Xr[S9cOGKb%`=05XDD'epRa)8A9ka(4-B4V[68[u<]YUu*nR=1%HmIJf>LL;k=kK.r=`D6Tl?=%3R)P?T#e-?ljJ-k7j9\=qYUTiM_M*7e>`6Q3gQ`B@h_sM0i[FDSk*Ya88Za2AjZTcp9^--Oa;F[5%@pX1T0j3)aQGK5kl^R=O,kG&HBRW0`ba_rp485m274j/<Le[V#D\SLF[k1U.@NR)^mSd2%Skf(--#rY\Bh;8k:*5hUKO&HEN7n*>g<+k^e+IqC8:Yr6_@`/'g^H5sPO=`Zet/9a2j8hLCeU32cNea&Y&37Gh#:?bZbj_]P?mt0c/PRJ_+tt;A.UaY-^H*0!7OK>BX`4
 g]Pi625]]V6n;&2a&d,t6@1;R@I68ql_/<\SWK,#@o"+st'I8W,VGe'r?)eFsnY3Ag;r-RLc+8DB'TE]ZOH%ZM8WCQuUJ.TU]%khKW@(bJc08%_]02P:QKMc)C0-U$R@3qFD8E`*rrKOE35G~>
 endstream
 endobj
 8 0 obj
@@ -87,19 +87,19 @@
 xref
 0 14
 0000000000 65535 f 
-0000003247 00000 n 
-0000003311 00000 n 
-0000003361 00000 n 
+0000003216 00000 n 
+0000003280 00000 n 
+0000003330 00000 n 
 0000000015 00000 n 
 0000000071 00000 n 
 0000001219 00000 n 
 0000001325 00000 n 
-0000002584 00000 n 
-0000002690 00000 n 
-0000002802 00000 n 
-0000002912 00000 n 
-0000003023 00000 n 
-0000003131 00000 n 
+0000002553 00000 n 
+0000002659 00000 n 
+0000002771 00000 n 
+0000002881 00000 n 
+0000002992 00000 n 
+0000003100 00000 n 
 trailer
 <<
 /Size 14
@@ -107,5 +107,5 @@
 /Info 4 0 R
 >>
 startxref
-3483
+3452
 %%EOF

Modified: lucene/java/trunk/docs/lucene-contrib/index.html
URL: http://svn.apache.org/viewvc/lucene/java/trunk/docs/lucene-contrib/index.html?rev=901505&r1=901504&r2=901505&view=diff
==============================================================================
--- lucene/java/trunk/docs/lucene-contrib/index.html (original)
+++ lucene/java/trunk/docs/lucene-contrib/index.html Thu Jan 21 02:45:09 2010
@@ -186,9 +186,6 @@
 <a href="../api/contrib-remote/index.html">Remote</a>
 </div>
 <div class="menuitem">
-<a href="../api/contrib-snowball/index.html">Snowball</a>
-</div>
-<div class="menuitem">
 <a href="../api/contrib-spatial/index.html">Spatial</a>
 </div>
 <div class="menuitem">
@@ -312,9 +309,6 @@
 <a href="#remote">remote</a>
 </li>
 <li>
-<a href="#snowball">snowball</a>
-</li>
-<li>
 <a href="#spatial">spatial</a>
 </li>
 <li>
@@ -458,42 +452,37 @@
 <p>Classes to help use Lucene with RMI.</p>
 <p>See <a href="../api/contrib-remote/index.html">remote javadoc</a>
 </p>
-<a name="N10107"></a><a name="snowball"></a>
-<h3 class="boxed">snowball</h3>
-<p>Pre-compiled versions of the Snowball stemmers for Lucene.</p>
-<p>See <a href="../api/contrib-snowball/index.html">snowball javadoc</a>
-</p>
-<a name="N10116"></a><a name="spatial"></a>
+<a name="N10107"></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="N10125"></a><a name="spellchecker"></a>
+<a name="N10116"></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="N10134"></a><a name="surround"></a>
+<a name="N10125"></a><a name="surround"></a>
 <h3 class="boxed">surround</h3>
 <p>A QueryParser that supports the Span family of queries as well as pre and infix notation.</p>
 <p>See <a href="../api/contrib-surround/index.html">surround javadoc</a>
 </p>
-<a name="N10143"></a><a name="swing"></a>
+<a name="N10134"></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="N10152"></a><a name="wikipedia"></a>
+<a name="N10143"></a><a name="wikipedia"></a>
 <h3 class="boxed">wikipedia</h3>
 <p>Tools for working with wikipedia content.</p>
 <p>See <a href="../api/contrib-wikipedia/index.html">wikipedia javadoc</a>
 </p>
-<a name="N10161"></a><a name="wordnet"></a>
+<a name="N10152"></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="N10170"></a><a name="xml-query-parser"></a>
+<a name="N10161"></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/java/trunk/docs/lucene-contrib/index.pdf
URL: http://svn.apache.org/viewvc/lucene/java/trunk/docs/lucene-contrib/index.pdf?rev=901505&r1=901504&r2=901505&view=diff
==============================================================================
--- lucene/java/trunk/docs/lucene-contrib/index.pdf (original)
+++ lucene/java/trunk/docs/lucene-contrib/index.pdf Thu Jan 21 02:45:09 2010
@@ -5,10 +5,10 @@
 /Producer (FOP 0.20.5) >>
 endobj
 5 0 obj
-<< /Length 1067 /Filter [ /ASCII85Decode /FlateDecode ]
+<< /Length 1038 /Filter [ /ASCII85Decode /FlateDecode ]
  >>
 stream
-Gb!$G_/e6`&;KX9KoX7U<K\rg*1KWCkk*:P\$cNO"F+Bl,+B/?oNfRH06Cqh4]IfjJFK_+cP"!AmDF>Bi@,lnUl<N!'5$+,#p\aB-Oa=Obfk9.aCl,2AA0AImlp0fCnpF?<5]*u]DJn[</K>X^Ya@=b!tQPHh*BE5JtPsiMVekL6Jm<4G__Mk38VE>tB&&Y$1Lj1[%T!:#5Ii$"oV'E@+A7P1)+&qr9Y>>XdCh*8M:86ZrU@7K<C!rfr-@jpK5$(dp=/>Qt3DB660?0*3UVimTY7Nk^g]rSa?9\VOGQ;9W9CehIOk1Q"uO`\[!.GJ_@@LU2d`*I$H&`pjF:At*Y;T7,.W`Q`#`!!ZS_3oJ?oN8g0FJ&Ks*R:n%pgjtqV@_J@1l/kJ*Rs_mui3-#3lN8ib5pp1fQpZFX/93PApf1KVdoVelQ(E<\[hBb0nZZUqmU0N`/;hc[rQVG19*H9Nbp62k`6F;$o<N7!^%8U.9@"dtnePAe@1JG;M:g%oN8ohE<oc1pgNJp$f/S#a1#UFfW>K9#jG>$M$!Xg>o^N-E$0ZO8=$2?WS0]q#_f![2UP*JjB/_Qq5Rk`L5Xur/TplrOAM7YCfT00MPjkt[qRB1@m;onFo@su!UPRl2e&rRMG%-aS-"s\eDmqFJL,s.MUG:98XGWTqfT$haS=nj8gaMXDeq#/ioLta,/^gk3.qY2H6=!WI79UCSWDC)g*Z<0I'!YjmAs#qW]h;dhp.YB[e6jYdL^dQD98sSLSLTM5UU"N^.V;_)&AJ;abQcM"@4u5D;*qtJ]%WKWI9>Yr:WUtD$uQ[afWZ*sa=*`GjQ5+q]"Zmhh9[/.A?TCXmD<hZ+b.d]C72!6O-8G2/TNTR)15tu@)?cuE5J<sb>S-g&map(,ET`4U6:nuKAhKmD)&F^D!K,uR0aB&R,Cd3ac!9$gS-E80ob-[B^<%0iCK[X=\ZV**__PtFO,Zg7)Yce-#P=]SOJ^ci,j)cI]R]
 _D2JIEmJ;U"]Pe+rU:rM*p$h;DppY"g*)_d1Gr!eRqd<E%P\,<Y\REO];-UkHIoT.qU]1Nt<3S(~>
+Gb!$G9lldX&;KZQ'fnA\X-,_q*1KWCkk*<&Df$!fb;L"BNkfYi?f.-I@I6fU\Pso>EFa6h4KNf#9)$N^LW=q$O>=+Hc^=OLB8gY=S1s`s,W4IJ+eq>fOQDLMT7>X/q,Z=6KnpDP2udp><JB.bJ)>RNX&^$4GN:,SIYNtp_Z,RB0q=1Kj[%B*\'1F9gP%Jnk4O&q4,<6'eM_i*P&PTt+(rH4-ohasY!7rA`Ds9>a3auT2e5]l>P.r&k$L\n@'5U8`@/<Cjt[4@32=r"GS*bt&YE'+H2=@Zit(n.bXL#I4#(eJ=jJXrR8J?4[@V(c\J+,N*MsECHL>1()ok1B.c9YLrToa)9Q$01!uPPpl@Hie?kgBHp_$q@VU/52\V"VaL^eZ"jYSoRh\M\u$,<Uj?6=]+%XK:>?k*>QZ=o[E`NQVF?+d2MXnBO=^FaCqh-nQcgr%.\YUI6,%lZ;N0,;]^Rn9D`aYYr60<1lQoe*ONXZVMDa?*qk_AjgU'!ZPA)98)!]I[rrg3/bLju@TE([rhA.`U-iH"+il_G9K5IC]Gh!kKDg'g!"[ZUADAgl5HGPcu[,r$G#Fe6j7)F9H%g:/ceA*5mesq_:a'&mc&?TD"[jHnJL/c5gok6k%h=6,r]0'=5V*6*#uk]7iQjlEI%D>c<@E'a+-=*Ac2)6,WTT.du$@JL8mWdUm!I1i1s)=_<oFln_bH9(1,>l#rs/5DaJugl,BNPgJbs=lrqR5Pof(9ppY/*Pc&0ObA]51(0$RRY02aU%2qjH7S-<$t]TUfXMa(a=*`B(=gG)]Y7RLj>8^g8L.a)B$<T:KOaOWm+&,WI.+,OITkgN"dt"6*#)(?].faoXS&Sk^/%ET7G@h\I,lDW@bQRqKXY6tYbksiad&4p#CdK`drP.k%rUb@.VCJq@=)Mq/O=\/d>G#<?YB,q^fU0SL!`<,Tg\(W>Y:GSP,,>4pd=sUmn_[(R"p=L+%#Ol,oDPpee0&7?QU&
 5X4Q_ne**8k,E8o;eeLVfAN;U6fF;RGGjMVK70iJB-O,+m~>
 endstream
 endobj
 6 0 obj
@@ -44,7 +44,6 @@
 46 0 R
 48 0 R
 50 0 R
-52 0 R
 ]
 endobj
 8 0 obj
@@ -200,7 +199,7 @@
 38 0 obj
 << /Type /Annot
 /Subtype /Link
-/Rect [ 108.0 286.666 171.832 274.666 ]
+/Rect [ 108.0 286.666 159.832 274.666 ]
 /C [ 0 0 0 ]
 /Border [ 0 0 0 ]
 /A 39 0 R
@@ -210,7 +209,7 @@
 40 0 obj
 << /Type /Annot
 /Subtype /Link
-/Rect [ 108.0 268.466 159.832 256.466 ]
+/Rect [ 108.0 268.466 188.476 256.466 ]
 /C [ 0 0 0 ]
 /Border [ 0 0 0 ]
 /A 41 0 R
@@ -220,7 +219,7 @@
 42 0 obj
 << /Type /Annot
 /Subtype /Link
-/Rect [ 108.0 250.266 188.476 238.266 ]
+/Rect [ 108.0 250.266 171.16 238.266 ]
 /C [ 0 0 0 ]
 /Border [ 0 0 0 ]
 /A 43 0 R
@@ -230,7 +229,7 @@
 44 0 obj
 << /Type /Annot
 /Subtype /Link
-/Rect [ 108.0 232.066 171.16 220.066 ]
+/Rect [ 108.0 232.066 157.168 220.066 ]
 /C [ 0 0 0 ]
 /Border [ 0 0 0 ]
 /A 45 0 R
@@ -240,7 +239,7 @@
 46 0 obj
 << /Type /Annot
 /Subtype /Link
-/Rect [ 108.0 213.866 157.168 201.866 ]
+/Rect [ 108.0 213.866 175.828 201.866 ]
 /C [ 0 0 0 ]
 /Border [ 0 0 0 ]
 /A 47 0 R
@@ -250,7 +249,7 @@
 48 0 obj
 << /Type /Annot
 /Subtype /Link
-/Rect [ 108.0 195.666 175.828 183.666 ]
+/Rect [ 108.0 195.666 167.824 183.666 ]
 /C [ 0 0 0 ]
 /Border [ 0 0 0 ]
 /A 49 0 R
@@ -260,7 +259,7 @@
 50 0 obj
 << /Type /Annot
 /Subtype /Link
-/Rect [ 108.0 177.466 167.824 165.466 ]
+/Rect [ 108.0 177.466 211.804 165.466 ]
 /C [ 0 0 0 ]
 /Border [ 0 0 0 ]
 /A 51 0 R
@@ -268,287 +267,269 @@
 >>
 endobj
 52 0 obj
-<< /Type /Annot
-/Subtype /Link
-/Rect [ 108.0 159.266 211.804 147.266 ]
-/C [ 0 0 0 ]
-/Border [ 0 0 0 ]
-/A 53 0 R
-/H /I
->>
-endobj
-54 0 obj
 << /Length 1855 /Filter [ /ASCII85Decode /FlateDecode ]
  >>
 stream
 Gau0DgMZ%0&:O:S#lBhd#qbGFm8Go;[U!\cmD^_S1ju#C3p'T]?&FN'IXO`\OXrM4g*/dudN[jpB$SWa_d[eqR/Jlu8Iu*'D%rTPV8]?JL4Nd3#@mVNY9/a,BG/e`>R16iDXm[g\qJdtTt%@trA+8SR*BPtK,+tK<\r...@b>^!s4?*6r(8!(YBmJCP=pNe*J`emo3+5(N)tqd#%;JmXoMr+DEVrF]`L9T'n;0<6DREF6)io*M_3.K8WsJ?/,0eL'h:K>>Rr$+hIdmbtRuR<OPuLtjP36_$PKJ<26m-K\0Vrklhc_fY<c.5#j;gnRV0oj=^VJGTA>;BkjGkJ49<$P,Pf/#B?L-'2.ZRTbXjELem)1_%QP/m[Sq'GP_hV:)ThEV`lMXmu#?&.@&eAc;-"<,RcN'2#o*I#@qA=f9m,.J2?u<+c',ms^;FC7)('g',[Db*VhAp:[\bR8g^S@2ND-==O?Im#5C_eOh,]YQd#P@obNoT&$N>gm^`2ek!BcHc]ZhO-Fo348Ihl]V/kuNT-/^&"'5NDnRa\a'l#iR_>KZndd#_ee`@nJsq?^?_o[?,)l?I[3mJP/edbjLYg)N-pQLgD,DeMcQO_D+h2JR*ac!ST!%)iLdt%YY#q`,lj)[>@qNWVd's11c8*<1[j0jl7]#lu*6HT&ahD-.*OC7m%X[51a8,m,b9=FeN3%K3ra/8G?*HfL1ik8Y5VQ#'Wa\bfcZ@Ys`Va/s1V-VV,RX3*K`Bp_/`'5`t?rf^#m1:8[N&L9[eh0#j3Kbb_7=6+i0qlaq!t+5G>l#dsdNXAgAG;]bH["%p?dG_sr*6HLn'5*%A$#c0tS-`gC\#GqhB'N#>KNua^(VYQ=D7h#'lakD1p>F49#4]?@Oa,=Z:'T)&F>>ZoZI2q_%1-Vk%'=PHaep@(>52V9X+:OdSk!Z5)GuCYfq$j^#Iq[?A`kq2
 j;8gOSJ19\lWa2"UNZ?ej'E0[@h@Q4`[(BWoiT"9`Y.jr#L?L!qd7P[tJr)Ji]QZbeXnUcCLolunE^7hlC6K'?qr?tdb/TTW'0*6VL)(-.'F3'Uip^F,2D]/J54A)I[[)2jU4QrZN[kJ)"clckAK,`IV9c('4NbchckZ:]X;i@1rPR0PO#M7ri=W1p3XArg..O?Op4.E&:S?-q(D5Eng[tJNk3*S8B9F\.+b![fL'k[U@_1P\R0bG[E\&/@IG;0a<3F=jHV?0gP]tAT[]3JD?F!D,_7X[Hjoc3bs)LfA@72ub&[e!_?$eOZgEV-)D:p3,K4[Zo@kr]1kkX[bl8]iCD<_^sg?i9a&a)#MZ#'P(csa,7KBT<INCr"nDKmW8S%Y6W<[@X#Xr"^2_fcu^GA?tI+O'G/TLXX`K)*H\A*JYOenc):a"mK%Z*lb%m^#^0g4J8cHJf!CX,"*S7+lTsid.MSCtU//Sl5s-lK'24:`A?9)(?'?aE.Y:T\Fm`!X61#Y`UjE7K9!!cl`HY:Ig'670d<[B\3TM,n(g[/Q8-19W/K4$3XL)L$X:(.+IpH%os[aO?t/'U6:NF>)+c'[$8[3d^@^##4`q?0U(FeTd<ECW7<<BMd`=C^CG7]N^MUA,QLmkCmjpm"1=>MFT\.F"Q1il)$_i'I*_9_->J6W`0OY7>iY]HOIh06DRV6*H=5ga@e$%qdbFsZg_rMC5[jeHWs1jN<7;$Dm(bNr6JG\eTBg*jQ"M6rWEDXiKWO:QCtcQDV613:iYm@M#1J<^GL,CJWUdcrCqbHS\s6iq?FQqeVck3UQ0UNBdee@CX*/Al%ZhHg7*r2R(oeA-]<Q\,Tso@/0rgE:!"oZS'*~>
 endstream
 endobj
-55 0 obj
+53 0 obj
 << /Type /Page
 /Parent 1 0 R
 /MediaBox [ 0 0 612 792 ]
 /Resources 3 0 R
-/Contents 54 0 R
+/Contents 52 0 R
 >>
 endobj
-56 0 obj
+54 0 obj
 << /Length 1328 /Filter [ /ASCII85Decode /FlateDecode ]
  >>
 stream
 Gb!#[gN)%,&:N/3nBmi,&6oP2d<=eK3pfV0-r3PZ+;0jan5^*`l[F8uRgD&bD5F"qN^aW^E3X'MS6^`US(3RheXn?+mG7Nm.Y.RhE?)Stb1c/=,6DhE,,:n"lIXSRMZt"!m+qX&Sj`psL!=K=4!WrQ.-_6Z"u2q$VMK]5qP;WK1[fLtg8Znk'[hB"VZ)Z)R8rKooR!t@WCHu?8-C28qbIf=ru"Ku'UaBV]_M#&1uK\tL_2S?!&>00k7Jn$ndm[uJ0WjE7Y$'sA%)'hKh6:p39?nsM?.!R;s4W65T&dWI5'2CB<%@>lI)]GO]GQF2#3g3@2drOo/0U1e&:!F0VAh:0`_:n4U#B';-f1c(.1?a`4VZHjpWq:7NRr;_a3`%\bfQA(("E0!h@VY$"6rC+n]/[-C9^te"GDhf4ck,`oh/>R2Mg3geY81[-8a$EKLq9n%NFK;NGdlRU^6)H'0<UnVB@O3CqibfVX80CZi#u\MJp/aEHpT]p"F]T2]PUZ[NAT1erRoBZ(HD6=7VmAMKjB%Es/%aP;%k>nN[Xs&]f'm6Op*3S-Hb[Zc(h*(gOQA+5K$[)t]he#6oRnHdhgFRt+4;X$WSp$u3)rE*7'I5;[3l&U2nX=Q/AZ<>44bf33/mhhg7C6`P%kDs%d`p6lu^#s71<M%Ie*/.-qj0h7u/IM5mog_F0@RTD2+5m8Hmae*2\4<_tO,LD83!>(_HHIuIin)Zu@2uKSs+eYOqn(2'i60[JEi@BcPkh\*<u#jXWmWNMj6'=<<MmK80<@+`<97G7CGD^i67F$e<)/um5YpnAhp3K^NceVF40'uc#sdOBJ\!mG/uU$d!"n+.I_ppt*-ENS*L1Kd=tOUG>S[Hr"TsF^Es77X!XT_S$Qj;9=`7lH!Wk.Mf2@N+V;14Irr0S[oaNlsf0Q$LrnhJ>ebu6R_/"hK=K,pp0kTiA5"<t6HgJ[+hg-trAMi6_MBg48j]$gDGA,ZRW2)SU\7=K
 jPJkpAIS=gr-kMUg+;Xb-EublJ^`o@q]%;)-dq9C5lGGb2WWu<@59Eg(W^UnBZIJP%J%"Ia</'eVZVRX=fjsDRQYMh!'Jf_Zn,^j&XtE3uU<M^.T2.-bbV_"6&r`L(E1r/l1cgk>mVsKlM9e-=DHhc!ESo8$m8N/mM$]6Jcbe/\qP>/!WmVe+]Z%9sXZ^'i83SN6IJ%9Kgl51*=c<XjJe&DWaF392GQB#@VoU/$F*C`RhNX.<ECn@u6!^k8le,QD5FV;Md-W3l7iZ,S)IWp3Bs\a5dg`r`FlQ9Jc9=eZc.lAjGB.HK#s>OVT*CkT`Z(sJR?Pe/Pdl2CK.k9`~>
 endstream
 endobj
-57 0 obj
+55 0 obj
 << /Type /Page
 /Parent 1 0 R
 /MediaBox [ 0 0 612 792 ]
 /Resources 3 0 R
-/Contents 56 0 R
+/Contents 54 0 R
 >>
 endobj
-58 0 obj
-<< /Length 1316 /Filter [ /ASCII85Decode /FlateDecode ]
+56 0 obj
+<< /Length 1312 /Filter [ /ASCII85Decode /FlateDecode ]
  >>
 stream
-Gau1.997gc&BF8='Kd^-c1!/Za(3Rl>I6YYorZJiQ=ubi*f_<=kbl`tZ:*-G',ub4=PK(YRGn)C*0/mX(;I!f?PX>miW&j#+deoNMVqFSrqB<2Nb(m]D:!V!EUiIP'*Q4iHhu"#7$PNIeRh+%8Hf#@)CJ.3,9kL75_$QFc#.aK]r<qj?0F%$YL/LB-=8X=gu`4:<G>O%Z?8)5D+eeXMQ2,F@p<R-)8AY5dHZc;^RSafq0asZ]T%F6UB\I<,K%q9<f&"?p"tALr`bOR+]NC-q4"#5UI2=8`R0o$.PQuI86:`u+4CsZ9IQ3kN?M4/7_GC2'1<\QOU2"%n]Xp`pX=?gIo6kP,ourtFhSo>D,'>-W7loUQorusWOg)ThUpU?^\D3b]ZU;T]C`?aoudSG2l?;@e7IcfC3QQKmcCRM9AOpdrp3N]HK-j69lio,&epg/X0]c/2ncG;CTFa$j1VRp]K)r<.3sp$A"f=q0XoMoA.g8MmH&)G<._Ac<YP)SoVG'_+&JID'oDg\Xqd3m";\4n@o8NRkrcm-*]KT5S&H)go<e+rZg#c='lCN<*aMU+=(5LO_"28?#7m\3D,,pQ.#Q]b1f)A6k.5>Vq\rAC-T*R(_1N\<?*8V/fBLSh->bjEZ*n\f9rZaT+*,u?<FPnL&p.$f,(e,ipcuZH(iC^3+UDUS>VBX(@3UP?+`gH#[Fq#3ZP"%4@4(1Aa&_Dc.'/)DS?8uo-eis1dog;[SEp*BTE8*tPq^a8]s]pp1oJM+=##`4#Qe*u[XUIf*l5:/3P-7EQSF^q5%>3+VP7hM=\`3I3*,<J:7OhA-\q<aY!3/C^$fg)S]UVDe2?,D:I;^drqcRM+=OC7Ed\((>jC\^Ys`'hZ?8/NVI8E-7s]QOZ?f^?4?lJp`A-L[?;$)C*%1Z'#(<Gp19HEsF:-lmqZo&74He%AjbGk=3UYH478RNgZTMiH&g2fQ`)C1I^ucRh2a@Y&.<4Ub![4@B5rUJ
 `N-pG.W;cWT%#MblZ"k6*"<(th?+nFuNFXpdS(aOAcYV'b0*,kEpsNiU\qR_@Oro\B:mdsaq+YS5*BjgbL!/Q=paDY`4:sB`35>c927,%$IreQ^k+3_"PWU`'S>eJ71"`DjT\m5*SW4Wm[V6@EbV*c'V<*aZ\?!c\[d,&5+J:H0dT?1\MBVYu?g_N0/j0\C6?laTPk<?uqd48/J&5D:-"FM/fdqlAcb2bFkWG&"+sgX5LCX6bg:u/,/ifjZ<djiD@?S26,:%<)eKHrj^e<64I],0lPHMSLpJk:,;^XFu)_8cb(jn:!fKf'#BJSpppD(n8ML>~>
+Gau1.997gc&BF8='Kd^-Qf1l;Nle#b[V14di`k.>/^ZI\=`Pp)+8tgPad,K/Eaf,.$pQ.s1W0%e3?3NN/q.%X^+Lhf_#*.9,FG,L8`3OgrqDuE*6XQjB@(D`C%:/o'*Q2sGl$6K7$PNIja'4I8H`?6*@=C5'-beDLOOaEPML'Dp;X4M\'n>phP*(iR!dB8C/^S5U<^B...@r>aPHs.T0hW$$3f3.pKkY1LG%08oZUU&A^E4rVpBe$#Fs\Zcb(CR6lbk'.+<"g=<;cbDD,cVb17<M=UlAm!)jnpZFfKpOhk=2<E\U]&jsp8W<E8Da2PMK&TBmf-c(Y9>)>hQ:];K[OrrG'MP%laFI'mLVhG3p^A:2VO2FM/Kg?uSFPr\5VWAI?JF7)9jqJ"2XVYg\hV#mhUJ]^/N:k5629[]<Q&cI_[YQj8]lE-YCHiq<mV)1plYn)FC]@]jaVd
 ?4D.&iV:`0aBa0!m3`b-.=$P@^L'TA0cj&'=0!)#J74hTiD)S7OC!'oaLE/F6P,<1TN5;'X$r_1.SeMS@T@M,1;E,/3-75<uaKorjmeSaLEP?d-8-,j.KE+Ll9i)2*.6D;?rEeZB4pJH2Q6n/aDUYGomlbVs=08g0-qPPW6e%nbo#K9ImUa/_osdtI)Q&2W\Deq&UHM*BW&LtG&M0-/6`M9V/;42Qs-]\0J7aX+9#-%>NVIq8Is(7IEi9DGl;RE^PLPX1+c.9mO3&7D6*c78Q[7IOCDU6$kRia_eMOBZrF#-N"ChNse<;>cceZ@,AW>(~>
 endstream
 endobj
-59 0 obj
+57 0 obj
 << /Type /Page
 /Parent 1 0 R
 /MediaBox [ 0 0 612 792 ]
 /Resources 3 0 R
-/Contents 58 0 R
+/Contents 56 0 R
 >>
 endobj
-60 0 obj
-<< /Length 1045 /Filter [ /ASCII85Decode /FlateDecode ]
+58 0 obj
+<< /Length 952 /Filter [ /ASCII85Decode /FlateDecode ]
  >>
 stream
-Gau1-9lo#B&;KZO$6>T<MS...@4c>,%bMC5(g%9FUdOU0b&C,p2.bALSPS(TNJLdF]/W<A(XV)84Ar],u8UXL\BQ-VMNesY61\@@(/]e:@Tq08HHns(-MUdY!te&S"uI]h<WnFK9S1,%'S7AM;a8Zt[]VVP&k--W2.+nq^0j-OYnnE%ZX]-Poh][e1uNCij!&1$Ya47BH5_&.TWaQ,P')c`]ZGk?S)m3c;/&a=(7R"I-V0_b0];`)REI(6E2cC&.h6C(cLff-cfYR!Q>=HgE
 RXV!#4g:)63Dj?7+>W0Jj5KFh1Fjj3#[(b.SXZaE(4bH&1hr#g'!r~>
+Gatn%9iKe#&;KZL'fqXJKYD:FJLSfbkR<[q3n*dF&iig//>G1Xo[d/flpq2UO:IIGijC?)qL*Op3hM?p:I^Bi%-Hu)29HIu5R?=t)/l[uPS-M@!EOdKdI$/qbmB=o(-I"kaT3`+@$6RI3siG.#.o_^5_0c>/A[BCB.%(\g,2(MY*Ii"8@qdNhlIX"p=<ta<Q<UjE*R\KY*,WjEk0]=f%VPGf8n4D<l$gP\DF0Y(`oYmi(]LnDs/t.ce^3I/Sf2qGQN>Fad3eF:^gJ[^n"B^qcR^ciOZecPFS%T[nKEq_)+ds"jK9L\G>;99*)8<E-Um,($N/9$q8JO1Pe#Ma<^i8*P".CKHYOgd0>RR:14_-7[N^#`$eK-7NlEd4&RAFaAW3ra.5ga&&#l[=]VD!AXEc[[F4YE"kqKRjAW+iQ$"5C7b8#d?*C0+<.hhC:LU\m,iTPop$o7Gbol`6]cS%<R<pdFj2td)iX`Uu1G'+^,8d/6*K:IR:q6:)V\<Qt!)IKaWnnTi&1JF%#QjY:*Pes%jMOjr=mn9.1U,6H1Lb5H'OIm81Lf-67&"<^&<%<lQ)[#=Lp7X$L6!Y!.#3KG5sf"j/6#JlCL-6ms%rmGm0d?,RW?#FrO]WFiAGrS&]O6G3r+#B1h08jHosHY1:K9k4ZXRUHX7KJVS?rf<S,G)0VjPEqe1:,6Ri@81@d[.EuOaBX(8G;^?ULnX(tdWi>*@*5(EP0lZH1h90$7SPdq:P`uU:kXk5>udn9a?-dkXV'#t9ADR2F*jE,So8.q:9K)"[?DN3P"i50=j<o6Ehk2<ZHYhS=RhJkoEn-3+RA&EpR\kGb\0#S\hO.Gh!"Yo;f9e[lM.h$oR_OSM;E7!Yel.XO=WO>jR(G4\nD)D,]3;++R89epu.FT2d;QY@[np2NtE9FMeN:[@CrNtDFBP4]d=+RIn^F(mk?F[c#SR<<~>
 endstream
 endobj
-61 0 obj
+59 0 obj
 << /Type /Page
 /Parent 1 0 R
 /MediaBox [ 0 0 612 792 ]
 /Resources 3 0 R
-/Contents 60 0 R
+/Contents 58 0 R
 >>
 endobj
-63 0 obj
+61 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 62 0 R
- /First 64 0 R
- /Last 85 0 R
- /Count -22
+ /Parent 60 0 R
+ /First 62 0 R
+ /Last 82 0 R
+ /Count -21
  /A 9 0 R
 >> endobj
-64 0 obj
+62 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 63 0 R
- /Next 65 0 R
+ /Parent 61 0 R
+ /Next 63 0 R
  /A 11 0 R
 >> endobj
-65 0 obj
+63 0 obj
 <<
  /Title (\376\377\0\61\0\56\0\62\0\40\0\141\0\156\0\164)
- /Parent 63 0 R
+ /Parent 61 0 R
+ /Prev 62 0 R
+ /Next 64 0 R
+ /A 13 0 R
+>> endobj
+64 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 61 0 R
+ /Prev 63 0 R
+ /Next 65 0 R
+ /A 15 0 R
+>> endobj
+65 0 obj
+<<
+ /Title (\376\377\0\61\0\56\0\64\0\40\0\144\0\142)
+ /Parent 61 0 R
  /Prev 64 0 R
  /Next 66 0 R
- /A 13 0 R
+ /A 17 0 R
 >> endobj
 66 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 63 0 R
+ /Title (\376\377\0\61\0\56\0\65\0\40\0\150\0\151\0\147\0\150\0\154\0\151\0\147\0\150\0\164\0\145\0\162)
+ /Parent 61 0 R
  /Prev 65 0 R
  /Next 67 0 R
- /A 15 0 R
+ /A 19 0 R
 >> endobj
 67 0 obj
 <<
- /Title (\376\377\0\61\0\56\0\64\0\40\0\144\0\142)
- /Parent 63 0 R
+ /Title (\376\377\0\61\0\56\0\66\0\40\0\146\0\141\0\163\0\164\0\55\0\166\0\145\0\143\0\164\0\157\0\162\0\55\0\150\0\151\0\147\0\150\0\154\0\151\0\147\0\150\0\164\0\145\0\162)
+ /Parent 61 0 R
  /Prev 66 0 R
  /Next 68 0 R
- /A 17 0 R
+ /A 21 0 R
 >> endobj
 68 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 63 0 R
+ /Title (\376\377\0\61\0\56\0\67\0\40\0\151\0\143\0\165)
+ /Parent 61 0 R
  /Prev 67 0 R
  /Next 69 0 R
- /A 19 0 R
+ /A 23 0 R
 >> endobj
 69 0 obj
 <<
- /Title (\376\377\0\61\0\56\0\66\0\40\0\146\0\141\0\163\0\164\0\55\0\166\0\145\0\143\0\164\0\157\0\162\0\55\0\150\0\151\0\147\0\150\0\154\0\151\0\147\0\150\0\164\0\145\0\162)
- /Parent 63 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 61 0 R
  /Prev 68 0 R
  /Next 70 0 R
- /A 21 0 R
+ /A 25 0 R
 >> endobj
 70 0 obj
 <<
- /Title (\376\377\0\61\0\56\0\67\0\40\0\151\0\143\0\165)
- /Parent 63 0 R
+ /Title (\376\377\0\61\0\56\0\71\0\40\0\154\0\165\0\143\0\154\0\151)
+ /Parent 61 0 R
  /Prev 69 0 R
  /Next 71 0 R
- /A 23 0 R
+ /A 27 0 R
 >> endobj
 71 0 obj
 <<
- /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 63 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 61 0 R
  /Prev 70 0 R
  /Next 72 0 R
- /A 25 0 R
+ /A 29 0 R
 >> endobj
 72 0 obj
 <<
- /Title (\376\377\0\61\0\56\0\71\0\40\0\154\0\165\0\143\0\154\0\151)
- /Parent 63 0 R
+ /Title (\376\377\0\61\0\56\0\61\0\61\0\40\0\155\0\151\0\163\0\143)
+ /Parent 61 0 R
  /Prev 71 0 R
  /Next 73 0 R
- /A 27 0 R
+ /A 31 0 R
 >> endobj
 73 0 obj
 <<
- /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 63 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 61 0 R
  /Prev 72 0 R
  /Next 74 0 R
- /A 29 0 R
+ /A 33 0 R
 >> endobj
 74 0 obj
 <<
- /Title (\376\377\0\61\0\56\0\61\0\61\0\40\0\155\0\151\0\163\0\143)
- /Parent 63 0 R
+ /Title (\376\377\0\61\0\56\0\61\0\63\0\40\0\162\0\145\0\147\0\145\0\170)
+ /Parent 61 0 R
  /Prev 73 0 R
  /Next 75 0 R
- /A 31 0 R
+ /A 35 0 R
 >> endobj
 75 0 obj
 <<
- /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 63 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 61 0 R
  /Prev 74 0 R
  /Next 76 0 R
- /A 33 0 R
+ /A 37 0 R
 >> endobj
 76 0 obj
 <<
- /Title (\376\377\0\61\0\56\0\61\0\63\0\40\0\162\0\145\0\147\0\145\0\170)
- /Parent 63 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 61 0 R
  /Prev 75 0 R
  /Next 77 0 R
- /A 35 0 R
+ /A 39 0 R
 >> endobj
 77 0 obj
 <<
- /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 63 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 61 0 R
  /Prev 76 0 R
  /Next 78 0 R
- /A 37 0 R
+ /A 41 0 R
 >> endobj
 78 0 obj
 <<
- /Title (\376\377\0\61\0\56\0\61\0\65\0\40\0\163\0\156\0\157\0\167\0\142\0\141\0\154\0\154)
- /Parent 63 0 R
+ /Title (\376\377\0\61\0\56\0\61\0\67\0\40\0\163\0\165\0\162\0\162\0\157\0\165\0\156\0\144)
+ /Parent 61 0 R
  /Prev 77 0 R
  /Next 79 0 R
- /A 39 0 R
+ /A 43 0 R
 >> endobj
 79 0 obj
 <<
- /Title (\376\377\0\61\0\56\0\61\0\66\0\40\0\163\0\160\0\141\0\164\0\151\0\141\0\154)
- /Parent 63 0 R
+ /Title (\376\377\0\61\0\56\0\61\0\70\0\40\0\163\0\167\0\151\0\156\0\147)
+ /Parent 61 0 R
  /Prev 78 0 R
  /Next 80 0 R
- /A 41 0 R
+ /A 45 0 R
 >> endobj
 80 0 obj
 <<
- /Title (\376\377\0\61\0\56\0\61\0\67\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 63 0 R
+ /Title (\376\377\0\61\0\56\0\61\0\71\0\40\0\167\0\151\0\153\0\151\0\160\0\145\0\144\0\151\0\141)
+ /Parent 61 0 R
  /Prev 79 0 R
  /Next 81 0 R
- /A 43 0 R
+ /A 47 0 R
 >> endobj
 81 0 obj
 <<
- /Title (\376\377\0\61\0\56\0\61\0\70\0\40\0\163\0\165\0\162\0\162\0\157\0\165\0\156\0\144)
- /Parent 63 0 R
+ /Title (\376\377\0\61\0\56\0\62\0\60\0\40\0\167\0\157\0\162\0\144\0\156\0\145\0\164)
+ /Parent 61 0 R
  /Prev 80 0 R
  /Next 82 0 R
- /A 45 0 R
+ /A 49 0 R
 >> endobj
 82 0 obj
 <<
- /Title (\376\377\0\61\0\56\0\61\0\71\0\40\0\163\0\167\0\151\0\156\0\147)
- /Parent 63 0 R
+ /Title (\376\377\0\61\0\56\0\62\0\61\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 61 0 R
  /Prev 81 0 R
- /Next 83 0 R
- /A 47 0 R
->> endobj
-83 0 obj
-<<
- /Title (\376\377\0\61\0\56\0\62\0\60\0\40\0\167\0\151\0\153\0\151\0\160\0\145\0\144\0\151\0\141)
- /Parent 63 0 R
- /Prev 82 0 R
- /Next 84 0 R
- /A 49 0 R
->> endobj
-84 0 obj
-<<
- /Title (\376\377\0\61\0\56\0\62\0\61\0\40\0\167\0\157\0\162\0\144\0\156\0\145\0\164)
- /Parent 63 0 R
- /Prev 83 0 R
- /Next 85 0 R
  /A 51 0 R
 >> endobj
-85 0 obj
-<<
- /Title (\376\377\0\61\0\56\0\62\0\62\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 63 0 R
- /Prev 84 0 R
- /A 53 0 R
->> endobj
-86 0 obj
+83 0 obj
 << /Type /Font
 /Subtype /Type1
 /Name /F3
 /BaseFont /Helvetica-Bold
 /Encoding /WinAnsiEncoding >>
 endobj
-87 0 obj
+84 0 obj
 << /Type /Font
 /Subtype /Type1
 /Name /F5
 /BaseFont /Times-Roman
 /Encoding /WinAnsiEncoding >>
 endobj
-88 0 obj
+85 0 obj
 << /Type /Font
 /Subtype /Type1
 /Name /F1
 /BaseFont /Helvetica
 /Encoding /WinAnsiEncoding >>
 endobj
-89 0 obj
+86 0 obj
 << /Type /Font
 /Subtype /Type1
 /Name /F2
 /BaseFont /Helvetica-Oblique
 /Encoding /WinAnsiEncoding >>
 endobj
-90 0 obj
+87 0 obj
 << /Type /Font
 /Subtype /Type1
 /Name /F7
@@ -558,262 +539,253 @@
 1 0 obj
 << /Type /Pages
 /Count 5
-/Kids [6 0 R 55 0 R 57 0 R 59 0 R 61 0 R ] >>
+/Kids [6 0 R 53 0 R 55 0 R 57 0 R 59 0 R ] >>
 endobj
 2 0 obj
 << /Type /Catalog
 /Pages 1 0 R
- /Outlines 62 0 R
+ /Outlines 60 0 R
  /PageMode /UseOutlines
  >>
 endobj
 3 0 obj
 << 
-/Font << /F3 86 0 R /F5 87 0 R /F1 88 0 R /F2 89 0 R /F7 90 0 R >> 
+/Font << /F3 83 0 R /F5 84 0 R /F1 85 0 R /F2 86 0 R /F7 87 0 R >> 
 /ProcSet [ /PDF /ImageC /Text ] >> 
 endobj
 9 0 obj
 <<
 /S /GoTo
-/D [55 0 R /XYZ 85.0 659.0 null]
+/D [53 0 R /XYZ 85.0 659.0 null]
 >>
 endobj
 11 0 obj
 <<
 /S /GoTo
-/D [55 0 R /XYZ 85.0 339.066 null]
+/D [53 0 R /XYZ 85.0 339.066 null]
 >>
 endobj
 13 0 obj
 <<
 /S /GoTo
-/D [55 0 R /XYZ 85.0 266.613 null]
+/D [53 0 R /XYZ 85.0 266.613 null]
 >>
 endobj
 15 0 obj
 <<
 /S /GoTo
-/D [55 0 R /XYZ 85.0 194.16 null]
+/D [53 0 R /XYZ 85.0 194.16 null]
 >>
 endobj
 17 0 obj
 <<
 /S /GoTo
-/D [57 0 R /XYZ 85.0 637.8 null]
+/D [55 0 R /XYZ 85.0 637.8 null]
 >>
 endobj
 19 0 obj
 <<
 /S /GoTo
-/D [57 0 R /XYZ 85.0 565.347 null]
+/D [55 0 R /XYZ 85.0 565.347 null]
 >>
 endobj
 21 0 obj
 <<
 /S /GoTo
-/D [57 0 R /XYZ 85.0 492.894 null]
+/D [55 0 R /XYZ 85.0 492.894 null]
 >>
 endobj
 23 0 obj
 <<
 /S /GoTo
-/D [57 0 R /XYZ 85.0 394.041 null]
+/D [55 0 R /XYZ 85.0 394.041 null]
 >>
 endobj
 25 0 obj
 <<
 /S /GoTo
-/D [57 0 R /XYZ 85.0 308.388 null]
+/D [55 0 R /XYZ 85.0 308.388 null]
 >>
 endobj
 27 0 obj
 <<
 /S /GoTo
-/D [57 0 R /XYZ 85.0 222.735 null]
+/D [55 0 R /XYZ 85.0 222.735 null]
 >>
 endobj
 29 0 obj
 <<
 /S /GoTo
-/D [57 0 R /XYZ 85.0 150.282 null]
+/D [55 0 R /XYZ 85.0 150.282 null]
 >>
 endobj
 31 0 obj
 <<
 /S /GoTo
-/D [59 0 R /XYZ 85.0 616.6 null]
+/D [57 0 R /XYZ 85.0 616.6 null]
 >>
 endobj
 33 0 obj
 <<
 /S /GoTo
-/D [59 0 R /XYZ 85.0 530.947 null]
+/D [57 0 R /XYZ 85.0 530.947 null]
 >>
 endobj
 35 0 obj
 <<
 /S /GoTo
-/D [59 0 R /XYZ 85.0 445.294 null]
+/D [57 0 R /XYZ 85.0 445.294 null]
 >>
 endobj
 37 0 obj
 <<
 /S /GoTo
-/D [59 0 R /XYZ 85.0 372.841 null]
+/D [57 0 R /XYZ 85.0 372.841 null]
 >>
 endobj
 39 0 obj
 <<
 /S /GoTo
-/D [59 0 R /XYZ 85.0 300.388 null]
+/D [57 0 R /XYZ 85.0 300.388 null]
 >>
 endobj
 41 0 obj
 <<
 /S /GoTo
-/D [59 0 R /XYZ 85.0 227.935 null]
+/D [57 0 R /XYZ 85.0 227.935 null]
 >>
 endobj
 43 0 obj
 <<
 /S /GoTo
-/D [59 0 R /XYZ 85.0 155.482 null]
+/D [57 0 R /XYZ 85.0 155.482 null]
 >>
 endobj
 45 0 obj
 <<
 /S /GoTo
-/D [61 0 R /XYZ 85.0 616.6 null]
+/D [59 0 R /XYZ 85.0 616.6 null]
 >>
 endobj
 47 0 obj
 <<
 /S /GoTo
-/D [61 0 R /XYZ 85.0 544.147 null]
+/D [59 0 R /XYZ 85.0 544.147 null]
 >>
 endobj
 49 0 obj
 <<
 /S /GoTo
-/D [61 0 R /XYZ 85.0 471.694 null]
+/D [59 0 R /XYZ 85.0 471.694 null]
 >>
 endobj
 51 0 obj
 <<
 /S /GoTo
-/D [61 0 R /XYZ 85.0 399.241 null]
->>
-endobj
-53 0 obj
-<<
-/S /GoTo
-/D [61 0 R /XYZ 85.0 326.788 null]
+/D [59 0 R /XYZ 85.0 399.241 null]
 >>
 endobj
-62 0 obj
+60 0 obj
 <<
- /First 63 0 R
- /Last 63 0 R
+ /First 61 0 R
+ /Last 61 0 R
 >> endobj
 xref
-0 91
+0 88
 0000000000 65535 f 
-0000015450 00000 n 
-0000015536 00000 n 
-0000015628 00000 n 
+0000015010 00000 n 
+0000015096 00000 n 
+0000015188 00000 n 
 0000000015 00000 n 
 0000000071 00000 n 
-0000001230 00000 n 
-0000001350 00000 n 
-0000001529 00000 n 
-0000015751 00000 n 
-0000001664 00000 n 
-0000015814 00000 n 
-0000001801 00000 n 
-0000015880 00000 n 
-0000001938 00000 n 
-0000015946 00000 n 
-0000002075 00000 n 
-0000016011 00000 n 
-0000002210 00000 n 
-0000016075 00000 n 
-0000002347 00000 n 
-0000016141 00000 n 
-0000002484 00000 n 
-0000016207 00000 n 
-0000002621 00000 n 
-0000016273 00000 n 
-0000002758 00000 n 
-0000016339 00000 n 
-0000002895 00000 n 
-0000016405 00000 n 
-0000003032 00000 n 
-0000016471 00000 n 
-0000003169 00000 n 
-0000016535 00000 n 
-0000003305 00000 n 
-0000016601 00000 n 
-0000003442 00000 n 
-0000016667 00000 n 
-0000003579 00000 n 
-0000016733 00000 n 
-0000003716 00000 n 
-0000016799 00000 n 
-0000003853 00000 n 
-0000016865 00000 n 
-0000003990 00000 n 
-0000016931 00000 n 
-0000004126 00000 n 
-0000016995 00000 n 
-0000004263 00000 n 
-0000017061 00000 n 
-0000004400 00000 n 
-0000017127 00000 n 
-0000004537 00000 n 
-0000017193 00000 n 
-0000004674 00000 n 
-0000006622 00000 n 
-0000006730 00000 n 
-0000008151 00000 n 
-0000008259 00000 n 
-0000009668 00000 n 
-0000009776 00000 n 
-0000010914 00000 n 
-0000017259 00000 n 
-0000011022 00000 n 
-0000011223 00000 n 
-0000011379 00000 n 
-0000011513 00000 n 
-0000011683 00000 n 
-0000011811 00000 n 
-0000011993 00000 n 
-0000012245 00000 n 
-0000012379 00000 n 
-0000012567 00000 n 
-0000012713 00000 n 
-0000012870 00000 n 
-0000013015 00000 n 
-0000013202 00000 n 
-0000013353 00000 n 
-0000013510 00000 n 
-0000013679 00000 n 
-0000013842 00000 n 
-0000014035 00000 n 
-0000014204 00000 n 
-0000014355 00000 n 
-0000014530 00000 n 
-0000014693 00000 n 
-0000014894 00000 n 
-0000015007 00000 n 
-0000015117 00000 n 
-0000015225 00000 n 
-0000015341 00000 n 
+0000001201 00000 n 
+0000001321 00000 n 
+0000001493 00000 n 
+0000015311 00000 n 
+0000001628 00000 n 
+0000015374 00000 n 
+0000001765 00000 n 
+0000015440 00000 n 
+0000001902 00000 n 
+0000015506 00000 n 
+0000002039 00000 n 
+0000015571 00000 n 
+0000002174 00000 n 
+0000015635 00000 n 
+0000002311 00000 n 
+0000015701 00000 n 
+0000002448 00000 n 
+0000015767 00000 n 
+0000002585 00000 n 
+0000015833 00000 n 
+0000002722 00000 n 
+0000015899 00000 n 
+0000002859 00000 n 
+0000015965 00000 n 
+0000002996 00000 n 
+0000016031 00000 n 
+0000003133 00000 n 
+0000016095 00000 n 
+0000003269 00000 n 
+0000016161 00000 n 
+0000003406 00000 n 
+0000016227 00000 n 
+0000003543 00000 n 
+0000016293 00000 n 
+0000003680 00000 n 
+0000016359 00000 n 
+0000003817 00000 n 
+0000016425 00000 n 
+0000003953 00000 n 
+0000016491 00000 n 
+0000004090 00000 n 
+0000016555 00000 n 
+0000004227 00000 n 
+0000016621 00000 n 
+0000004364 00000 n 
+0000016687 00000 n 
+0000004501 00000 n 
+0000006449 00000 n 
+0000006557 00000 n 
+0000007978 00000 n 
+0000008086 00000 n 
+0000009491 00000 n 
+0000009599 00000 n 
+0000010643 00000 n 
+0000016753 00000 n 
+0000010751 00000 n 
+0000010952 00000 n 
+0000011108 00000 n 
+0000011242 00000 n 
+0000011412 00000 n 
+0000011540 00000 n 
+0000011722 00000 n 
+0000011974 00000 n 
+0000012108 00000 n 
+0000012296 00000 n 
+0000012442 00000 n 
+0000012599 00000 n 
+0000012744 00000 n 
+0000012931 00000 n 
+0000013082 00000 n 
+0000013239 00000 n 
+0000013402 00000 n 
+0000013595 00000 n 
+0000013764 00000 n 
+0000013915 00000 n 
+0000014090 00000 n 
+0000014253 00000 n 
+0000014454 00000 n 
+0000014567 00000 n 
+0000014677 00000 n 
+0000014785 00000 n 
+0000014901 00000 n 
 trailer
 <<
-/Size 91
+/Size 88
 /Root 2 0 R
 /Info 4 0 R
 >>
 startxref
-17310
+16804
 %%EOF

Modified: lucene/java/trunk/docs/queryparsersyntax.html
URL: http://svn.apache.org/viewvc/lucene/java/trunk/docs/queryparsersyntax.html?rev=901505&r1=901504&r2=901505&view=diff
==============================================================================
--- lucene/java/trunk/docs/queryparsersyntax.html (original)
+++ lucene/java/trunk/docs/queryparsersyntax.html Thu Jan 21 02:45:09 2010
@@ -186,9 +186,6 @@
 <a href="api/contrib-remote/index.html">Remote</a>
 </div>
 <div class="menuitem">
-<a href="api/contrib-snowball/index.html">Snowball</a>
-</div>
-<div class="menuitem">
 <a href="api/contrib-spatial/index.html">Spatial</a>
 </div>
 <div class="menuitem">

Modified: lucene/java/trunk/docs/scoring.html
URL: http://svn.apache.org/viewvc/lucene/java/trunk/docs/scoring.html?rev=901505&r1=901504&r2=901505&view=diff
==============================================================================
--- lucene/java/trunk/docs/scoring.html (original)
+++ lucene/java/trunk/docs/scoring.html Thu Jan 21 02:45:09 2010
@@ -186,9 +186,6 @@
 <a href="api/contrib-remote/index.html">Remote</a>
 </div>
 <div class="menuitem">
-<a href="api/contrib-snowball/index.html">Snowball</a>
-</div>
-<div class="menuitem">
 <a href="api/contrib-spatial/index.html">Spatial</a>
 </div>
 <div class="menuitem">

Modified: lucene/java/trunk/docs/systemrequirements.html
URL: http://svn.apache.org/viewvc/lucene/java/trunk/docs/systemrequirements.html?rev=901505&r1=901504&r2=901505&view=diff
==============================================================================
--- lucene/java/trunk/docs/systemrequirements.html (original)
+++ lucene/java/trunk/docs/systemrequirements.html Thu Jan 21 02:45:09 2010
@@ -184,9 +184,6 @@
 <a href="api/contrib-remote/index.html">Remote</a>
 </div>
 <div class="menuitem">
-<a href="api/contrib-snowball/index.html">Snowball</a>
-</div>
-<div class="menuitem">
 <a href="api/contrib-spatial/index.html">Spatial</a>
 </div>
 <div class="menuitem">

Modified: lucene/java/trunk/src/site/src/documentation/content/xdocs/lucene-contrib/index.xml
URL: http://svn.apache.org/viewvc/lucene/java/trunk/src/site/src/documentation/content/xdocs/lucene-contrib/index.xml?rev=901505&r1=901504&r2=901505&view=diff
==============================================================================
--- lucene/java/trunk/src/site/src/documentation/content/xdocs/lucene-contrib/index.xml (original)
+++ lucene/java/trunk/src/site/src/documentation/content/xdocs/lucene-contrib/index.xml Thu Jan 21 02:45:09 2010
@@ -120,12 +120,7 @@
             <section id="remote"><title>remote</title>
                 <p>Classes to help use Lucene with RMI.</p>
                 <p>See <a href="../api/contrib-remote/index.html">remote javadoc</a></p>
-            </section>    
-            
-            <section id="snowball"><title>snowball</title>
-                <p>Pre-compiled versions of the Snowball stemmers for Lucene.</p>
-                <p>See <a href="../api/contrib-snowball/index.html">snowball javadoc</a></p>
-            </section>               
+            </section>                 
                         
             <section id="spatial"><title>spatial</title>
                 <p>Classes to help with efficient distance based sorting.</p>

Modified: lucene/java/trunk/src/site/src/documentation/content/xdocs/site.xml
URL: http://svn.apache.org/viewvc/lucene/java/trunk/src/site/src/documentation/content/xdocs/site.xml?rev=901505&r1=901504&r2=901505&view=diff
==============================================================================
--- lucene/java/trunk/src/site/src/documentation/content/xdocs/site.xml (original)
+++ lucene/java/trunk/src/site/src/documentation/content/xdocs/site.xml Thu Jan 21 02:45:09 2010
@@ -72,7 +72,6 @@
 		    <javadoc-contrib-similarity label="Similarity" href="ext:javadocs-contrib-similarity"/>
 -->			
 		    <javadoc-contrib-remote label="Remote" href="ext:javadocs-contrib-remote"/>
-            <javadoc-contrib-snowball label="Snowball" href="ext:javadocs-contrib-snowball"/>
 		    <javadoc-contrib-spatial label="Spatial" href="ext:javadocs-contrib-spatial"/>
 		    <javadoc-contrib-spellchecker label="Spellchecker" href="ext:javadocs-contrib-spellchecker"/>
 		    <javadoc-contrib-surround label="Surround" href="ext:javadocs-contrib-surround"/>			
@@ -125,7 +124,6 @@
 	<javadocs-contrib-regex href="api/contrib-regex/index.html"/>
 	<javadocs-contrib-remote href="api/contrib-remote/index.html"/>
 	<javadocs-contrib-similarity href="api/contrib-similarity/index.html"/>
-	<javadocs-contrib-snowball href="api/contrib-snowball/index.html"/>
 	<javadocs-contrib-spatial href="api/contrib-spatial/index.html"/>
 	<javadocs-contrib-spellchecker href="api/contrib-spellchecker/index.html"/>
 	<javadocs-contrib-surround href="api/contrib-surround/index.html"/>