You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by mi...@apache.org on 2011/05/14 18:13:03 UTC

svn commit: r1103147 - in /lucene/dev/branches/branch_3x/lucene: contrib/grouping/src/java/ contrib/grouping/src/java/org/apache/lucene/search/grouping/ docs/ docs/lucene-contrib/ docs/skin/ src/site/src/documentation/content/xdocs/lucene-contrib/

Author: mikemccand
Date: Sat May 14 16:13:02 2011
New Revision: 1103147

URL: http://svn.apache.org/viewvc?rev=1103147&view=rev
Log:
fixup javadocs; regen site

Added:
    lucene/dev/branches/branch_3x/lucene/contrib/grouping/src/java/org/apache/lucene/search/grouping/package.html
      - copied, changed from r1103136, lucene/dev/branches/branch_3x/lucene/contrib/grouping/src/java/overview.html
    lucene/dev/branches/branch_3x/lucene/contrib/grouping/src/java/overview.html   (with props)
Modified:
    lucene/dev/branches/branch_3x/lucene/contrib/grouping/src/java/org/apache/lucene/search/grouping/CachingCollector.java
    lucene/dev/branches/branch_3x/lucene/contrib/grouping/src/java/org/apache/lucene/search/grouping/FirstPassGroupingCollector.java
    lucene/dev/branches/branch_3x/lucene/contrib/grouping/src/java/org/apache/lucene/search/grouping/SecondPassGroupingCollector.java
    lucene/dev/branches/branch_3x/lucene/docs/contributions.html
    lucene/dev/branches/branch_3x/lucene/docs/contributions.pdf
    lucene/dev/branches/branch_3x/lucene/docs/demo.html
    lucene/dev/branches/branch_3x/lucene/docs/demo.pdf
    lucene/dev/branches/branch_3x/lucene/docs/demo2.html
    lucene/dev/branches/branch_3x/lucene/docs/demo2.pdf
    lucene/dev/branches/branch_3x/lucene/docs/fileformats.html
    lucene/dev/branches/branch_3x/lucene/docs/fileformats.pdf
    lucene/dev/branches/branch_3x/lucene/docs/gettingstarted.html
    lucene/dev/branches/branch_3x/lucene/docs/gettingstarted.pdf
    lucene/dev/branches/branch_3x/lucene/docs/index.html
    lucene/dev/branches/branch_3x/lucene/docs/index.pdf
    lucene/dev/branches/branch_3x/lucene/docs/linkmap.html
    lucene/dev/branches/branch_3x/lucene/docs/linkmap.pdf
    lucene/dev/branches/branch_3x/lucene/docs/lucene-contrib/index.html
    lucene/dev/branches/branch_3x/lucene/docs/lucene-contrib/index.pdf
    lucene/dev/branches/branch_3x/lucene/docs/queryparsersyntax.html
    lucene/dev/branches/branch_3x/lucene/docs/queryparsersyntax.pdf
    lucene/dev/branches/branch_3x/lucene/docs/scoring.html
    lucene/dev/branches/branch_3x/lucene/docs/scoring.pdf
    lucene/dev/branches/branch_3x/lucene/docs/skin/basic.css
    lucene/dev/branches/branch_3x/lucene/docs/skin/print.css
    lucene/dev/branches/branch_3x/lucene/docs/skin/profile.css
    lucene/dev/branches/branch_3x/lucene/docs/skin/screen.css
    lucene/dev/branches/branch_3x/lucene/docs/systemrequirements.html
    lucene/dev/branches/branch_3x/lucene/docs/systemrequirements.pdf
    lucene/dev/branches/branch_3x/lucene/src/site/src/documentation/content/xdocs/lucene-contrib/index.xml

Modified: lucene/dev/branches/branch_3x/lucene/contrib/grouping/src/java/org/apache/lucene/search/grouping/CachingCollector.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/lucene/contrib/grouping/src/java/org/apache/lucene/search/grouping/CachingCollector.java?rev=1103147&r1=1103146&r2=1103147&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/lucene/contrib/grouping/src/java/org/apache/lucene/search/grouping/CachingCollector.java (original)
+++ lucene/dev/branches/branch_3x/lucene/contrib/grouping/src/java/org/apache/lucene/search/grouping/CachingCollector.java Sat May 14 16:13:02 2011
@@ -42,6 +42,9 @@ import org.apache.lucene.util.RamUsageEs
  * set is large this can easily be a very substantial amount
  * of RAM!
  * 
