diff --git a/solr-conf/solr-3.x/protwords.txt b/solr-conf/solr-3.x/protwords.txt
index f0fd084..cda8581 100644
--- a/solr-conf/solr-3.x/protwords.txt
+++ b/solr-conf/solr-3.x/protwords.txt
@@ -5,4 +5,3 @@
 >
 '
 "
-
diff --git a/solr-conf/solr-3.x/solrconfig.xml b/solr-conf/solr-3.x/solrconfig.xml
index 7779a9d..b81b161 100644
--- a/solr-conf/solr-3.x/solrconfig.xml
+++ b/solr-conf/solr-3.x/solrconfig.xml
@@ -20,7 +20,7 @@
      For more details about configurations options that may appear in
      this file, see http://wiki.apache.org/solr/SolrConfigXml.
 -->
-<config name="drupal-4.1-solr-3.x">
+<config name="drupal-4.2-solr-3.x">
   <!-- In all configuration below, a prefix of "solr." for class names
        is an alias that causes solr to search appropriate packages,
        including org.apache.solr.(search|update|request|core|analysis)
@@ -1077,7 +1077,7 @@
   <!-- Solr Replication
 
        The SolrReplicationHandler supports replicating indexes from a
-       "master" used for indexing and "salves" used for queries.
+       "master" used for indexing and "slaves" used for queries.
 
        http://wiki.apache.org/solr/SolrReplication 
 
@@ -1090,7 +1090,7 @@
          <str name="enable">${solr.replication.master:false}</str>
          <str name="replicateAfter">commit</str>
          <str name="replicateAfter">startup</str>
-         <str name="confFiles">${solr.replication.confFiles:schema.xml,protwords.txt,stopwords.txt,synonyms.txt,elevate.xml}</str>
+         <str name="confFiles">${solr.replication.confFiles:schema.xml,mapping-ISOLatin1Accent.txt,protwords.txt,stopwords.txt,synonyms.txt,elevate.xml}</str>
        </lst>
        <lst name="slave">
          <str name="enable">${solr.replication.slave:false}</str>
diff --git a/solr-conf/solr-3.x/solrcore.properties b/solr-conf/solr-3.x/solrcore.properties
index b2e8876..bc46886 100644
--- a/solr-conf/solr-3.x/solrcore.properties
+++ b/solr-conf/solr-3.x/solrcore.properties
@@ -1,11 +1,12 @@
-#solrcore.properties for this specific core
+# Defines Solr properties for this specific core.
 solr.replication.master=false
 solr.replication.slave=false
 solr.replication.pollInterval=00:00:60
 solr.replication.masterUrl=http://localhost:8983/solr
 solr.replication.confFiles=schema.xml,mapping-ISOLatin1Accent.txt,protwords.txt,stopwords.txt,synonyms.txt,elevate.xml
 solr.mlt.timeAllowed=2000
-# You should not set your luceneVersion to anything lower then your Solr Version
+# You should not set your luceneMatchVersion to anything lower than your Solr
+# Version.
 solr.luceneMatchVersion=LUCENE_35
 solr.pinkPony.timeAllowed=-1
 # autoCommit after 10000 docs
diff --git a/solr-conf/solr-3.x/stopwords.txt b/solr-conf/solr-3.x/stopwords.txt
index 045f6d1..d7f243e 100644
--- a/solr-conf/solr-3.x/stopwords.txt
+++ b/solr-conf/solr-3.x/stopwords.txt
@@ -1,4 +1,4 @@
 # Contains words which shouldn't be indexed for fulltext fields, e.g., because
-# they're to common. For documentation of the format, see
+# they're too common. For documentation of the format, see
 # http://wiki.apache.org/solr/AnalyzersTokenizersTokenFilters#solr.StopFilterFactory
 # (Lines starting with a pound character # are ignored.)
