svn commit: r1398572 - in /lucene/dev/branches/lucene_solr_4_0: ./ lucene/ lucene/SYSTEM_REQUIREMENTS.txt solr/ solr/SYSTEM_REQUIREMENTS.txt

[us...@apache.org]

Author: uschindler
Date: Mon Oct 15 23:18:08 2012
New Revision: 1398572

URL: http://svn.apache.org/viewvc?rev=1398572&view=rev
Log:
Merged revision(s) 1398571 from lucene/dev/branches/branch_4x:
LUCENE-4006: Exchange files

Modified:
    lucene/dev/branches/lucene_solr_4_0/   (props changed)
    lucene/dev/branches/lucene_solr_4_0/lucene/   (props changed)
    lucene/dev/branches/lucene_solr_4_0/lucene/SYSTEM_REQUIREMENTS.txt   (contents, props changed)
    lucene/dev/branches/lucene_solr_4_0/solr/   (props changed)
    lucene/dev/branches/lucene_solr_4_0/solr/SYSTEM_REQUIREMENTS.txt   (contents, props changed)

Modified: lucene/dev/branches/lucene_solr_4_0/lucene/SYSTEM_REQUIREMENTS.txt
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene_solr_4_0/lucene/SYSTEM_REQUIREMENTS.txt?rev=1398572&r1=1398571&r2=1398572&view=diff
==============================================================================
--- lucene/dev/branches/lucene_solr_4_0/lucene/SYSTEM_REQUIREMENTS.txt (original)
+++ lucene/dev/branches/lucene_solr_4_0/lucene/SYSTEM_REQUIREMENTS.txt Mon Oct 15 23:18:08 2012
@@ -1,16 +1,16 @@
 # System Requirements 
 
-Apache Solr runs of Java 6 or greater. When using Java 7, be sure to 
+Apache Lucene runs of Java 6 or greater. When using Java 7, be sure to 
 install at least Update 1! With all Java versions it is strongly 
 recommended to not use experimental `-XX` JVM options. It is also 
 recommended to always use the latest update version of your Java VM, 
-because bugs may affect Solr. An overview of known JVM bugs can be 
+because bugs may affect Lucene. An overview of known JVM bugs can be 
 found on http://wiki.apache.org/lucene-java/SunJavaBugs. 
 
 CPU, disk and memory requirements are based on the many choices made in 
-implementing Solr (document size, number of documents, and number of 
+implementing Lucene (document size, number of documents, and number of 
 hits retrieved to name a few). The benchmarks page has some information 
 related to performance on particular platforms. 
 
-*To build Apache Solr from source, refer to the `BUILD.txt` file in 
-the distribution directory.* 
+*To build Apache Lucene from source, refer to the `BUILD.txt` file in 
+the distribution directory.*

Modified: lucene/dev/branches/lucene_solr_4_0/solr/SYSTEM_REQUIREMENTS.txt
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene_solr_4_0/solr/SYSTEM_REQUIREMENTS.txt?rev=1398572&r1=1398571&r2=1398572&view=diff
==============================================================================
--- lucene/dev/branches/lucene_solr_4_0/solr/SYSTEM_REQUIREMENTS.txt (original)
+++ lucene/dev/branches/lucene_solr_4_0/solr/SYSTEM_REQUIREMENTS.txt Mon Oct 15 23:18:08 2012
@@ -1,16 +1,16 @@
 # System Requirements 
 
-Apache Lucene runs of Java 6 or greater. When using Java 7, be sure to 
+Apache Solr runs of Java 6 or greater. When using Java 7, be sure to 
 install at least Update 1! With all Java versions it is strongly 
 recommended to not use experimental `-XX` JVM options. It is also 
 recommended to always use the latest update version of your Java VM, 
-because bugs may affect Lucene. An overview of known JVM bugs can be 
+because bugs may affect Solr. An overview of known JVM bugs can be 
 found on http://wiki.apache.org/lucene-java/SunJavaBugs. 
 
 CPU, disk and memory requirements are based on the many choices made in 
-implementing Lucene (document size, number of documents, and number of 
+implementing Solr (document size, number of documents, and number of 
 hits retrieved to name a few). The benchmarks page has some information 
 related to performance on particular platforms. 
 
-*To build Apache Lucene from source, refer to the `BUILD.txt` file in 
-the distribution directory.*
+*To build Apache Solr from source, refer to the `BUILD.txt` file in 
+the distribution directory.*