merge r1743214 from trunk
git-svn-id: https://svn.apache.org/repos/asf/manifoldcf/integration/solr-6.x/branches/release-2.2-branch@1743216 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/README.txt b/README.txt
index c894c06..dab6460 100644
--- a/README.txt
+++ b/README.txt
@@ -38,7 +38,7 @@
Execute the following command in order to build the distribution assemblies
- mvn package assembly:assembly
+ mvn clean package assembly:single
The JAR package can be found in the target folder:
@@ -103,7 +103,7 @@
Replace <collection_name> with your core or collection name respectively.
-The default value of "__nosecurity__" is manadatory because the queries will be
+The default value of "__nosecurity__" is mandatory because the queries will be
rewritten to use all of these 6 fields. If a field is missing in the index then
you will get no results for your search.
diff --git a/src/main/assembly/bin.xml b/src/main/assembly/bin.xml
index 30de322..8988d4b 100644
--- a/src/main/assembly/bin.xml
+++ b/src/main/assembly/bin.xml
@@ -40,7 +40,6 @@
<fileMode>644</fileMode>
<directoryMode>755</directoryMode>
<includes>
- <include>KEYS</include>
<include>README.txt</include>
<include>LICENSE.txt</include>
<include>NOTICE.txt</include>
diff --git a/src/main/assembly/src.xml b/src/main/assembly/src.xml
index d540555..e1724af 100644
--- a/src/main/assembly/src.xml
+++ b/src/main/assembly/src.xml
@@ -29,6 +29,7 @@
<fileMode>644</fileMode>
<directoryMode>755</directoryMode>
<excludes>
+ <exclude>KEYS</exclude>
<exclude>**/.*</exclude>
<exclude>**/.*/**</exclude>
<exclude>**/*.iml/**</exclude>