diff --git a/solr-conf/solr-4.x/protwords.txt b/solr-conf/solr-4.x/protwords.txt
index f0fd084..cda8581 100644
--- a/solr-conf/solr-4.x/protwords.txt
+++ b/solr-conf/solr-4.x/protwords.txt
@@ -5,4 +5,3 @@
 &gt;
 &#039;
 &quot;
-
diff --git a/solr-conf/solr-4.x/schema.xml b/solr-conf/solr-4.x/schema.xml
index 3abca6d..6e2b615 100644
--- a/solr-conf/solr-4.x/schema.xml
+++ b/solr-conf/solr-4.x/schema.xml
@@ -10,7 +10,7 @@
  http://wiki.apache.org/solr/SchemaXml
 -->
 
-<schema name="drupal-4.1-solr-4.x" version="1.3">
+<schema name="drupal-4.2-solr-4.x" version="1.3">
     <!-- attribute "name" is the name of this schema and is only used for display purposes.
          Applications should change this to reflect the nature of the search collection.
          version="1.2" is Solr's version number for the schema syntax and semantics.  It should
diff --git a/solr-conf/solr-4.x/solrconfig.xml b/solr-conf/solr-4.x/solrconfig.xml
index 5cd1d64..5a58fc0 100644
--- a/solr-conf/solr-4.x/solrconfig.xml
+++ b/solr-conf/solr-4.x/solrconfig.xml
@@ -1085,7 +1085,7 @@
   <!-- Solr Replication
 
        The SolrReplicationHandler supports replicating indexes from a
-       "master" used for indexing and "salves" used for queries.
+       "master" used for indexing and "slaves" used for queries.
 
        http://wiki.apache.org/solr/SolrReplication
 
@@ -1098,7 +1098,7 @@
       <str name="enable">${solr.replication.master:false}</str>
       <str name="replicateAfter">commit</str>
       <str name="replicateAfter">startup</str>
-      <str name="confFiles">${solr.replication.confFiles:schema.xml,protwords.txt,stopwords.txt,synonyms.txt,elevate.xml}</str>
+      <str name="confFiles">${solr.replication.confFiles:schema.xml,mapping-ISOLatin1Accent.txt,protwords.txt,stopwords.txt,synonyms.txt,elevate.xml}</str>
     </lst>
     <lst name="slave">
       <str name="enable">${solr.replication.slave:false}</str>
diff --git a/solr-conf/solr-4.x/solrcore.properties b/solr-conf/solr-4.x/solrcore.properties
index 6e0d94d..b7f8f6c 100644
--- a/solr-conf/solr-4.x/solrcore.properties
+++ b/solr-conf/solr-4.x/solrcore.properties
@@ -1,11 +1,12 @@
-#solrcore.properties for this specific core
+# Defines Solr properties for this specific core.
 solr.replication.master=false
 solr.replication.slave=false
 solr.replication.pollInterval=00:00:60
 solr.replication.masterUrl=http://localhost:8983/solr
 solr.replication.confFiles=schema.xml,mapping-ISOLatin1Accent.txt,protwords.txt,stopwords.txt,synonyms.txt,elevate.xml
 solr.mlt.timeAllowed=2000
-# You should not set your luceneVersion to anything lower then your Solr Version
+# You should not set your luceneMatchVersion to anything lower than your Solr
+# Version.
 solr.luceneMatchVersion=LUCENE_40
 solr.pinkPony.timeAllowed=-1
 # autoCommit after 10000 docs
diff --git a/solr-conf/solr-4.x/stopwords.txt b/solr-conf/solr-4.x/stopwords.txt
index 045f6d1..d7f243e 100644
--- a/solr-conf/solr-4.x/stopwords.txt
+++ b/solr-conf/solr-4.x/stopwords.txt
@@ -1,4 +1,4 @@
 # Contains words which shouldn't be indexed for fulltext fields, e.g., because
-# they're to common. For documentation of the format, see
+# they're too common. For documentation of the format, see
 # http://wiki.apache.org/solr/AnalyzersTokenizersTokenFilters#solr.StopFilterFactory
 # (Lines starting with a pound character # are ignored.)