Index: lucene/src/site/src/documentation/content/xdocs/demo.xml
===================================================================
--- lucene/src/site/src/documentation/content/xdocs/demo.xml	(revision 1072680)
+++ lucene/src/site/src/documentation/content/xdocs/demo.xml	(working copy)
@@ -56,7 +56,7 @@
 you've set your CLASSPATH correctly, just type:
 
 <pre>
-    java org.apache.lucene.demo.IndexFiles {full-path-to-lucene}/src
+    java org.apache.lucene.demo.IndexFiles -docs {path-to-lucene}/src
 </pre>
 
 This will produce a subdirectory called <code>index</code> which will contain an index of all of the
Index: lucene/src/site/src/documentation/content/xdocs/demo2.xml
===================================================================
--- lucene/src/site/src/documentation/content/xdocs/demo2.xml	(revision 1072680)
+++ lucene/src/site/src/documentation/content/xdocs/demo2.xml	(working copy)
@@ -136,17 +136,14 @@
 <a href="api/core/org/apache/lucene/search/Query.html">Query</a> object without using the query
 parser.  The query parser just enables decoding the <a href="queryparsersyntax.html">Lucene query
 syntax</a> into the corresponding <a href="api/core/org/apache/lucene/search/Query.html">Query</a>
-object. Search can be executed in two different ways:
+object.
 </p>
 
-<ul>
-<li>Streaming: A <a href="api/core/org/apache/lucene/search/Collector.html">Collector</a> subclass
-simply prints out the document ID and score for each matching document.</li>
-<li>Paging: Using the <code>IndexSearcher.search(query,n)</code> method that returns 
-<a href="api/core/org/apache/lucene/search/TopDocs.html">TopDocs</a> with max <code>n</code> hits,
-the search results are printed in pages, sorted by score (i.e. relevance).</li>
-</ul>
-
+<p>
+<code>SearchFiles</code> uses the <code>IndexSearcher.search(query,n)</code> method that returns
+<a href="api/core/org/apache/lucene/search/TopDocs.html">TopDocs</a> with max <code>n</code> hits.
+The results are printed in pages, sorted by score (i.e. relevance).
+</p>
 </section>
 </body>
 </document>
Index: lucene/contrib/demo/src/java/org/apache/lucene/demo/SearchFiles.java
===================================================================
--- lucene/contrib/demo/src/java/org/apache/lucene/demo/SearchFiles.java	(revision 1072680)
+++ lucene/contrib/demo/src/java/org/apache/lucene/demo/SearchFiles.java	(working copy)
@@ -189,7 +189,7 @@
                   
       }
 
-      if (!interactive) {
+      if (!interactive || end == 0) {
         break;
       }
 
Index: lucene/contrib/demo/src/java/org/apache/lucene/demo/IndexFiles.java
===================================================================
--- lucene/contrib/demo/src/java/org/apache/lucene/demo/IndexFiles.java	(revision 1072680)
+++ lucene/contrib/demo/src/java/org/apache/lucene/demo/IndexFiles.java	(working copy)
@@ -45,7 +45,7 @@
 
   /** Index all text files under a directory. */
   public static void main(String[] args) {
-    String usage = "java org.apache.lucene.demo.IndexFiles <root_directory>"
+    String usage = "java org.apache.lucene.demo.IndexFiles"
                  + " [-index INDEX_PATH] [-docs DOCS_PATH] [-update]\n\n"
                    // TODO: Change the link with every release (or: fill in some less error-prone alternative here...)
                  + "See http://lucene.apache.org/java/4_0/demo.html for details.";