+ * <p>See {@link org.apache.lucene.search.grouping} for more
+ * details including a full code example.</p>
+ *
  * @lucene.experimental
  */
 public class CachingCollector extends Collector {

Modified: lucene/dev/branches/branch_3x/lucene/contrib/grouping/src/java/org/apache/lucene/search/grouping/FirstPassGroupingCollector.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/lucene/contrib/grouping/src/java/org/apache/lucene/search/grouping/FirstPassGroupingCollector.java?rev=1103147&r1=1103146&r2=1103147&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/lucene/contrib/grouping/src/java/org/apache/lucene/search/grouping/FirstPassGroupingCollector.java (original)
+++ lucene/dev/branches/branch_3x/lucene/contrib/grouping/src/java/org/apache/lucene/search/grouping/FirstPassGroupingCollector.java Sat May 14 16:13:02 2011
@@ -33,9 +33,12 @@ import org.apache.lucene.search.Sort;
 import org.apache.lucene.search.SortField;
 
 /** FirstPassGroupingCollector is the first of two passes necessary
- *  to collected grouped hits.  This pass gathers the top N sorted
+ *  to collect grouped hits.  This pass gathers the top N sorted
  *  groups.
  *
+ *  <p>See {@link org.apache.lucene.search.grouping} for more
+ *  details including a full code example.</p>
+ *
  * @lucene.experimental
  */
 

Modified: lucene/dev/branches/branch_3x/lucene/contrib/grouping/src/java/org/apache/lucene/search/grouping/SecondPassGroupingCollector.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/lucene/contrib/grouping/src/java/org/apache/lucene/search/grouping/SecondPassGroupingCollector.java?rev=1103147&r1=1103146&r2=1103147&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/lucene/contrib/grouping/src/java/org/apache/lucene/search/grouping/SecondPassGroupingCollector.java (original)
+++ lucene/dev/branches/branch_3x/lucene/contrib/grouping/src/java/org/apache/lucene/search/grouping/SecondPassGroupingCollector.java Sat May 14 16:13:02 2011
@@ -32,7 +32,14 @@ import org.apache.lucene.search.TopField
 import org.apache.lucene.search.TopScoreDocCollector;
 
 /**
- * See {@link FirstPassGroupingCollector}.
+ * SecondPassGroupingCollector is the second of two passes
+ * necessary to collect grouped docs.  This pass gathers the
+ * top N documents per top group computed from the
+ * first pass.
+ *
+ * <p>See {@link org.apache.lucene.search.grouping} for more
+ * details including a full code example.</p>
+ *
  * @lucene.experimental
  */
 public class SecondPassGroupingCollector extends Collector {

Copied: lucene/dev/branches/branch_3x/lucene/contrib/grouping/src/java/org/apache/lucene/search/grouping/package.html (from r1103136, lucene/dev/branches/branch_3x/lucene/contrib/grouping/src/java/overview.html)
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/lucene/contrib/grouping/src/java/org/apache/lucene/search/grouping/package.html?p2=lucene/dev/branches/branch_3x/lucene/contrib/grouping/src/java/org/apache/lucene/search/grouping/package.html&p1=lucene/dev/branches/branch_3x/lucene/contrib/grouping/src/java/overview.html&r1=1103136&r2=1103147&rev=1103147&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/lucene/contrib/grouping/src/java/overview.html (original)
+++ lucene/dev/branches/branch_3x/lucene/contrib/grouping/src/java/org/apache/lucene/search/grouping/package.html Sat May 14 16:13:02 2011
@@ -58,7 +58,7 @@ field fall into a single group.</p>
 <p>Known limitations:</p>
 <ul>
   <li> The group field must be a single-valued indexed field.
-    {@link org.apache.lucene.search.FieldCache} is used to load the {@link org.apache.lucene.search.FieldCache.DocTermsIndex} for this field.
+    {@link org.apache.lucene.search.FieldCache} is used to load the {@link org.apache.lucene.search.FieldCache.StringIndex} for this field.
   <li> Unlike Solr's implementation, this module cannot group by
     function query values nor by arbitrary queries.
   <li> Sharding is not directly supported, though is not too

Added: lucene/dev/branches/branch_3x/lucene/contrib/grouping/src/java/overview.html
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/lucene/contrib/grouping/src/java/overview.html?rev=1103147&view=auto
==============================================================================
--- lucene/dev/branches/branch_3x/lucene/contrib/grouping/src/java/overview.html (added)
+++ lucene/dev/branches/branch_3x/lucene/contrib/grouping/src/java/overview.html Sat May 14 16:13:02 2011
@@ -0,0 +1,5 @@
+<html>
+<body>
+Lucene's grouping module
+</body>
+</html>

Modified: lucene/dev/branches/branch_3x/lucene/docs/contributions.html
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/lucene/docs/contributions.html?rev=1103147&r1=1103146&r2=1103147&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/lucene/docs/contributions.html (original)
+++ lucene/dev/branches/branch_3x/lucene/docs/contributions.html Sat May 14 16:13:02 2011
@@ -3,7 +3,7 @@
 <head>
 <META http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta content="Apache Forrest" name="Generator">
-<meta name="Forrest-version" content="0.9">
+<meta name="Forrest-version" content="0.8">
 <meta name="Forrest-skin-name" content="lucene">
 <title>
 	Apache Lucene - Contributions
@@ -159,6 +159,9 @@ document.write("Last Published: " + docu
 <a href="api/contrib-demo/index.html">Demo</a>
 </div>
 <div class="menuitem">
+<a href="api/contrib-grouping/index.html">Grouping</a>
+</div>
+<div class="menuitem">
 <a href="api/contrib-highlighter/index.html">Highlighter</a>
 </div>
 <div class="menuitem">
@@ -287,7 +290,7 @@ document.write("Last Published: " + docu
 <a href="#PDFTextStream -- PDF text and metadata extraction">PDFTextStream -- PDF text and metadata extraction</a>
 </li>
 <li>
-<a href="#PJ Classic &amp; PJ Professional - PDF Document Conversion">PJ Classic &amp; PJ Professional - PDF Document Conversion</a>
+<a href="#PJ Classic & PJ Professional - PDF Document Conversion">PJ Classic &amp; PJ Professional - PDF Document Conversion</a>
 </li>
 </ul>
 </li>
@@ -415,7 +418,7 @@ document.write("Last Published: " + docu
                             URL
                         </th>
                         <td>
-                            <a href="http://marc.theaimsgroup.com/?l=lucene-dev&amp;m=100723333506246&amp;w=2">
+                            <a href="http://marc.theaimsgroup.com/?l=lucene-dev&m=100723333506246&w=2">
                                 http://marc.theaimsgroup.com/?l=lucene-dev&amp;m=100723333506246&amp;w=2
                             </a>
                         </td>
@@ -550,7 +553,7 @@ document.write("Last Published: " + docu
 </tr>
                 
 </table>
-<a name="N10124"></a><a name="PJ Classic &amp; PJ Professional - PDF Document Conversion"></a>
+<a name="N10124"></a><a name="PJ Classic & PJ Professional - PDF Document Conversion"></a>
 <h3 class="boxed">PJ Classic &amp; PJ Professional - PDF Document Conversion</h3>
 <table class="ForrestTable" cellspacing="1" cellpadding="4">
                     

Modified: lucene/dev/branches/branch_3x/lucene/docs/contributions.pdf
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/lucene/docs/contributions.pdf?rev=1103147&r1=1103146&r2=1103147&view=diff
==============================================================================
Files lucene/dev/branches/branch_3x/lucene/docs/contributions.pdf (original) and lucene/dev/branches/branch_3x/lucene/docs/contributions.pdf Sat May 14 16:13:02 2011 differ

Modified: lucene/dev/branches/branch_3x/lucene/docs/demo.html
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/lucene/docs/demo.html?rev=1103147&r1=1103146&r2=1103147&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/lucene/docs/demo.html (original)
+++ lucene/dev/branches/branch_3x/lucene/docs/demo.html Sat May 14 16:13:02 2011
@@ -3,7 +3,7 @@
 <head>
 <META http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta content="Apache Forrest" name="Generator">
-<meta name="Forrest-version" content="0.9">
+<meta name="Forrest-version" content="0.8">
 <meta name="Forrest-skin-name" content="lucene">
 <title>
 	Apache Lucene - Building and Installing the Basic Demo
@@ -159,6 +159,9 @@ document.write("Last Published: " + docu
 <a href="api/contrib-demo/index.html">Demo</a>
 </div>
 <div class="menuitem">
+<a href="api/contrib-grouping/index.html">Grouping</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/demo.pdf
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/lucene/docs/demo.pdf?rev=1103147&r1=1103146&r2=1103147&view=diff
==============================================================================
Files lucene/dev/branches/branch_3x/lucene/docs/demo.pdf (original) and lucene/dev/branches/branch_3x/lucene/docs/demo.pdf Sat May 14 16:13:02 2011 differ

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=1103147&r1=1103146&r2=1103147&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/lucene/docs/demo2.html (original)
+++ lucene/dev/branches/branch_3x/lucene/docs/demo2.html Sat May 14 16:13:02 2011
@@ -3,7 +3,7 @@
 <head>
 <META http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta content="Apache Forrest" name="Generator">
-<meta name="Forrest-version" content="0.9">
+<meta name="Forrest-version" content="0.8">
 <meta name="Forrest-skin-name" content="lucene">
 <title>
 	Apache Lucene - Basic Demo Sources Walk-through
@@ -159,6 +159,9 @@ document.write("Last Published: " + docu
 <a href="api/contrib-demo/index.html">Demo</a>
 </div>
 <div class="menuitem">
+<a href="api/contrib-grouping/index.html">Grouping</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/demo2.pdf
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/lucene/docs/demo2.pdf?rev=1103147&r1=1103146&r2=1103147&view=diff
==============================================================================
Files lucene/dev/branches/branch_3x/lucene/docs/demo2.pdf (original) and lucene/dev/branches/branch_3x/lucene/docs/demo2.pdf Sat May 14 16:13:02 2011 differ

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=1103147&r1=1103146&r2=1103147&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/lucene/docs/fileformats.html (original)
+++ lucene/dev/branches/branch_3x/lucene/docs/fileformats.html Sat May 14 16:13:02 2011
@@ -3,7 +3,7 @@
 <head>
 <META http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta content="Apache Forrest" name="Generator">
-<meta name="Forrest-version" content="0.9">
+<meta name="Forrest-version" content="0.8">
 <meta name="Forrest-skin-name" content="lucene">
 <title>
             Apache Lucene - Index File Formats
@@ -159,6 +159,9 @@ document.write("Last Published: " + docu
 <a href="api/contrib-demo/index.html">Demo</a>
 </div>
 <div class="menuitem">
+<a href="api/contrib-grouping/index.html">Grouping</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/fileformats.pdf
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/lucene/docs/fileformats.pdf?rev=1103147&r1=1103146&r2=1103147&view=diff
==============================================================================
Files lucene/dev/branches/branch_3x/lucene/docs/fileformats.pdf (original) and lucene/dev/branches/branch_3x/lucene/docs/fileformats.pdf Sat May 14 16:13:02 2011 differ

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=1103147&r1=1103146&r2=1103147&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/lucene/docs/gettingstarted.html (original)
+++ lucene/dev/branches/branch_3x/lucene/docs/gettingstarted.html Sat May 14 16:13:02 2011
@@ -3,7 +3,7 @@
 <head>
 <META http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta content="Apache Forrest" name="Generator">
-<meta name="Forrest-version" content="0.9">
+<meta name="Forrest-version" content="0.8">
 <meta name="Forrest-skin-name" content="lucene">
 <title>
 	Apache Lucene - Getting Started Guide
@@ -159,6 +159,9 @@ document.write("Last Published: " + docu
 <a href="api/contrib-demo/index.html">Demo</a>
 </div>
 <div class="menuitem">
+<a href="api/contrib-grouping/index.html">Grouping</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.pdf
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/lucene/docs/gettingstarted.pdf?rev=1103147&r1=1103146&r2=1103147&view=diff
==============================================================================
Files lucene/dev/branches/branch_3x/lucene/docs/gettingstarted.pdf (original) and lucene/dev/branches/branch_3x/lucene/docs/gettingstarted.pdf Sat May 14 16:13:02 2011 differ

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=1103147&r1=1103146&r2=1103147&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/lucene/docs/index.html (original)
+++ lucene/dev/branches/branch_3x/lucene/docs/index.html Sat May 14 16:13:02 2011
@@ -3,7 +3,7 @@
 <head>
 <META http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta content="Apache Forrest" name="Generator">
-<meta name="Forrest-version" content="0.9">
+<meta name="Forrest-version" content="0.8">
 <meta name="Forrest-skin-name" content="lucene">
 <title>Lucene Java Documentation</title>
 <link type="text/css" href="skin/basic.css" rel="stylesheet">
@@ -157,6 +157,9 @@ document.write("Last Published: " + docu
 <a href="api/contrib-demo/index.html">Demo</a>
 </div>
 <div class="menuitem">
+<a href="api/contrib-grouping/index.html">Grouping</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/index.pdf
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/lucene/docs/index.pdf?rev=1103147&r1=1103146&r2=1103147&view=diff
==============================================================================
Files lucene/dev/branches/branch_3x/lucene/docs/index.pdf (original) and lucene/dev/branches/branch_3x/lucene/docs/index.pdf Sat May 14 16:13:02 2011 differ

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=1103147&r1=1103146&r2=1103147&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/lucene/docs/linkmap.html (original)
+++ lucene/dev/branches/branch_3x/lucene/docs/linkmap.html Sat May 14 16:13:02 2011
@@ -3,7 +3,7 @@
 <head>
 <META http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta content="Apache Forrest" name="Generator">
-<meta name="Forrest-version" content="0.9">
+<meta name="Forrest-version" content="0.8">
 <meta name="Forrest-skin-name" content="lucene">
 <title>Site Linkmap Table of Contents</title>
 <link type="text/css" href="skin/basic.css" rel="stylesheet">
@@ -157,6 +157,9 @@ document.write("Last Published: " + docu
 <a href="api/contrib-demo/index.html">Demo</a>
 </div>
 <div class="menuitem">
+<a href="api/contrib-grouping/index.html">Grouping</a>
+</div>
+<div class="menuitem">
 <a href="api/contrib-highlighter/index.html">Highlighter</a>
 </div>
 <div class="menuitem">
@@ -370,6 +373,12 @@ document.write("Last Published: " + docu
 <a href="api/contrib-demo/index.html">Demo</a>&nbsp;&nbsp;___________________&nbsp;&nbsp;<em>javadoc-contrib-demo</em>
 </li>
 </ul>
+            
+<ul>
+<li>
+<a href="api/contrib-grouping/index.html">Grouping</a>&nbsp;&nbsp;___________________&nbsp;&nbsp;<em>javadoc-contrib-grouping</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=1103147&r1=1103146&r2=1103147&view=diff
==============================================================================
Files lucene/dev/branches/branch_3x/lucene/docs/linkmap.pdf (original) and lucene/dev/branches/branch_3x/lucene/docs/linkmap.pdf Sat May 14 16:13:02 2011 differ

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=1103147&r1=1103146&r2=1103147&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 May 14 16:13:02 2011
@@ -3,7 +3,7 @@
 <head>
 <META http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta content="Apache Forrest" name="Generator">
-<meta name="Forrest-version" content="0.9">
+<meta name="Forrest-version" content="0.8">
 <meta name="Forrest-skin-name" content="lucene">
 <title>
 	        Apache Lucene - Lucene Contrib
@@ -159,6 +159,9 @@ document.write("Last Published: " + docu
 <a href="../api/contrib-demo/index.html">Demo</a>
 </div>
 <div class="menuitem">
+<a href="../api/contrib-grouping/index.html">Grouping</a>
+</div>
+<div class="menuitem">
 <a href="../api/contrib-highlighter/index.html">Highlighter</a>
 </div>
 <div class="menuitem">
@@ -276,6 +279,9 @@ document.write("Last Published: " + docu
 <a href="#db">db</a>
 </li>
 <li>
+<a href="#grouping">grouping</a>
+</li>
+<li>
 <a href="#highlighter">highlighter</a>
 </li>
 <li>
@@ -394,73 +400,78 @@ document.write("Last Published: " + docu
 <p>Provides integration with Berkley DB.</p>
 <p>See <a href="../api/contrib-db/index.html">db javadoc</a>
 </p>
-<a name="N10084"></a><a name="highlighter"></a>
+<a name="N10084"></a><a name="grouping"></a>
+<h3 class="boxed">grouping</h3>
+<p>Groups search results according to a specified field</p>
+<p>See <a href="../api/contrib-grouping/index.html">grouping javadoc</a>
+</p>
+<a name="N10093"></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="N10093"></a><a name="icu"></a>
+<a name="N100A2"></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="N100A2"></a><a name="instantiated"></a>
+<a name="N100B1"></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="N100B1"></a><a name="lucli"></a>
+<a name="N100C0"></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="N100C0"></a><a name="memory"></a>
+<a name="N100CF"></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="N100CF"></a><a name="misc"></a>
+<a name="N100DE"></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="N100DE"></a><a name="queryparser"></a>
+<a name="N100ED"></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="N100ED"></a><a name="queries"></a>
+<a name="N100FC"></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="N100FC"></a><a name="remote"></a>
+<a name="N1010B"></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="N1010B"></a><a name="spatial"></a>
+<a name="N1011A"></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="N1011A"></a><a name="spellchecker"></a>
+<a name="N10129"></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="N10129"></a><a name="swing"></a>
+<a name="N10138"></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="N10138"></a><a name="wordnet"></a>
+<a name="N10147"></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="N10147"></a><a name="xml-query-parser"></a>
+<a name="N10156"></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=1103147&r1=1103146&r2=1103147&view=diff
==============================================================================
Files lucene/dev/branches/branch_3x/lucene/docs/lucene-contrib/index.pdf (original) and lucene/dev/branches/branch_3x/lucene/docs/lucene-contrib/index.pdf Sat May 14 16:13:02 2011 differ

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=1103147&r1=1103146&r2=1103147&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/lucene/docs/queryparsersyntax.html (original)
+++ lucene/dev/branches/branch_3x/lucene/docs/queryparsersyntax.html Sat May 14 16:13:02 2011
@@ -3,7 +3,7 @@
 <head>
 <META http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta content="Apache Forrest" name="Generator">
-<meta name="Forrest-version" content="0.9">
+<meta name="Forrest-version" content="0.8">
 <meta name="Forrest-skin-name" content="lucene">
 <title>
 	Apache Lucene - Query Parser Syntax
@@ -159,6 +159,9 @@ document.write("Last Published: " + docu
 <a href="api/contrib-demo/index.html">Demo</a>
 </div>
 <div class="menuitem">
+<a href="api/contrib-grouping/index.html">Grouping</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/queryparsersyntax.pdf
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/lucene/docs/queryparsersyntax.pdf?rev=1103147&r1=1103146&r2=1103147&view=diff
==============================================================================
Files lucene/dev/branches/branch_3x/lucene/docs/queryparsersyntax.pdf (original) and lucene/dev/branches/branch_3x/lucene/docs/queryparsersyntax.pdf Sat May 14 16:13:02 2011 differ

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=1103147&r1=1103146&r2=1103147&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/lucene/docs/scoring.html (original)
+++ lucene/dev/branches/branch_3x/lucene/docs/scoring.html Sat May 14 16:13:02 2011
@@ -3,7 +3,7 @@
 <head>
 <META http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta content="Apache Forrest" name="Generator">
-<meta name="Forrest-version" content="0.9">
+<meta name="Forrest-version" content="0.8">
 <meta name="Forrest-skin-name" content="lucene">
 <title>
 	Apache Lucene - Scoring
@@ -159,6 +159,9 @@ document.write("Last Published: " + docu
 <a href="api/contrib-demo/index.html">Demo</a>
 </div>
 <div class="menuitem">
+<a href="api/contrib-grouping/index.html">Grouping</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.pdf
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/lucene/docs/scoring.pdf?rev=1103147&r1=1103146&r2=1103147&view=diff
==============================================================================
Files lucene/dev/branches/branch_3x/lucene/docs/scoring.pdf (original) and lucene/dev/branches/branch_3x/lucene/docs/scoring.pdf Sat May 14 16:13:02 2011 differ

Modified: lucene/dev/branches/branch_3x/lucene/docs/skin/basic.css
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/lucene/docs/skin/basic.css?rev=1103147&r1=1103146&r2=1103147&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/lucene/docs/skin/basic.css (original)
+++ lucene/dev/branches/branch_3x/lucene/docs/skin/basic.css Sat May 14 16:13:02 2011
@@ -163,4 +163,4 @@ p {
 .codefrag {
   font-family: "Courier New", Courier, monospace;
   font-size: 110%;
-}
+}
\ No newline at end of file

Modified: lucene/dev/branches/branch_3x/lucene/docs/skin/print.css
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/lucene/docs/skin/print.css?rev=1103147&r1=1103146&r2=1103147&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/lucene/docs/skin/print.css (original)
+++ lucene/dev/branches/branch_3x/lucene/docs/skin/print.css Sat May 14 16:13:02 2011
@@ -51,4 +51,4 @@ a:link, a:visited {
 
 acronym {
   border: 0;
-}
+}
\ No newline at end of file

Modified: lucene/dev/branches/branch_3x/lucene/docs/skin/profile.css
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/lucene/docs/skin/profile.css?rev=1103147&r1=1103146&r2=1103147&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/lucene/docs/skin/profile.css (original)
+++ lucene/dev/branches/branch_3x/lucene/docs/skin/profile.css Sat May 14 16:13:02 2011
@@ -172,4 +172,4 @@ a:hover { color:#6587ff} 
     }
       
     
-  
+  
\ No newline at end of file

Modified: lucene/dev/branches/branch_3x/lucene/docs/skin/screen.css
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/lucene/docs/skin/screen.css?rev=1103147&r1=1103146&r2=1103147&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/lucene/docs/skin/screen.css (original)
+++ lucene/dev/branches/branch_3x/lucene/docs/skin/screen.css Sat May 14 16:13:02 2011
@@ -584,4 +584,4 @@ p.instruction {
   list-style-image: url('../images/instruction_arrow.png');
   list-style-position: outside;
   margin-left: 2em;
-} 
+} 
\ No newline at end of file

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=1103147&r1=1103146&r2=1103147&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/lucene/docs/systemrequirements.html (original)
+++ lucene/dev/branches/branch_3x/lucene/docs/systemrequirements.html Sat May 14 16:13:02 2011
@@ -3,7 +3,7 @@
 <head>
 <META http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta content="Apache Forrest" name="Generator">
-<meta name="Forrest-version" content="0.9">
+<meta name="Forrest-version" content="0.8">
 <meta name="Forrest-skin-name" content="lucene">
 <title>Apache Lucene - System Requirements</title>
 <link type="text/css" href="skin/basic.css" rel="stylesheet">
@@ -157,6 +157,9 @@ document.write("Last Published: " + docu
 <a href="api/contrib-demo/index.html">Demo</a>
 </div>
 <div class="menuitem">
+<a href="api/contrib-grouping/index.html">Grouping</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.pdf
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/lucene/docs/systemrequirements.pdf?rev=1103147&r1=1103146&r2=1103147&view=diff
==============================================================================
Binary files - no diff available.

Modified: lucene/dev/branches/branch_3x/lucene/src/site/src/documentation/content/xdocs/lucene-contrib/index.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/lucene/src/site/src/documentation/content/xdocs/lucene-contrib/index.xml?rev=1103147&r1=1103146&r2=1103147&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/lucene/src/site/src/documentation/content/xdocs/lucene-contrib/index.xml (original)
+++ lucene/dev/branches/branch_3x/lucene/src/site/src/documentation/content/xdocs/lucene-contrib/index.xml Sat May 14 16:13:02 2011
@@ -76,6 +76,11 @@
                 <p>See <a href="../api/contrib-db/index.html">db javadoc</a></p>
             </section>
             
+            <section id="grouping"><title>grouping</title>
+                <p>Groups search results according to a specified field</p>
+                <p>See <a href="../api/contrib-grouping/index.html">grouping javadoc</a></p>
+            </section>
+
             <section id="highlighter"><title>highlighter</title>
                 <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>