-* masterkey-lui-solr5 is based on Solr 5, which does not require a
- separate Java servlet container. That simplifies packaging and
- installation significantly, as there is no longer any need for
- Tomcat integration. There is only one package to install,
- masterkey-lui-solr5.
-
-* masterkey-lui-solr5 is installed as a separate service, since it no
- longer runs under Tomcat. The service name is "lui-solr", and files
- and processes are owned by the "lui-solr" user (created as part of
- the package installation).
-
-* The default port for masterkey-lui-solr5 is the same as the Solr 5
- default port, 8983, to prevent conflicts when upgrading a lui-solr
- installation that is on the same system as a MasterKey Harvester
- installation (which runs by default under Tomcat on port 8080). This
- may require changes to Harvester datasource settings and/or search
- target settings for existing installations. The Solr port can be set
- by the user in the configuration file
- /etc/masterkey/lui/lui-solr.in.sh (look for the SOLR_PORT variable).
-
-* Solr 5 no longer has the feature of serving up a default core
- ("collection1") on the root of the web
- application. The masterkey-lui-solr5 installs a default core named
- "lui", addressable at http://localhost:8983/solr/lui. This may also
- require changes to Harvester and search target settings.
-
- * Cores are defined in the /etc/masterkey/lui/solr-home
+* masterkey-lui-solr5/masterkey-lui-solr6 are based on Solr 5/6, which
+ do not require a separate Java servlet container. That simplifies
+ packaging and installation significantly, as there is no longer any
+ need for Tomcat integration. There is only one package to install,
+ masterkey-lui-solr5 or masterkey-lui-solr6.
+
+* masterkey-lui-solr5/masterkey-lui-solr6 are installed as a separate
+ service, since they no longer runs under Tomcat. The service name is
+ "lui-solr", and files and processes are owned by the "lui-solr" user
+ (created as part of the package installation).
+
+* The default port for masterkey-lui-solr5/masterkey-lui-solr6 is the
+ same as the Solr default port, 8983, to prevent conflicts when
+ upgrading a lui-solr installation that is on the same system as a
+ MasterKey Harvester installation (which runs by default under Tomcat
+ on port 8080). This may require changes to Harvester datasource
+ settings and/or search target settings for existing
+ installations. The Solr port can be set by the user in the
+ configuration file /etc/masterkey/lui/solr/lui-solr.in.sh (look for
+ the SOLR_PORT variable).
+
+* Solr 5/6 no longer have the feature of serving up a default core
+ ("collection1") on the root of the web application. The
+ masterkey-lui-solr packages install a default core named "lui",
+ addressable at http://localhost:8983/solr/lui. This may also require
+ changes to Harvester and search target settings.
+
+ * Cores are defined in the /etc/masterkey/lui/solr/solr-home