[1/2] lucene-solr:master: SOLR-5004: put param names and values in monospace

[ct...@apache.org]

Repository: lucene-solr
Updated Branches:
  refs/heads/master 7952cec99 -> 8d1093934


SOLR-5004: put param names and values in monospace


Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/93ccdce5
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/93ccdce5
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/93ccdce5

Branch: refs/heads/master
Commit: 93ccdce57c85fa652efa6b328344a267ba3319fd
Parents: 7952cec
Author: Cassandra Targett <ct...@apache.org>
Authored: Thu Oct 25 11:06:25 2018 -0500
Committer: Cassandra Targett <ct...@apache.org>
Committed: Thu Oct 25 11:06:25 2018 -0500

----------------------------------------------------------------------
 solr/solr-ref-guide/src/collections-api.adoc | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/93ccdce5/solr/solr-ref-guide/src/collections-api.adoc
----------------------------------------------------------------------
diff --git a/solr/solr-ref-guide/src/collections-api.adoc b/solr/solr-ref-guide/src/collections-api.adoc
index 673cb1b..ec8517d 100644
--- a/solr/solr-ref-guide/src/collections-api.adoc
+++ b/solr/solr-ref-guide/src/collections-api.adoc
@@ -288,9 +288,9 @@ This parameter can be used to split a shard using a route key such that all docu
 For example, suppose `split.key=A!` hashes to the range `12-15` and belongs to shard 'shard1' with range `0-20`. Splitting by this route key would yield three sub-shards with ranges `0-11`, `12-15` and `16-20`. Note that the sub-shard with the hash range of the route key may also contain documents for other route keys whose hash ranges overlap.
 
 `numSubShards`::
-The number of sub-shards to split the parent shard into. Allowed values for this are in the range of 2-8 and defaults to 2.
+The number of sub-shards to split the parent shard into. Allowed values for this are in the range of `2`-`8` and defaults to `2`.
 +
-This parameter can only be used when ranges or split.key are not specified.
+This parameter can only be used when `ranges` or `split.key` are not specified.
 
 `splitMethod`::
 Currently two methods of shard splitting are supported:

[2/2] lucene-solr:master: SOLR-12423: fix Tika version in CHANGES

[ct...@apache.org]

SOLR-12423: fix Tika version in CHANGES


Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/8d109393
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/8d109393
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/8d109393

Branch: refs/heads/master
Commit: 8d109393492924cdde9663b9b9c4da00daaae433
Parents: 93ccdce
Author: Cassandra Targett <ct...@apache.org>
Authored: Thu Oct 25 11:56:19 2018 -0500
Committer: Cassandra Targett <ct...@apache.org>
Committed: Thu Oct 25 11:56:19 2018 -0500

----------------------------------------------------------------------
 solr/CHANGES.txt | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/8d109393/solr/CHANGES.txt
----------------------------------------------------------------------
diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index bb8f86d..7715efa 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -85,7 +85,7 @@ Other Changes
 * SOLR-12586: Upgrade ParseDateFieldUpdateProcessorFactory (present in "schemaless mode") to use Java 8's
   java.time.DateTimeFormatter instead of Joda time (see upgrade notes).  "Lenient" is enabled.  Removed Joda Time dependency.
   (David Smiley, Bar Rotstein)
-  
+
 * SOLR-5163: edismax now throws an exception when qf refers to a nonexistent field (Charles Sanders, David Smiley)
 
 * SOLR-12805: Store previous term (generation) of replica when start recovery process (Cao Manh Dat)
@@ -96,7 +96,7 @@ Other Changes
 
 * SOLR-11812: Remove backward compatibility of old LIR implementation in 8.0 (Cao Manh Dat)
 
-* SOLR-12620: Remove the Admin UI Cloud -> Graph (Radial) view (janhoy) 
+* SOLR-12620: Remove the Admin UI Cloud -> Graph (Radial) view (janhoy)
 
 ==================  7.6.0 ==================
 
@@ -104,7 +104,7 @@ Consult the LUCENE_CHANGES.txt file for additional, low level, changes in this r
 
 Versions of Major Components
 ---------------------
-Apache Tika 1.18
+Apache Tika 1.19.1
 Carrot2 3.16.0
 Velocity 1.7 and Velocity Tools 2.0
 Apache ZooKeeper 3.4.11
@@ -582,7 +582,7 @@ Other Changes
 
 * SOLR-8742: In HdfsDirectoryTest replace RAMDirectory usages with ByteBuffersDirectory.
   (hossman, Mark Miller, Andrzej Bialecki, Steve Rowe)
-  
+
 * SOLR-12771: Improve Autoscaling Policy and Preferences documentation. (hossman, Steve Rowe)
 
 ==================  7.4.0 ==================