You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by ct...@apache.org on 2017/05/09 19:22:32 UTC

svn commit: r1011953 [26/32] - in /websites/production/lucene/content/solr/guide/test-10290: ./ fonts/mplus1mn/ images/a-quick-overview/ images/other-parsers/

Modified: websites/production/lucene/content/solr/guide/test-10290/solr-glossary.html
==============================================================================
--- websites/production/lucene/content/solr/guide/test-10290/solr-glossary.html (original)
+++ websites/production/lucene/content/solr/guide/test-10290/solr-glossary.html Tue May  9 19:22:29 2017
@@ -1252,360 +1252,303 @@
    
 
     
-    
-<!-- this handles the automatic toc. use ## for subheads to auto-generate the on-page minitoc. if you use html tags, you must supply an ID for the heading element in order for it to appear in the minitoc. -->
-<script>
-$( document ).ready(function() {
-  // Handler for .ready() called.
-
-$('#toc').toc({ minimumHeaders: 2, listType: 'ul', showSpeed: 0, headers: 'h2,h3' });
-
-/* this offset helps account for the space taken up by the floating toolbar. */
-$('#toc').on('click', 'a', function() {
-  var target = $(this.getAttribute('href'))
-    , scroll_target = target.offset().top
-
-  $(window).scrollTop(scroll_target - 10);
-  return false
-})
-
-});
-</script>
-
-<div id="toc"></div>
-
-    
 
 <div id="main-content">
   <div id="preamble">
 <div class="sectionbody">
 <div class="paragraph">
-<p>Where possible, terms are linked to relevant parts of the Solr Reference Guide for more information.</p>
-</div>
-<hr>
-<div class="paragraph">
-<p><strong>Jump to a letter:</strong></p>
-</div>
-<div class="paragraph">
-<p><a href="#SolrGlossary-A">A</a> <a href="#SolrGlossary-B">B</a> <a href="#SolrGlossary-C">C</a> <a href="#SolrGlossary-D">D</a> <a href="#SolrGlossary-E">E</a> <a href="#SolrGlossary-F">F</a> G H <a href="#SolrGlossary-I">I</a> J K <a href="#SolrGlossary-L">L</a> <a href="#SolrGlossary-M">M</a> <a href="#SolrGlossary-N">N</a> <a href="#SolrGlossary-O">O</a> P <a href="#SolrGlossary-Q">Q</a> <a href="#SolrGlossary-R">R</a> <a href="#SolrGlossary-S">S</a> <a href="#SolrGlossary-T">T</a> U V <a href="#SolrGlossary-W">W</a> X Y <a href="#SolrGlossary-Z">Z</a></p>
-</div>
-</div>
-</div>
-<div class="sect1">
-<h2 id="SolrGlossary-A">A</h2>
-<div class="sectionbody">
-<div class="sect5">
-<h6 id="SolrGlossary-Atomicupdates"><a href="updating-parts-of-documents.html#UpdatingPartsofDocuments-AtomicUpdates">Atomic updates</a></h6>
-<div class="paragraph">
-<p>An approach to updating only one or more fields of a document, instead of reindexing the entire document.</p>
-</div>
+<p>These are common terms used with Solr.</p>
 </div>
 </div>
 </div>
 <div class="sect1">
-<h2 id="SolrGlossary-B">B</h2>
+<h2 id="solr-terms">Solr Terms</h2>
 <div class="sectionbody">
-<div class="sect5">
-<h6 id="SolrGlossary-Booleanoperators">Boolean operators</h6>
 <div class="paragraph">
-<p>These control the inclusion or exclusion of keywords in a query by using operators such as AND, OR, and NOT.</p>
-</div>
-</div>
-</div>
+<p>Where possible, terms are linked to relevant parts of the Solr Reference Guide for more information.</p>
 </div>
-<div class="sect1">
-<h2 id="SolrGlossary-C">C</h2>
-<div class="sectionbody">
-<div class="sect5">
-<h6 id="SolrGlossary-Cluster">Cluster</h6>
 <div class="paragraph">
-<p>In Solr, a cluster is a set of Solr nodes operating in coordination with each other via <a href="#SolrGlossary-ZooKeeper">ZooKeeper</a>, and managed as a unit. A cluster may contain many collections. See also <a href="#SolrGlossary-SolrCloud">SolrCloud</a>.</p>
-</div>
+<p><strong>Jump to a letter:</strong></p>
 </div>
-<div class="sect5">
-<h6 id="SolrGlossary-Collection">Collection</h6>
 <div class="paragraph">
-<p>In Solr, one or more <a href="#SolrGlossary-Document">Documents</a> grouped together in a single logical index using a single configuration and Schema. In <a href="#SolrGlossary-SolrCloud">SolrCloud</a> a collection may be divided up into multiple logical shards, which may in turn be distributed across many nodes, or in a Single node Solr installation, a collection may be a single <a href="#SolrGlossary-Core">Core</a>.</p>
-</div>
+<p><a href="#SolrGlossary-A">A</a> <a href="#SolrGlossary-B">B</a> <a href="#SolrGlossary-C">C</a> <a href="#SolrGlossary-D">D</a> <a href="#SolrGlossary-E">E</a> <a href="#SolrGlossary-F">F</a> G H <a href="#SolrGlossary-I">I</a> J K <a href="#SolrGlossary-L">L</a> <a href="#SolrGlossary-M">M</a> <a href="#SolrGlossary-N">N</a> <a href="#SolrGlossary-O">O</a> P <a href="#SolrGlossary-Q">Q</a> <a href="#SolrGlossary-R">R</a> <a href="#SolrGlossary-S">S</a> <a href="#SolrGlossary-T">T</a> U V <a href="#SolrGlossary-W">W</a> X Y <a href="#SolrGlossary-Z">Z</a></p>
 </div>
-<div class="sect5">
-<h6 id="SolrGlossary-Commit">Commit</h6>
-<div class="paragraph">
-<p>To make document changes permanent in the index. In the case of added documents, they would be searchable after a <em>commit</em>.</p>
+<div class="sect2">
+<h3 id="SolrGlossary-A">A</h3>
+<div class="dlist">
+<dl>
+<dt class="hdlist1"><a id="atomicupdates"></a><a href="updating-parts-of-documents.html#UpdatingPartsofDocuments-AtomicUpdates">Atomic updates</a></dt>
+<dd>
+<p>An approach to updating only one or more fields of a document, instead of reindexing the entire document.</p>
+</dd>
+</dl>
 </div>
 </div>
-<div class="sect5">
-<h6 id="SolrGlossary-Core">Core</h6>
-<div class="paragraph">
-<p>An individual Solr instance (represents a logical index). Multiple cores can run on a single node. See also <a href="#SolrGlossary-SolrCloud">SolrCloud</a>.</p>
+<div class="sect2">
+<h3 id="SolrGlossary-B">B</h3>
+<div class="dlist">
+<dl>
+<dt class="hdlist1"><a id="booleanoperators"></a>Boolean operators</dt>
+<dd>
+<p>These control the inclusion or exclusion of keywords in a query by using operators such as AND, OR, and NOT.</p>
+</dd>
+</dl>
 </div>
 </div>
-<div class="sect5">
-<h6 id="SolrGlossary-Corereload">Core reload</h6>
-<div class="paragraph">
+<div class="sect2">
+<h3 id="SolrGlossary-C">C</h3>
+<div class="dlist">
+<dl>
+<dt class="hdlist1"><a id="cluster"></a>Cluster</dt>
+<dd>
+<p>In Solr, a cluster is a set of Solr nodes operating in coordination with each other via <a href="#zookeeper">ZooKeeper</a>, and managed as a unit. A cluster may contain many collections. See also <a href="#solrclouddef">SolrCloud</a>.</p>
+</dd>
+<dt class="hdlist1"><a id="collection"></a>Collection</dt>
+<dd>
+<p>In Solr, one or more <a href="#document">Documents</a> grouped together in a single logical index using a single configuration and Schema.</p>
+<div class="paragraph">
+<p>In <a href="#solrclouddef">SolrCloud</a> a collection may be divided up into multiple logical shards, which may in turn be distributed across many nodes, or in a Single node Solr installation, a collection may be a single <a href="#core">Core</a>.</p>
+</div>
+</dd>
+<dt class="hdlist1"><a id="commit"></a>Commit</dt>
+<dd>
+<p>To make document changes permanent in the index. In the case of added documents, they would be searchable after a <em>commit</em>.</p>
+</dd>
+<dt class="hdlist1"><a id="core"></a>Core</dt>
+<dd>
+<p>An individual Solr instance (represents a logical index). Multiple cores can run on a single node. See also <a href="#solrclouddef">SolrCloud</a>.</p>
+</dd>
+<dt class="hdlist1"><a id="corereload"></a>Core reload</dt>
+<dd>
 <p>To re-initialize a Solr core after changes to <code>schema.xml</code>, <code>solrconfig.xml</code> or other configuration files.</p>
+</dd>
+</dl>
 </div>
 </div>
-</div>
-</div>
-<div class="sect1">
-<h2 id="SolrGlossary-D">D</h2>
-<div class="sectionbody">
-<div class="sect5">
-<h6 id="SolrGlossary-Distributedsearch">Distributed search</h6>
-<div class="paragraph">
-<p>Distributed search is one where queries are processed across more than one <a href="#SolrGlossary-Shard">shard</a>.</p>
-</div>
-</div>
-<div class="sect5">
-<h6 id="SolrGlossary-Document">Document</h6>
-<div class="paragraph">
-<p>A group of <a href="#SolrGlossary-Field">fields</a> and their values. Documents are the basic unit of data in a <a href="#SolrGlossary-Collection">collection</a>. Documents are assigned to <a href="#SolrGlossary-Shard">shards</a> using standard hashing, or by specifically assigning a shard within the document ID. Documents are versioned after each write operation.</p>
-</div>
-</div>
-</div>
-</div>
-<div class="sect1">
-<h2 id="SolrGlossary-E">E</h2>
-<div class="sectionbody">
-<div class="sect5">
-<h6 id="SolrGlossary-Ensemble">Ensemble</h6>
-<div class="paragraph">
-<p>A <a href="#SolrGlossary-ZooKeeper">ZooKeeper</a> term to indicate multiple ZooKeeper instances running simultaneously and in coordination with each other for fault tolerance.</p>
-</div>
-</div>
-</div>
-</div>
-<div class="sect1">
-<h2 id="SolrGlossary-F">F</h2>
-<div class="sectionbody">
-<div class="sect5">
-<h6 id="SolrGlossary-Facet">Facet</h6>
-<div class="paragraph">
+<div class="sect2">
+<h3 id="SolrGlossary-D">D</h3>
+<div class="dlist">
+<dl>
+<dt class="hdlist1"><a id="distributedsearch"></a>Distributed search</dt>
+<dd>
+<p>Distributed search is one where queries are processed across more than one <a href="#shard">Shard</a>.</p>
+</dd>
+<dt class="hdlist1"><a id="document"></a>Document</dt>
+<dd>
+<p>A group of <a href="#field">fields</a> and their values. Documents are the basic unit of data in a <a href="#collection">collection</a>. Documents are assigned to <a href="#shard">shards</a> using standard hashing, or by specifically assigning a shard within the document ID. Documents are versioned after each write operation.</p>
+</dd>
+</dl>
+</div>
+</div>
+<div class="sect2">
+<h3 id="SolrGlossary-E">E</h3>
+<div class="dlist">
+<dl>
+<dt class="hdlist1"><a id="ensemble"></a>Ensemble</dt>
+<dd>
+<p>A <a href="#zookeeper">ZooKeeper</a> term to indicate multiple ZooKeeper instances running simultaneously and in coordination with each other for fault tolerance.</p>
+</dd>
+</dl>
+</div>
+</div>
+<div class="sect2">
+<h3 id="SolrGlossary-F">F</h3>
+<div class="dlist">
+<dl>
+<dt class="hdlist1"><a id="facet"></a>Facet</dt>
+<dd>
 <p>The arrangement of search results into categories based on indexed terms.</p>
-</div>
-</div>
-<div class="sect5">
-<h6 id="SolrGlossary-Field">Field</h6>
-<div class="paragraph">
+</dd>
+<dt class="hdlist1"><a id="field"></a>Field</dt>
+<dd>
 <p>The content to be indexed/searched along with metadata defining how the content should be processed by Solr.</p>
+</dd>
+</dl>
 </div>
 </div>
-</div>
-</div>
-<div class="sect1">
-<h2 id="SolrGlossary-I">I</h2>
-<div class="sectionbody">
-<div class="sect5">
-<h6 id="SolrGlossary-Inversedocumentfrequency_IDF_">Inverse document frequency (IDF)</h6>
-<div class="paragraph">
-<p>A measure of the general importance of a term. It is calculated as the number of total Documents divided by the number of Documents that a particular word occurs in the collection. See <a href="http://en.wikipedia.org/wiki/Tf-idf" class="bare">http://en.wikipedia.org/wiki/Tf-idf</a> and <a href="https://lucene.apache.org/core/7_0_0//core/org/apache/lucene/search/similarities/TFIDFSimilarity.html">the Lucene TFIDFSimilarity javadocs</a> for more info on TF-IDF based scoring and Lucene scoring in particular. See also <a href="#SolrGlossary-Termfrequency">#Term frequency</a>.</p>
-</div>
-</div>
-<div class="sect5">
-<h6 id="SolrGlossary-Invertedindex">Inverted index</h6>
-<div class="paragraph">
+<div class="sect2">
+<h3 id="SolrGlossary-I">I</h3>
+<div class="dlist">
+<dl>
+<dt class="hdlist1"><a id="idf"></a>Inverse document frequency (IDF)</dt>
+<dd>
+<p>A measure of the general importance of a term. It is calculated as the number of total Documents divided by the number of Documents that a particular word occurs in the collection. See <a href="http://en.wikipedia.org/wiki/Tf-idf" class="bare">http://en.wikipedia.org/wiki/Tf-idf</a> and <a href="https://lucene.apache.org/core/7_0_0//core/org/apache/lucene/search/similarities/TFIDFSimilarity.html">the Lucene TFIDFSimilarity javadocs</a> for more info on TF-IDF based scoring and Lucene scoring in particular. See also <a href="#termfrequency">Term frequency</a>.</p>
+</dd>
+<dt class="hdlist1"><a id="invertedindex"></a>Inverted index</dt>
+<dd>
 <p>A way of creating a searchable index that lists every word and the documents that contain those words, similar to an index in the back of a book which lists words and the pages on which they can be found. When performing keyword searches, this method is considered more efficient than the alternative, which would be to create a list of documents paired with every word used in each document. Since users search using terms they expect to be in documents, finding the term before the document saves processing resources and time.</p>
+</dd>
+</dl>
 </div>
 </div>
-</div>
-</div>
-<div class="sect1">
-<h2 id="SolrGlossary-L">L</h2>
-<div class="sectionbody">
-<div class="sect5">
-<h6 id="SolrGlossary-Leader">Leader</h6>
-<div class="paragraph">
-<p>A single <a href="#SolrGlossary-Replica">Replica</a> for each <a href="#SolrGlossary-Shard">Shard</a> that takes charge of coordinating index updates (document additions or deletions) to other replicas in the same shard. This is a transient responsibility assigned to a node via an election, if the current Shard Leader goes down, a new node will automatically be elected to take its place. See also <a href="#SolrGlossary-SolrCloud">SolrCloud</a>.</p>
-</div>
-</div>
-</div>
-</div>
-<div class="sect1">
-<h2 id="SolrGlossary-M">M</h2>
-<div class="sectionbody">
-<div class="sect5">
-<h6 id="SolrGlossary-Metadata">Metadata</h6>
-<div class="paragraph">
+<div class="sect2">
+<h3 id="SolrGlossary-L">L</h3>
+<div class="dlist">
+<dl>
+<dt class="hdlist1"><a id="leader"></a>Leader</dt>
+<dd>
+<p>A single <a href="#replica">Replica</a> for each <a href="#shard">Shard</a> that takes charge of coordinating index updates (document additions or deletions) to other replicas in the same shard. This is a transient responsibility assigned to a node via an election, if the current Shard Leader goes down, a new node will automatically be elected to take its place. See also <a href="#solrclouddef">SolrCloud</a>.</p>
+</dd>
+</dl>
+</div>
+</div>
+<div class="sect2">
+<h3 id="SolrGlossary-M">M</h3>
+<div class="dlist">
+<dl>
+<dt class="hdlist1"><a id="metadata"></a>Metadata</dt>
+<dd>
 <p>Literally, <em>data about data</em>. Metadata is information about a document, such as its title, author, or location.</p>
+</dd>
+</dl>
 </div>
 </div>
-</div>
-</div>
-<div class="sect1">
-<h2 id="SolrGlossary-N">N</h2>
-<div class="sectionbody">
-<div class="sect5">
-<h6 id="SolrGlossary-Naturallanguagequery">Natural language query</h6>
-<div class="paragraph">
+<div class="sect2">
+<h3 id="SolrGlossary-N">N</h3>
+<div class="dlist">
+<dl>
+<dt class="hdlist1"><a id="naturallanguagequery"></a>Natural language query</dt>
+<dd>
 <p>A search that is entered as a user would normally speak or write, as in, "What is aspirin?"</p>
-</div>
-</div>
-<div class="sect5">
-<h6 id="SolrGlossary-Node">Node</h6>
-<div class="paragraph">
+</dd>
+<dt class="hdlist1"><a id="node"></a>Node</dt>
+<dd>
 <p>A JVM instance running Solr. Also known as a Solr server.</p>
+</dd>
+</dl>
 </div>
 </div>
-</div>
-</div>
-<div class="sect1">
-<h2 id="SolrGlossary-O">O</h2>
-<div class="sectionbody">
-<div class="sect5">
-<h6 id="SolrGlossary-Optimisticconcurrency"><a href="updating-parts-of-documents.html#UpdatingPartsofDocuments-OptimisticConcurrency">Optimistic concurrency</a></h6>
-<div class="paragraph">
+<div class="sect2">
+<h3 id="SolrGlossary-O">O</h3>
+<div class="dlist">
+<dl>
+<dt class="hdlist1"><a id="optimisticconcurrency"></a><a href="updating-parts-of-documents.html#UpdatingPartsofDocuments-OptimisticConcurrency">Optimistic concurrency</a></dt>
+<dd>
 <p>Also known as "optimistic locking", this is an approach that allows for updates to documents currently in the index while retaining locking or version control.</p>
+</dd>
+<dt class="hdlist1"><a id="overseer"></a>Overseer</dt>
+<dd>
+<p>A single node in <a href="#solrclouddef">SolrCloud</a> that is responsible for processing and coordinating actions involving the entire cluster. It keeps track of the state of existing nodes, collections, shards, and replicas, and assigns new replicas to nodes. This is a transient responsibility assigned to a node via an election, if the current Overseer goes down, a new node will be automatically elected to take its place. See also <a href="#solrclouddef">SolrCloud</a>.</p>
+</dd>
+</dl>
 </div>
 </div>
-<div class="sect5">
-<h6 id="SolrGlossary-Overseer">Overseer</h6>
-<div class="paragraph">
-<p>A single node in <a href="#SolrGlossary-SolrCloud">SolrCloud</a> that is responsible for processing and coordinating actions involving the entire cluster. It keeps track of the state of existing nodes, collections, shards, and replicas, and assigns new replicas to nodes. This is a transient responsibility assigned to a node via an election, if the current Overseer goes down, a new node will be automatically elected to take its place. See also <a href="#SolrGlossary-SolrCloud">SolrCloud</a>.</p>
-</div>
-</div>
-</div>
-</div>
-<div class="sect1">
-<h2 id="SolrGlossary-Q">Q</h2>
-<div class="sectionbody">
-<div class="sect5">
-<h6 id="SolrGlossary-Queryparser">Query parser</h6>
-<div class="paragraph">
+<div class="sect2">
+<h3 id="SolrGlossary-Q">Q</h3>
+<div class="dlist">
+<dl>
+<dt class="hdlist1"><a id="query-parser"></a>Query parser</dt>
+<dd>
 <p>A query parser processes the terms entered by a user.</p>
+</dd>
+</dl>
 </div>
 </div>
-</div>
-</div>
-<div class="sect1">
-<h2 id="SolrGlossary-R">R</h2>
-<div class="sectionbody">
-<div class="sect5">
-<h6 id="SolrGlossary-Recall">Recall</h6>
-<div class="paragraph">
+<div class="sect2">
+<h3 id="SolrGlossary-R">R</h3>
+<div class="dlist">
+<dl>
+<dt class="hdlist1"><a id="recall"></a>Recall</dt>
+<dd>
 <p>The ability of a search engine to retrieve <em>all</em> of the possible matches to a user&#8217;s query.</p>
-</div>
-</div>
-<div class="sect5">
-<h6 id="SolrGlossary-Relevance">Relevance</h6>
-<div class="paragraph">
+</dd>
+<dt class="hdlist1"><a id="relevancedef"></a>Relevance</dt>
+<dd>
 <p>The appropriateness of a document to the search conducted by the user.</p>
-</div>
-</div>
-<div class="sect5">
-<h6 id="SolrGlossary-Replica">Replica</h6>
-<div class="paragraph">
-<p>A <a href="#SolrGlossary-Core">Core</a> that acts as a physical copy of a <a href="#SolrGlossary-Shard">Shard</a> in a <a href="#SolrGlossary-SolrCloud">SolrCloud</a> <a href="#SolrGlossary-Collection">Collection</a>.</p>
-</div>
-</div>
-<div class="sect5">
-<h6 id="SolrGlossary-Replication"><a href="index-replication.html#index-replication">Replication</a></h6>
-<div class="paragraph">
+</dd>
+<dt class="hdlist1"><a id="replica"></a>Replica</dt>
+<dd>
+<p>A <a href="#core">Core</a> that acts as a physical copy of a <a href="#shard">Shard</a> in a <a href="#solrclouddef">SolrCloud</a> <a href="#collection">Collection</a>.</p>
+</dd>
+<dt class="hdlist1"><a id="replication"></a><a href="index-replication.html#index-replication">Replication</a></dt>
+<dd>
 <p>A method of copying a master index from one server to one or more "slave" or "child" servers.</p>
-</div>
-</div>
-<div class="sect5">
-<h6 id="SolrGlossary-RequestHandler"><a href="requesthandlers-and-searchcomponents-in-solrconfig.html#requesthandlers-and-searchcomponents-in-solrconfig">RequestHandler</a></h6>
-<div class="paragraph">
+</dd>
+<dt class="hdlist1"><a id="requesthandler"></a><a href="requesthandlers-and-searchcomponents-in-solrconfig.html#requesthandlers-and-searchcomponents-in-solrconfig">RequestHandler</a></dt>
+<dd>
 <p>Logic and configuration parameters that tell Solr how to handle incoming "requests", whether the requests are to return search results, to index documents, or to handle other custom situations.</p>
+</dd>
+</dl>
 </div>
 </div>
-</div>
-</div>
-<div class="sect1">
-<h2 id="SolrGlossary-S">S</h2>
-<div class="sectionbody">
-<div class="sect5">
-<h6 id="SolrGlossary-SearchComponent"><a href="requesthandlers-and-searchcomponents-in-solrconfig.html#requesthandlers-and-searchcomponents-in-solrconfig">SearchComponent</a></h6>
-<div class="paragraph">
+<div class="sect2">
+<h3 id="SolrGlossary-S">S</h3>
+<div class="dlist">
+<dl>
+<dt class="hdlist1"><a id="searchcomponent"></a><a href="requesthandlers-and-searchcomponents-in-solrconfig.html#requesthandlers-and-searchcomponents-in-solrconfig">SearchComponent</a></dt>
+<dd>
 <p>Logic and configuration parameters used by request handlers to process query requests. Examples of search components include faceting, highlighting, and "more like this" functionality.</p>
-</div>
-</div>
-<div class="sect5">
-<h6 id="SolrGlossary-Shard">Shard</h6>
-<div class="paragraph">
-<p>In SolrCloud, a logical partition of a single <a href="#SolrGlossary-Collection">Collection</a>. Every shard consists of at least one physical <a href="#SolrGlossary-Replica">Replica</a>, but there may be multiple Replicas distributed across multiple <a href="#SolrGlossary-Nodes">Nodes</a> for fault tolerance. See also <a href="#SolrGlossary-SolrCloud">SolrCloud</a>.</p>
-</div>
-</div>
-<div class="sect5">
-<h6 id="SolrGlossary-SolrCloudSolrCloud_32604293.html"><a href="solrcloud.html#solrcloud">SolrCloud</a></h6>
-<div class="paragraph">
-<p>Umbrella term for a suite of functionality in Solr which allows managing a <a href="#SolrGlossary-Cluster">Cluster</a> of Solr <a href="#SolrGlossary-Nodes">Nodes</a> for scalability, fault tolerance, and high availability.</p>
-</div>
-</div>
-<div class="sect5">
-<h6 id="SolrGlossary-SolrSchema_managed-schemaorschema.xml_"><a href="documents-fields-and-schema-design.html#documents-fields-and-schema-design">Solr Schema (managed-schema or schema.xml)</a></h6>
-<div class="paragraph">
+</dd>
+<dt class="hdlist1"><a id="shard"></a>Shard</dt>
+<dd>
+<p>In SolrCloud, a logical partition of a single <a href="#collection">Collection</a>. Every shard consists of at least one physical <a href="#replica">Replica</a>, but there may be multiple Replicas distributed across multiple <a href="#node">Nodes</a> for fault tolerance. See also <a href="#solrclouddef">SolrCloud</a>.</p>
+</dd>
+<dt class="hdlist1"><a id="solrclouddef"></a><a href="solrcloud.html#solrcloud">SolrCloud</a></dt>
+<dd>
+<p>Umbrella term for a suite of functionality in Solr which allows managing a <a href="#cluster">Cluster</a> of Solr <a href="#node">Nodes</a> for scalability, fault tolerance, and high availability.</p>
+</dd>
+<dt class="hdlist1"><a id="schema"></a><a href="documents-fields-and-schema-design.html#documents-fields-and-schema-design">Solr Schema (managed-schema or schema.xml)</a></dt>
+<dd>
 <p>The Solr index Schema defines the fields to be indexed and the type for the field (text, integers, etc.) By default schema data can be "managed" at run time using the <a href="schema-api.html#schema-api">Schema API</a> and is typically kept in a file named <code>managed-schema</code> which Solr modifies as needed, but a collection may be configured to use a static Schema, which is only loaded on startup from a human edited configuration file - typically named <code>schema.xml</code>. See <a href="schema-factory-definition-in-solrconfig.html#schema-factory-definition-in-solrconfig">Schema Factory Definition in SolrConfig</a> for details.</p>
-</div>
-</div>
-<div class="sect5">
-<h6 id="SolrGlossary-SolrConfig_solrconfig.xml_"><a href="the-well-configured-solr-instance.html#the-well-configured-solr-instance">SolrConfig (solrconfig.xml)</a></h6>
-<div class="paragraph">
+</dd>
+<dt class="hdlist1"><a id="solrconfig"></a><a href="the-well-configured-solr-instance.html#the-well-configured-solr-instance">SolrConfig (solrconfig.xml)</a></dt>
+<dd>
 <p>The Apache Solr configuration file. Defines indexing options, RequestHandlers, highlighting, spellchecking and various other configurations. The file, solrconfig.xml is located in the Solr home conf directory.</p>
-</div>
-</div>
-<div class="sect5">
-<h6 id="SolrGlossary-SpellCheck"><a href="spell-checking.html#spell-checking">Spell Check</a></h6>
-<div class="paragraph">
+</dd>
+<dt class="hdlist1"><a id="spellcheck"></a><a href="spell-checking.html#spell-checking">Spell Check</a></dt>
+<dd>
 <p>The ability to suggest alternative spellings of search terms to a user, as a check against spelling errors causing few or zero results.</p>
-</div>
-</div>
-<div class="sect5">
-<h6 id="SolrGlossary-Stopwords">Stopwords</h6>
-<div class="paragraph">
-<p>Generally, words that have little meaning to a user&#8217;s search but which may have been entered as part of a <a href="#SolrGlossary-Naturallanguagequery">natural language</a> query. Stopwords are generally very small pronouns, conjunctions and prepositions (such as, "the", "with", or "and")</p>
-</div>
-</div>
-<div class="sect5">
-<h6 id="SolrGlossary-SuggesterSuggester_32604262.html"><a href="suggester.html#suggester">Suggester</a></h6>
-<div class="paragraph">
+</dd>
+<dt class="hdlist1"><a id="stopwords"></a>Stopwords</dt>
+<dd>
+<p>Generally, words that have little meaning to a user&#8217;s search but which may have been entered as part of a <a href="#naturallanguagequery">natural language</a> query. Stopwords are generally very small pronouns, conjunctions and prepositions (such as, "the", "with", or "and")</p>
+</dd>
+<dt class="hdlist1"><a id="suggesterdef"></a><a href="suggester.html#suggester">Suggester</a></dt>
+<dd>
 <p>Functionality in Solr that provides the ability to suggest possible query terms to users as they type.</p>
-</div>
-</div>
-<div class="sect5">
-<h6 id="SolrGlossary-Synonyms">Synonyms</h6>
-<div class="paragraph">
+</dd>
+<dt class="hdlist1"><a id="synonyms"></a>Synonyms</dt>
+<dd>
 <p>Synonyms generally are terms which are near to each other in meaning and may substitute for one another. In a search engine implementation, synonyms may be abbreviations as well as words, or terms that are not consistently hyphenated. Examples of synonyms in this context would be "Inc." and "Incorporated" or "iPod" and "i-pod".</p>
+</dd>
+</dl>
 </div>
 </div>
-</div>
-</div>
-<div class="sect1">
-<h2 id="SolrGlossary-T">T</h2>
-<div class="sectionbody">
-<div class="sect5">
-<h6 id="SolrGlossary-Termfrequency">Term frequency</h6>
-<div class="paragraph">
-<p>The number of times a word occurs in a given document. See <a href="http://en.wikipedia.org/wiki/Tf-idf" class="bare">http://en.wikipedia.org/wiki/Tf-idf</a> and <a href="https://lucene.apache.org/core/7_0_0//core/org/apache/lucene/search/similarities/TFIDFSimilarity.html">the Lucene TFIDFSimilarity javadocs</a> for more info on TF-IDF based scoring and Lucene scoring in particular. See also <a href="#SolrGlossary-Inversedocumentfrequency_IDF_">#Inverse document frequency (IDF)</a>.</p>
-</div>
-</div>
-<div class="sect5">
-<h6 id="SolrGlossary-Transactionlog">Transaction log</h6>
-<div class="paragraph">
-<p>An append-only log of write operations maintained by each <a href="#SolrGlossary-Replica">Replica</a>. This log is required with SolrCloud implementations and is created and managed automatically by Solr.</p>
-</div>
-</div>
-</div>
-</div>
-<div class="sect1">
-<h2 id="SolrGlossary-W">W</h2>
-<div class="sectionbody">
-<div class="sect5">
-<h6 id="SolrGlossary-Wildcard">Wildcard</h6>
-<div class="paragraph">
+<div class="sect2">
+<h3 id="SolrGlossary-T">T</h3>
+<div class="dlist">
+<dl>
+<dt class="hdlist1"><a id="termfrequency"></a>Term frequency</dt>
+<dd>
+<p>The number of times a word occurs in a given document. See <a href="http://en.wikipedia.org/wiki/Tf-idf" class="bare">http://en.wikipedia.org/wiki/Tf-idf</a> and <a href="https://lucene.apache.org/core/7_0_0//core/org/apache/lucene/search/similarities/TFIDFSimilarity.html">the Lucene TFIDFSimilarity javadocs</a> for more info on TF-IDF based scoring and Lucene scoring in particular. See also <a href="#idf">Inverse document frequency (IDF)</a>.</p>
+</dd>
+<dt class="hdlist1"><a id="transactionlog"></a>Transaction log</dt>
+<dd>
+<p>An append-only log of write operations maintained by each <a href="#replica">Replica</a>. This log is required with SolrCloud implementations and is created and managed automatically by Solr.</p>
+</dd>
+</dl>
+</div>
+</div>
+<div class="sect2">
+<h3 id="SolrGlossary-W">W</h3>
+<div class="dlist">
+<dl>
+<dt class="hdlist1"><a id="wildcard"></a>Wildcard</dt>
+<dd>
 <p>A wildcard allows a substitution of one or more letters of a word to account for possible variations in spelling or tenses.</p>
+</dd>
+</dl>
 </div>
 </div>
-</div>
-</div>
-<div class="sect1">
-<h2 id="SolrGlossary-Z">Z</h2>
-<div class="sectionbody">
-<div class="sect5">
-<h6 id="SolrGlossary-ZooKeeper">ZooKeeper</h6>
-<div class="paragraph">
-<p>Also known as <a href="http://zookeeper.apache.org/">Apache ZooKeeper</a>. The system used by SolrCloud to keep track of configuration files and node names for a cluster. A ZooKeeper cluster is used as the central configuration store for the cluster, a coordinator for operations requiring distributed synchronization, and the system of record for cluster topology. See also <a href="#SolrGlossary-SolrCloud">SolrCloud</a>.</p>
+<div class="sect2">
+<h3 id="SolrGlossary-Z">Z</h3>
+<div class="dlist">
+<dl>
+<dt class="hdlist1"><a id="zookeeper"></a>ZooKeeper</dt>
+<dd>
+<p>Also known as <a href="http://zookeeper.apache.org/">Apache ZooKeeper</a>. The system used by SolrCloud to keep track of configuration files and node names for a cluster. A ZooKeeper cluster is used as the central configuration store for the cluster, a coordinator for operations requiring distributed synchronization, and the system of record for cluster topology. See also <a href="#solrclouddef">SolrCloud</a>.</p>
+</dd>
+</dl>
 </div>
 </div>
 </div>
@@ -1646,7 +1589,7 @@ $('#toc').on('click', 'a', function() {
             <div class="row">
                 <div class="col-lg-12 footer">
                &copy;2017 Apache Software Foundation. All rights reserved. <br />
- Site last generated: 2017-05-03 <br />
+ Site last generated: 2017-05-09 <br />
 <p><img src="solr-sunOnly-small.png" alt="Apache Solr"/></p>
                 </div>
             </div>

Modified: websites/production/lucene/content/solr/guide/test-10290/solr-jdbc-apache-zeppelin.html
==============================================================================
--- websites/production/lucene/content/solr/guide/test-10290/solr-jdbc-apache-zeppelin.html (original)
+++ websites/production/lucene/content/solr/guide/test-10290/solr-jdbc-apache-zeppelin.html Tue May  9 19:22:29 2017
@@ -1279,6 +1279,9 @@ $('#toc').on('click', 'a', function() {
 <div id="main-content">
   <div id="preamble">
 <div class="sectionbody">
+<div class="paragraph">
+<p>The Solr JDBC driver can support Apache Zeppelin.</p>
+</div>
 <div class="admonitionblock important">
 <table>
 <tr>
@@ -1286,15 +1289,13 @@ $('#toc').on('click', 'a', function() {
 <i class="fa icon-important" title="Important"></i>
 </td>
 <td class="content">
-<div class="paragraph">
-<p>This requires Apache Zeppelin 0.6.0 or greater which contains the JDBC interpreter.</p>
-</div>
+This requires Apache Zeppelin 0.6.0 or greater which contains the JDBC interpreter.
 </td>
 </tr>
 </table>
 </div>
 <div class="paragraph">
-<p>For <a href="http://zeppelin.apache.org">Apache Zeppelin</a>, you will need to create a JDBC interpreter for Solr. This will add SolrJ to the interpreter classpath. Once the interpreter has been created, you can create a notebook to issue queries. The <a href="http://zeppelin.apache.org/docs/latest/interpreter/jdbc.html">Apache Zeppelin JDBC interpreter documentation</a> provides additional information about JDBC prefixes and other features.</p>
+<p>To use <a href="http://zeppelin.apache.org">Apache Zeppelin</a> with Solr, you will need to create a JDBC interpreter for Solr. This will add SolrJ to the interpreter classpath. Once the interpreter has been created, you can create a notebook to issue queries. The <a href="http://zeppelin.apache.org/docs/latest/interpreter/jdbc.html">Apache Zeppelin JDBC interpreter documentation</a> provides additional information about JDBC prefixes and other features.</p>
 </div>
 </div>
 </div>
@@ -1305,16 +1306,19 @@ $('#toc').on('click', 'a', function() {
 <div class="content">
 <img src="images/solr-jdbc-apache-zeppelin/zeppelin_solrjdbc_1.png" alt="image" height="400">
 </div>
+<div class="title">Figure 1. Click "Interpreter" in the top navigation</div>
 </div>
 <div class="imageblock">
 <div class="content">
 <img src="images/solr-jdbc-apache-zeppelin/zeppelin_solrjdbc_2.png" alt="image" height="400">
 </div>
+<div class="title">Figure 2. Click "Create"</div>
 </div>
 <div class="imageblock">
 <div class="content">
 <img src="images/solr-jdbc-apache-zeppelin/zeppelin_solrjdbc_3.png" alt="image" height="400">
 </div>
+<div class="title">Figure 3. Enter information about your Solr installation</div>
 </div>
 <div class="admonitionblock note">
 <table>
@@ -1339,11 +1343,13 @@ $('#toc').on('click', 'a', function() {
 <div class="content">
 <img src="images/solr-jdbc-apache-zeppelin/zeppelin_solrjdbc_4.png" alt="image" width="517" height="400">
 </div>
+<div class="title">Figure 4. Click Notebook &#8594; Create new note</div>
 </div>
 <div class="imageblock">
 <div class="content">
 <img src="images/solr-jdbc-apache-zeppelin/zeppelin_solrjdbc_5.png" alt="image" width="839" height="400">
 </div>
+<div class="title">Figure 5. Provide a name and click "Create Note"</div>
 </div>
 </div>
 </div>
@@ -1368,14 +1374,15 @@ $('#toc').on('click', 'a', function() {
 <div class="content">
 <img src="images/solr-jdbc-apache-zeppelin/zeppelin_solrjdbc_6.png" alt="image" width="481" height="400">
 </div>
+<div class="title">Figure 6. Results of Solr query</div>
 </div>
 <div class="paragraph">
 <p>The below code block assumes that the Apache Solr driver is setup as the default JDBC interpreter driver. If that is not the case, instructions for using a different prefix is available <a href="https://zeppelin.apache.org/docs/latest/interpreter/jdbc.html#how-to-use">here</a>.</p>
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="pygments highlight"><code data-lang="java"><span style="color: #666666">%</span>jdbc
-select fielda<span style="color: #666666">,</span> fieldb<span style="color: #666666">,</span> from test limit <span style="color: #666666">10</span></code></pre>
+<pre class="pygments highlight"><code data-lang="sql"><span style="color: #666666">%</span>jdbc
+<span style="color: #008000; font-weight: bold">select</span> fielda, fieldb, <span style="color: #008000; font-weight: bold">from</span> test <span style="color: #008000; font-weight: bold">limit</span> <span style="color: #666666">10</span></code></pre>
 </div>
 </div>
 </div>
@@ -1416,7 +1423,7 @@ select fielda<span style="color: #666666
             <div class="row">
                 <div class="col-lg-12 footer">
                &copy;2017 Apache Software Foundation. All rights reserved. <br />
- Site last generated: 2017-05-03 <br />
+ Site last generated: 2017-05-09 <br />
 <p><img src="solr-sunOnly-small.png" alt="Apache Solr"/></p>
                 </div>
             </div>

Modified: websites/production/lucene/content/solr/guide/test-10290/solr-jdbc-dbvisualizer.html
==============================================================================
--- websites/production/lucene/content/solr/guide/test-10290/solr-jdbc-dbvisualizer.html (original)
+++ websites/production/lucene/content/solr/guide/test-10290/solr-jdbc-dbvisualizer.html Tue May  9 19:22:29 2017
@@ -1280,6 +1280,9 @@ $('#toc').on('click', 'a', function() {
   <div id="preamble">
 <div class="sectionbody">
 <div class="paragraph">
+<p>Solr&#8217;s JDBC driver supports DBVisualizer for querying Solr.</p>
+</div>
+<div class="paragraph">
 <p>For <a href="https://www.dbvis.com/">DbVisualizer</a>, you will need to create a new driver for Solr using the DbVisualizer Driver Manager. This will add several SolrJ client .jars to the DbVisualizer classpath. The files required are:</p>
 </div>
 <div class="ulist">
@@ -1499,7 +1502,7 @@ $('#toc').on('click', 'a', function() {
             <div class="row">
                 <div class="col-lg-12 footer">
                &copy;2017 Apache Software Foundation. All rights reserved. <br />
- Site last generated: 2017-05-03 <br />
+ Site last generated: 2017-05-09 <br />
 <p><img src="solr-sunOnly-small.png" alt="Apache Solr"/></p>
                 </div>
             </div>

Modified: websites/production/lucene/content/solr/guide/test-10290/solr-jdbc-python-jython.html
==============================================================================
--- websites/production/lucene/content/solr/guide/test-10290/solr-jdbc-python-jython.html (original)
+++ websites/production/lucene/content/solr/guide/test-10290/solr-jdbc-python-jython.html Tue May  9 19:22:29 2017
@@ -1277,21 +1277,25 @@ $('#toc').on('click', 'a', function() {
     
 
 <div id="main-content">
-  <div class="sect1">
-<h2 id="SolrJDBC-Python_Jython-Python">Python</h2>
+  <div id="preamble">
 <div class="sectionbody">
 <div class="paragraph">
-<p>Python supports accessing JDBC using the <a href="https://pypi.python.org/pypi/JayDeBeApi/">JayDeBeApi</a> library. The CLASSPATH variable must be configured to contain the solr-solrj jar and the supporting solrj-lib jars.</p>
+<p>Solr&#8217;s JDBC driver supports Python and Jython.</p>
 </div>
-<div class="sect2">
-<h3 id="SolrJDBC-Python_Jython-JayDeBeApi">JayDeBeApi</h3>
+</div>
+</div>
+<div class="sect1">
+<h2 id="python">Python</h2>
+<div class="sectionbody">
 <div class="paragraph">
-<p><strong>run.sh</strong></p>
+<p>Python supports accessing JDBC using the <a href="https://pypi.python.org/pypi/JayDeBeApi/">JayDeBeApi</a> library. The CLASSPATH variable must be configured to contain the solr-solrj jar and the supporting solrj-lib jars.</p>
 </div>
+<div class="sect2">
+<h3 id="jaydebeapi">JayDeBeApi</h3>
 <div class="listingblock">
+<div class="title">run.sh</div>
 <div class="content">
 <pre class="pygments highlight"><code data-lang="bash"><span style="color: #408080; font-style: italic">#!/usr/bin/env bash</span>
-
 <span style="color: #408080; font-style: italic"># Java 8 must already be installed</span>
 
 pip install JayDeBeApi
@@ -1301,12 +1305,10 @@ pip install JayDeBeApi
 python solr_jaydebeapi.py</code></pre>
 </div>
 </div>
-<div class="paragraph">
-<p><strong>solr_jaydebeapi.py</strong></p>
-</div>
 <div class="listingblock">
+<div class="title">solr_jaydebeapi.py</div>
 <div class="content">
-<pre class="pygments highlight"><code data-lang="py"><span style="color: #408080; font-style: italic">#!/usr/bin/env python</span>
+<pre class="pygments highlight"><code data-lang="python"><span style="color: #408080; font-style: italic">#!/usr/bin/env python</span>
 
 <span style="color: #408080; font-style: italic"># https://pypi.python.org/pypi/JayDeBeApi/</span>
 
@@ -1331,18 +1333,15 @@ python solr_jaydebeapi.py</code></pre>
 </div>
 </div>
 <div class="sect1">
-<h2 id="SolrJDBC-Python_Jython-Jython">Jython</h2>
+<h2 id="jython">Jython</h2>
 <div class="sectionbody">
 <div class="paragraph">
 <p>Jython supports accessing JDBC natively with Java interfaces or with the zxJDBC library. The CLASSPATH variable must be configured to contain the solr-solrj jar and the supporting solrj-lib jars.</p>
 </div>
-<div class="paragraph">
-<p><strong>run.sh</strong></p>
-</div>
 <div class="listingblock">
+<div class="title">run.sh</div>
 <div class="content">
 <pre class="pygments highlight"><code data-lang="bash"><span style="color: #408080; font-style: italic">#!/usr/bin/env bash</span>
-
 <span style="color: #408080; font-style: italic"># Java 8 and Jython must already be installed</span>
 
 <span style="color: #008000">export</span> <span style="color: #19177C">CLASSPATH</span><span style="color: #666666">=</span><span style="color: #BA2121">&quot;</span><span style="color: #008000; font-weight: bold">$(</span><span style="color: #008000">echo</span> <span style="color: #008000; font-weight: bold">$(</span>ls /opt/solr/dist/solr-solrj* /opt/solr/dist/solrj-lib/*<span style="color: #008000; font-weight: bold">)</span> | tr <span style="color: #BA2121">&#39; &#39;</span> <span style="color: #BA2121">&#39;:&#39;</span><span style="color: #008000; font-weight: bold">)</span><span style="color: #BA2121">&quot;</span>
@@ -1351,13 +1350,11 @@ jython <span style="color: #666666">[</s
 </div>
 </div>
 <div class="sect2">
-<h3 id="SolrJDBC-Python_Jython-JavaNative">Java Native</h3>
-<div class="paragraph">
-<p><strong>solr_java_native.py</strong></p>
-</div>
+<h3 id="java-native">Java Native</h3>
 <div class="listingblock">
+<div class="title">solr_java_native.py</div>
 <div class="content">
-<pre class="pygments highlight"><code data-lang="py"><span style="color: #408080; font-style: italic">#!/usr/bin/env jython</span>
+<pre class="pygments highlight"><code data-lang="python"><span style="color: #408080; font-style: italic">#!/usr/bin/env jython</span>
 
 <span style="color: #408080; font-style: italic"># http://www.jython.org/jythonbook/en/1.0/DatabasesAndJython.html</span>
 <span style="color: #408080; font-style: italic"># https://wiki.python.org/jython/DatabaseExamples#SQLite_using_JDBC</span>
@@ -1388,13 +1385,11 @@ jython <span style="color: #666666">[</s
 </div>
 </div>
 <div class="sect2">
-<h3 id="SolrJDBC-Python_Jython-zxJDBC">zxJDBC</h3>
-<div class="paragraph">
-<p><strong>solr_zxjdbc.py</strong></p>
-</div>
+<h3 id="zxjdbc">zxJDBC</h3>
 <div class="listingblock">
+<div class="title">solr_zxjdbc.py</div>
 <div class="content">
-<pre class="pygments highlight"><code data-lang="py"><span style="color: #408080; font-style: italic">#!/usr/bin/env jython</span>
+<pre class="pygments highlight"><code data-lang="python"><span style="color: #408080; font-style: italic">#!/usr/bin/env jython</span>
 
 <span style="color: #408080; font-style: italic"># http://www.jython.org/jythonbook/en/1.0/DatabasesAndJython.html</span>
 <span style="color: #408080; font-style: italic"># https://wiki.python.org/jython/DatabaseExamples#SQLite_using_ziclix</span>
@@ -1456,7 +1451,7 @@ jython <span style="color: #666666">[</s
             <div class="row">
                 <div class="col-lg-12 footer">
                &copy;2017 Apache Software Foundation. All rights reserved. <br />
- Site last generated: 2017-05-03 <br />
+ Site last generated: 2017-05-09 <br />
 <p><img src="solr-sunOnly-small.png" alt="Apache Solr"/></p>
                 </div>
             </div>

Modified: websites/production/lucene/content/solr/guide/test-10290/solr-jdbc-r.html
==============================================================================
--- websites/production/lucene/content/solr/guide/test-10290/solr-jdbc-r.html (original)
+++ websites/production/lucene/content/solr/guide/test-10290/solr-jdbc-r.html Tue May  9 19:22:29 2017
@@ -1284,12 +1284,11 @@ $('#toc').on('click', 'a', function() {
 </div>
 </div>
 </div>
-<div class="sect2">
-<h3 id="SolrJDBC-R-RJDBC">RJDBC</h3>
-<div class="paragraph">
-<p><strong>run.sh</strong></p>
-</div>
+<div class="sect1">
+<h2 id="rjdbc">RJDBC</h2>
+<div class="sectionbody">
 <div class="listingblock">
+<div class="title">run.sh</div>
 <div class="content">
 <pre class="pygments highlight"><code data-lang="bash"><span style="color: #408080; font-style: italic">#!/usr/bin/env bash</span>
 
@@ -1299,25 +1298,24 @@ Rscript -e <span style="color: #BA2121">
 Rscript solr_rjdbc.R</code></pre>
 </div>
 </div>
-<div class="paragraph">
-<p><strong>solr_rjdbc.R</strong></p>
-</div>
 <div class="listingblock">
+<div class="title">solr_rjdbc.R</div>
 <div class="content">
-<pre class="pygments highlight"><code data-lang="java"><span style="border: 1px solid #FF0000">#</span> https<span style="color: #666666">:</span><span style="color: #408080; font-style: italic">//www.rforge.net/RJDBC/</span>
+<pre class="pygments highlight"><code data-lang="r"><span style="color: #408080; font-style: italic"># https://www.rforge.net/RJDBC/</span>
 
-library<span style="color: #666666">(</span><span style="color: #BA2121">&quot;RJDBC&quot;</span><span style="color: #666666">)</span>
+<span style="color: #008000; font-weight: bold">library</span>(<span style="color: #BA2121">&quot;RJDBC&quot;</span>)
 
-solrCP <span style="color: #666666">&lt;-</span> c<span style="color: #666666">(</span>list<span style="color: #666666">.</span><span style="color: #7D9029">files</span><span style="color: #666666">(</span><span style="border: 1px solid #FF0000">&#39;</span><span style="color: #666666">/</span>opt<span style="color: #666666">/</span>solr<span style="color: #666666">/</span>dist<span style="color: #666666">/</span>solrj<span style="color: #666666">-</span>lib<span style="border: 1px solid #FF0000">&#39;</span><span style="color: #666666">,</span> full<span style="color: #666666">.</span><span style="color: #7D9029">names</span><span style="color: #666666">=</span>TRUE<span style="color: #666666">),</span> list<span style="color: #666666">.</span><span style="color: #7D9029">files</span><span style="color: #666666">(</span><span style="border: 1px solid #FF0000">&#39;</span><span style="color: #666666">/</span>opt<span style="color: #666666">/</span>solr<span style="color: #666666">/<
 /span>dist<span style="border: 1px solid #FF0000">&#39;</span><span style="color: #666666">,</span> pattern<span style="color: #666666">=</span><span style="border: 1px solid #FF0000">&#39;</span>solrj<span style="border: 1px solid #FF0000">&#39;</span><span style="color: #666666">,</span> full<span style="color: #666666">.</span><span style="color: #7D9029">names</span><span style="color: #666666">=</span>TRUE<span style="color: #666666">,</span> recursive <span style="color: #666666">=</span> TRUE<span style="color: #666666">))</span>
+solrCP <span style="color: #666666">&lt;-</span> <span style="color: #B00040">c</span>(<span style="color: #008000">list.files</span>(<span style="color: #BA2121">&#39;/opt/solr/dist/solrj-lib&#39;</span>, full.names<span style="color: #666666">=</span><span style="color: #008000; font-weight: bold">TRUE</span>), <span style="color: #008000">list.files</span>(<span style="color: #BA2121">&#39;/opt/solr/dist&#39;</span>, pattern<span style="color: #666666">=</span><span style="color: #BA2121">&#39;solrj&#39;</span>, full.names<span style="color: #666666">=</span><span style="color: #008000; font-weight: bold">TRUE</span>, recursive <span style="color: #666666">=</span> <span style="color: #008000; font-weight: bold">TRUE</span>))
 
-drv <span style="color: #666666">&lt;-</span> JDBC<span style="color: #666666">(</span><span style="color: #BA2121">&quot;org.apache.solr.client.solrj.io.sql.DriverImpl&quot;</span><span style="color: #666666">,</span>
-           solrCP<span style="color: #666666">,</span>
-           identifier<span style="color: #666666">.</span><span style="color: #7D9029">quote</span><span style="color: #666666">=</span><span style="color: #BA2121">&quot;`&quot;</span><span style="color: #666666">)</span>
-conn <span style="color: #666666">&lt;-</span> dbConnect<span style="color: #666666">(</span>drv<span style="color: #666666">,</span> <span style="color: #BA2121">&quot;jdbc:solr://localhost:9983?collection=test&quot;</span><span style="color: #666666">,</span> <span style="color: #BA2121">&quot;user&quot;</span><span style="color: #666666">,</span> <span style="color: #BA2121">&quot;pwd&quot;</span><span style="color: #666666">)</span>
+drv <span style="color: #666666">&lt;-</span> JDBC(<span style="color: #BA2121">&quot;org.apache.solr.client.solrj.io.sql.DriverImpl&quot;</span>,
+           solrCP,
+           identifier.quote<span style="color: #666666">=</span><span style="color: #BA2121">&quot;`&quot;</span>)
+conn <span style="color: #666666">&lt;-</span> dbConnect(drv, <span style="color: #BA2121">&quot;jdbc:solr://localhost:9983?collection=test&quot;</span>, <span style="color: #BA2121">&quot;user&quot;</span>, <span style="color: #BA2121">&quot;pwd&quot;</span>)
 
-dbGetQuery<span style="color: #666666">(</span>conn<span style="color: #666666">,</span> <span style="color: #BA2121">&quot;select fielda, fieldb, fieldc, fieldd_s, fielde_i from test limit 10&quot;</span><span style="color: #666666">)</span>
+dbGetQuery(conn, <span style="color: #BA2121">&quot;select fielda, fieldb, fieldc, fieldd_s, fielde_i from test limit 10&quot;</span>)
 
-dbDisconnect<span style="color: #666666">(</span>conn<span style="color: #666666">)</span></code></pre>
+dbDisconnect(conn)</code></pre>
+</div>
 </div>
 </div>
 </div>
@@ -1357,7 +1355,7 @@ dbDisconnect<span style="color: #666666"
             <div class="row">
                 <div class="col-lg-12 footer">
                &copy;2017 Apache Software Foundation. All rights reserved. <br />
- Site last generated: 2017-05-03 <br />
+ Site last generated: 2017-05-09 <br />
 <p><img src="solr-sunOnly-small.png" alt="Apache Solr"/></p>
                 </div>
             </div>

Modified: websites/production/lucene/content/solr/guide/test-10290/solr-jdbc-squirrel-sql.html
==============================================================================
--- websites/production/lucene/content/solr/guide/test-10290/solr-jdbc-squirrel-sql.html (original)
+++ websites/production/lucene/content/solr/guide/test-10290/solr-jdbc-squirrel-sql.html Tue May  9 19:22:29 2017
@@ -1298,10 +1298,10 @@ $('#toc').on('click', 'a', function() {
 </div>
 </div>
 <div class="sect1">
-<h2 id="SolrJDBC-SQuirreLSQL-AddSolrJDBCDriver">Add Solr JDBC Driver</h2>
+<h2 id="add-solr-jdbc-driver">Add Solr JDBC Driver</h2>
 <div class="sectionbody">
 <div class="sect2">
-<h3 id="SolrJDBC-SQuirreLSQL-OpenDrivers">Open Drivers</h3>
+<h3 id="open-drivers">Open Drivers</h3>
 <div class="imageblock">
 <div class="content">
 <img src="images/solr-jdbc-squirrel-sql/squirrelsql_solrjdbc_1.png" alt="image" width="900" height="400">
@@ -1309,7 +1309,7 @@ $('#toc').on('click', 'a', function() {
 </div>
 </div>
 <div class="sect2">
-<h3 id="SolrJDBC-SQuirreLSQL-AddDriver">Add Driver</h3>
+<h3 id="add-driver">Add Driver</h3>
 <div class="imageblock">
 <div class="content">
 <img src="images/solr-jdbc-squirrel-sql/squirrelsql_solrjdbc_2.png" alt="image" width="892" height="400">
@@ -1317,7 +1317,7 @@ $('#toc').on('click', 'a', function() {
 </div>
 </div>
 <div class="sect2">
-<h3 id="SolrJDBC-SQuirreLSQL-NametheDriver">Name the Driver</h3>
+<h3 id="name-the-driver">Name the Driver</h3>
 <div class="paragraph">
 <p>Provide a name for the driver, and provide the URL format: <code>jdbc:solr://&lt;zk_connection_string&gt;/?collection=&lt;collection&gt;</code>. Do not fill in values for the variables &#8220;<code>zk_connection_string</code>&#8221; and &#8220;<code>collection</code>&#8221;, those will be defined later when the connection to Solr is configured.</p>
 </div>
@@ -1328,7 +1328,7 @@ $('#toc').on('click', 'a', function() {
 </div>
 </div>
 <div class="sect2">
-<h3 id="SolrJDBC-SQuirreLSQL-AddSolrJDBCjarstoClasspath">Add Solr JDBC jars to Classpath</h3>
+<h3 id="add-solr-jdbc-jars-to-classpath">Add Solr JDBC jars to Classpath</h3>
 <div class="imageblock">
 <div class="content">
 <img src="images/solr-jdbc-squirrel-sql/squirrelsql_solrjdbc_4.png" alt="image" width="467" height="400">
@@ -1351,7 +1351,7 @@ $('#toc').on('click', 'a', function() {
 </div>
 </div>
 <div class="sect2">
-<h3 id="SolrJDBC-SQuirreLSQL-AddtheSolrJDBCdriverclassname">Add the Solr JDBC driver class name</h3>
+<h3 id="add-the-solr-jdbc-driver-class-name">Add the Solr JDBC driver class name</h3>
 <div class="paragraph">
 <p>After adding the .jars, you will need to additionally define the Class Name <code>org.apache.solr.client.solrj.io.sql.DriverImpl</code>.</p>
 </div>
@@ -1364,13 +1364,13 @@ $('#toc').on('click', 'a', function() {
 </div>
 </div>
 <div class="sect1">
-<h2 id="SolrJDBC-SQuirreLSQL-CreateanAlias">Create an Alias</h2>
+<h2 id="create-an-alias">Create an Alias</h2>
 <div class="sectionbody">
 <div class="paragraph">
 <p>To define a JDBC connection, you must define an alias.</p>
 </div>
 <div class="sect2">
-<h3 id="SolrJDBC-SQuirreLSQL-OpenAliases">Open Aliases</h3>
+<h3 id="open-aliases">Open Aliases</h3>
 <div class="imageblock">
 <div class="content">
 <img src="images/solr-jdbc-squirrel-sql/squirrelsql_solrjdbc_10.png" alt="image" width="840" height="400">
@@ -1378,7 +1378,7 @@ $('#toc').on('click', 'a', function() {
 </div>
 </div>
 <div class="sect2">
-<h3 id="SolrJDBC-SQuirreLSQL-AddanAlias">Add an Alias</h3>
+<h3 id="add-an-alias">Add an Alias</h3>
 <div class="imageblock">
 <div class="content">
 <img src="images/solr-jdbc-squirrel-sql/squirrelsql_solrjdbc_12.png" alt="image" width="959" height="400">
@@ -1386,7 +1386,7 @@ $('#toc').on('click', 'a', function() {
 </div>
 </div>
 <div class="sect2">
-<h3 id="SolrJDBC-SQuirreLSQL-ConfiguretheAlias">Configure the Alias</h3>
+<h3 id="configure-the-alias">Configure the Alias</h3>
 <div class="imageblock">
 <div class="content">
 <img src="images/solr-jdbc-squirrel-sql/squirrelsql_solrjdbc_14.png" alt="image" width="470" height="400">
@@ -1394,7 +1394,7 @@ $('#toc').on('click', 'a', function() {
 </div>
 </div>
 <div class="sect2">
-<h3 id="SolrJDBC-SQuirreLSQL-ConnecttotheAlias">Connect to the Alias</h3>
+<h3 id="connect-to-the-alias">Connect to the Alias</h3>
 <div class="imageblock">
 <div class="content">
 <img src="images/solr-jdbc-squirrel-sql/squirrelsql_solrjdbc_13.png" alt="image" width="522" height="400">
@@ -1404,7 +1404,7 @@ $('#toc').on('click', 'a', function() {
 </div>
 </div>
 <div class="sect1">
-<h2 id="SolrJDBC-SQuirreLSQL-Querying">Querying</h2>
+<h2 id="querying">Querying</h2>
 <div class="sectionbody">
 <div class="paragraph">
 <p>Once you&#8217;ve successfully connected to Solr, you can use the SQL interface to enter queries and work with data.</p>
@@ -1452,7 +1452,7 @@ $('#toc').on('click', 'a', function() {
             <div class="row">
                 <div class="col-lg-12 footer">
                &copy;2017 Apache Software Foundation. All rights reserved. <br />
- Site last generated: 2017-05-03 <br />
+ Site last generated: 2017-05-09 <br />
 <p><img src="solr-sunOnly-small.png" alt="Apache Solr"/></p>
                 </div>
             </div>

Modified: websites/production/lucene/content/solr/guide/test-10290/solr-plugins.html
==============================================================================
--- websites/production/lucene/content/solr/guide/test-10290/solr-plugins.html (original)
+++ websites/production/lucene/content/solr/guide/test-10290/solr-plugins.html Tue May  9 19:22:29 2017
@@ -1322,7 +1322,7 @@ $('#toc').on('click', 'a', function() {
             <div class="row">
                 <div class="col-lg-12 footer">
                &copy;2017 Apache Software Foundation. All rights reserved. <br />
- Site last generated: 2017-05-03 <br />
+ Site last generated: 2017-05-09 <br />
 <p><img src="solr-sunOnly-small.png" alt="Apache Solr"/></p>
                 </div>
             </div>

Modified: websites/production/lucene/content/solr/guide/test-10290/solrcloud-configuration-and-parameters.html
==============================================================================
--- websites/production/lucene/content/solr/guide/test-10290/solrcloud-configuration-and-parameters.html (original)
+++ websites/production/lucene/content/solr/guide/test-10290/solrcloud-configuration-and-parameters.html Tue May  9 19:22:29 2017
@@ -1347,7 +1347,7 @@ $('#toc').on('click', 'a', function() {
             <div class="row">
                 <div class="col-lg-12 footer">
                &copy;2017 Apache Software Foundation. All rights reserved. <br />
- Site last generated: 2017-05-03 <br />
+ Site last generated: 2017-05-09 <br />
 <p><img src="solr-sunOnly-small.png" alt="Apache Solr"/></p>
                 </div>
             </div>

Modified: websites/production/lucene/content/solr/guide/test-10290/solrcloud-with-legacy-configuration-files.html
==============================================================================
--- websites/production/lucene/content/solr/guide/test-10290/solrcloud-with-legacy-configuration-files.html (original)
+++ websites/production/lucene/content/solr/guide/test-10290/solrcloud-with-legacy-configuration-files.html Tue May  9 19:22:29 2017
@@ -1278,22 +1278,26 @@ $('#toc').on('click', 'a', function() {
 
 <div id="main-content">
   <div class="paragraph">
-<p>All of the required configuration is already set up in the sample configurations shipped with Solr. You only need to add the following if you are migrating old configuration files. Do not remove these files and parameters from a new Solr instance if you intend to use Solr in SolrCloud mode.</p>
+<p>If you are migrating from a non-SolrCloud environment to SolrCloud, this information may be helpful.</p>
 </div>
 <div class="paragraph">
-<p>These properties exist in 3 files: <code>schema.xml</code>, <code>solrconfig.xml</code>, and <code>solr.xml</code>.</p>
+<p>All of the required configuration is already set up in the sample configurations shipped with Solr. You only need to add the following if you are migrating old configuration files. Do not remove these files and parameters from a new Solr instance if you intend to use Solr in SolrCloud mode.</p>
 </div>
 <div class="paragraph">
-<p>\1. In <code>schema.xml</code>, you must have a <code><em>version</em></code> field defined:</p>
+<p>These properties exist in 3 files: <code>schema.xml</code>, <code>solrconfig.xml</code>, and <code>solr.xml</code>.</p>
 </div>
+<div class="olist arabic">
+<ol class="arabic">
+<li>
+<p>In <code>schema.xml</code>, you must have a <code>_version_</code> field defined:</p>
 <div class="listingblock">
 <div class="content">
 <pre class="pygments highlight"><code data-lang="xml"><span style="color: #008000; font-weight: bold">&lt;field</span> <span style="color: #7D9029">name=</span><span style="color: #BA2121">&quot;_version_&quot;</span> <span style="color: #7D9029">type=</span><span style="color: #BA2121">&quot;long&quot;</span> <span style="color: #7D9029">indexed=</span><span style="color: #BA2121">&quot;true&quot;</span> <span style="color: #7D9029">stored=</span><span style="color: #BA2121">&quot;true&quot;</span> <span style="color: #7D9029">multiValued=</span><span style="color: #BA2121">&quot;false&quot;</span><span style="color: #008000; font-weight: bold">/&gt;</span></code></pre>
 </div>
 </div>
-<div class="paragraph">
-<p>\2. In <code>solrconfig.xml</code>, you must have an <code>UpdateLog</code> defined. This should be defined in the <code>updateHandler</code> section.</p>
-</div>
+</li>
+<li>
+<p>In <code>solrconfig.xml</code>, you must have an <code>UpdateLog</code> defined. This should be defined in the <code>updateHandler</code> section.</p>
 <div class="listingblock">
 <div class="content">
 <pre class="pygments highlight"><code data-lang="xml"><span style="color: #008000; font-weight: bold">&lt;updateHandler&gt;</span>
@@ -1305,9 +1309,9 @@ $('#toc').on('click', 'a', function() {
 <span style="color: #008000; font-weight: bold">&lt;/updateHandler&gt;</span></code></pre>
 </div>
 </div>
-<div class="paragraph">
-<p>\3. The <a href="http://wiki.apache.org/solr/UpdateRequestProcessor#Distributed_Updates">DistributedUpdateProcessor</a> is part of the default update chain and is automatically injected into any of your custom update chains, so you don&#8217;t actually need to make any changes for this capability. However, should you wish to add it explicitly, you can still add it to the <code>solrconfig.xml</code> file as part of an <code>updateRequestProcessorChain</code>. For example:</p>
-</div>
+</li>
+<li>
+<p>The <a href="http://wiki.apache.org/solr/UpdateRequestProcessor#Distributed_Updates">DistributedUpdateProcessor</a> is part of the default update chain and is automatically injected into any of your custom update chains, so you don&#8217;t actually need to make any changes for this capability. However, should you wish to add it explicitly, you can still add it to the <code>solrconfig.xml</code> file as part of an <code>updateRequestProcessorChain</code>. For example:</p>
 <div class="listingblock">
 <div class="content">
 <pre class="pygments highlight"><code data-lang="xml"><span style="color: #008000; font-weight: bold">&lt;updateRequestProcessorChain</span> <span style="color: #7D9029">name=</span><span style="color: #BA2121">&quot;sample&quot;</span><span style="color: #008000; font-weight: bold">&gt;</span>
@@ -1334,6 +1338,9 @@ $('#toc').on('click', 'a', function() {
 <div class="paragraph">
 <p>In the update process, Solr skips updating processors that have already been run on other nodes.</p>
 </div>
+</li>
+</ol>
+</div>
 </div>
 
 <!-- Adds tags, if any -->
@@ -1370,7 +1377,7 @@ $('#toc').on('click', 'a', function() {
             <div class="row">
                 <div class="col-lg-12 footer">
                &copy;2017 Apache Software Foundation. All rights reserved. <br />
- Site last generated: 2017-05-03 <br />
+ Site last generated: 2017-05-09 <br />
 <p><img src="solr-sunOnly-small.png" alt="Apache Solr"/></p>
                 </div>
             </div>

Modified: websites/production/lucene/content/solr/guide/test-10290/solrcloud.html
==============================================================================
--- websites/production/lucene/content/solr/guide/test-10290/solrcloud.html (original)
+++ websites/production/lucene/content/solr/guide/test-10290/solrcloud.html Tue May  9 19:22:29 2017
@@ -1395,7 +1395,7 @@ $('#toc').on('click', 'a', function() {
             <div class="row">
                 <div class="col-lg-12 footer">
                &copy;2017 Apache Software Foundation. All rights reserved. <br />
- Site last generated: 2017-05-03 <br />
+ Site last generated: 2017-05-09 <br />
 <p><img src="solr-sunOnly-small.png" alt="Apache Solr"/></p>
                 </div>
             </div>

Modified: websites/production/lucene/content/solr/guide/test-10290/spatial-search.html
==============================================================================
--- websites/production/lucene/content/solr/guide/test-10290/spatial-search.html (original)
+++ websites/production/lucene/content/solr/guide/test-10290/spatial-search.html Tue May  9 19:22:29 2017
@@ -1280,7 +1280,10 @@ $('#toc').on('click', 'a', function() {
   <div id="preamble">
 <div class="sectionbody">
 <div class="paragraph">
-<p>Solr supports location data for use in spatial/geospatial searches. Using spatial search, you can:</p>
+<p>Solr supports location data for use in spatial/geospatial searches.</p>
+</div>
+<div class="paragraph">
+<p>Using spatial search, you can:</p>
 </div>
 <div class="ulist">
 <ul>
@@ -1307,7 +1310,7 @@ $('#toc').on('click', 'a', function() {
 <p><code>LatLonPointSpatialField</code></p>
 </li>
 <li>
-<p><code>LatLonType</code> (now deprecated) and its non-geodetic twin PointType</p>
+<p><code>LatLonType</code> (now deprecated) and its non-geodetic twin <code>PointType</code></p>
 </li>
 <li>
 <p><code>SpatialRecursivePrefixTreeFieldType</code> (RPT for short), including <code>RptWithGeometrySpatialField</code>, a derivative</p>
@@ -1318,13 +1321,13 @@ $('#toc').on('click', 'a', function() {
 </ul>
 </div>
 <div class="paragraph">
-<p>LatLonPointSpatialField is the ideal field type for the most common use-cases for lat-lon point data. It replaces LatLonType which still exists for backwards compatibility. RPT offers some more features for more advanced/custom use cases / options like polygons and heatmaps.</p>
+<p><code>LatLonPointSpatialField</code> is the ideal field type for the most common use-cases for lat-lon point data. It replaces LatLonType which still exists for backwards compatibility. RPT offers some more features for more advanced/custom use cases and options like polygons and heatmaps.</p>
 </div>
 <div class="paragraph">
-<p>RptWithGeometrySpatialField is for indexing and searching non-point data though it can do points too. It can&#8217;t do sorting/boosting.</p>
+<p><code>RptWithGeometrySpatialField</code> is for indexing and searching non-point data though it can do points too. It can&#8217;t do sorting/boosting.</p>
 </div>
 <div class="paragraph">
-<p>BBoxField is for indexing bounding boxes, querying by a box, specifying a search predicate (Intersects,Within,Contains,Disjoint,Equals), and a relevancy sort/boost like overlapRatio or simply the area.</p>
+<p><code>BBoxField</code> is for indexing bounding boxes, querying by a box, specifying a search predicate (Intersects,Within,Contains,Disjoint,Equals), and a relevancy sort/boost like overlapRatio or simply the area.</p>
 </div>
 <div class="paragraph">
 <p>Some esoteric details that are not in this guide can be found at <a href="http://wiki.apache.org/solr/SpatialSearch" class="bare">http://wiki.apache.org/solr/SpatialSearch</a>.</p>
@@ -1335,10 +1338,12 @@ $('#toc').on('click', 'a', function() {
 <h2 id="SpatialSearch-LatLonPointSpatialField">LatLonPointSpatialField</h2>
 <div class="sectionbody">
 <div class="paragraph">
-<p>Here&#8217;s how LatLonPointSpatialField should usually be configured in the schema:</p>
+<p>Here&#8217;s how <code>LatLonPointSpatialField</code> (LLPSF) should usually be configured in the schema:</p>
+</div>
+<div class="listingblock">
+<div class="content">
+<pre class="pygments highlight"><code data-lang="xml"><span style="color: #008000; font-weight: bold">&lt;fieldType</span> <span style="color: #7D9029">name=</span><span style="color: #BA2121">&quot;location&quot;</span> <span style="color: #7D9029">class=</span><span style="color: #BA2121">&quot;solr.LatLonPointSpatialField&quot;</span> <span style="color: #7D9029">docValues=</span><span style="color: #BA2121">&quot;true&quot;</span><span style="color: #008000; font-weight: bold">/&gt;</span></code></pre>
 </div>
-<div class="paragraph">
-<p><code>&lt;fieldType name="location" class="solr.LatLonPointSpatialField" docValues="true"/&gt;</code></p>
 </div>
 <div class="paragraph">
 <p>LLPSF supports toggling <code>indexed</code>, <code>stored</code>, <code>docValues</code>, and <code>multiValued</code>. LLPSF internally uses a 2-dimensional Lucene "Points" (BDK tree) index when "indexed" is enabled (the default). When "docValues" is enabled, a latitude and longitudes pair are bit-interleaved into 64 bits and put into Lucene DocValues. The accuracy of the docValues data is about a centimeter.</p>
@@ -1352,7 +1357,7 @@ $('#toc').on('click', 'a', function() {
 <p>For indexing geodetic points (latitude and longitude), supply it in "lat,lon" order (comma separated).</p>
 </div>
 <div class="paragraph">
-<p>For indexing non-geodetic points, it depends. Use "x y" (a space) if RPT. For PointType however, use "x,y" (a comma).</p>
+<p>For indexing non-geodetic points, it depends. Use <code>x y</code> (a space) if RPT. For PointType however, use <code>x,y</code> (a comma).</p>
 </div>
 <div class="paragraph">
 <p>If you&#8217;d rather use a standard industry format, Solr supports WKT and GeoJSON. However it&#8217;s much bulkier than the raw coordinates for such simple data. (Not supported by the deprecated LatLonType or PointType)</p>
@@ -1367,8 +1372,8 @@ $('#toc').on('click', 'a', function() {
 </div>
 <table class="tableblock frame-all grid-all spread">
 <colgroup>
-<col style="width: 50%;">
-<col style="width: 50%;">
+<col style="width: 30%;">
+<col style="width: 70%;">
 </colgroup>
 <thead>
 <tr>
@@ -1467,7 +1472,16 @@ $('#toc').on('click', 'a', function() {
 <div class="sect2">
 <h3 id="SpatialSearch-bbox"><code>bbox</code></h3>
 <div class="paragraph">
-<p>The <code>bbox</code> filter is very similar to <code>geofilt</code> except it uses the <em>bounding box</em> of the calculated circle. See the blue box in the diagram below. It takes the same parameters as geofilt. Here&#8217;s a sample query: <code>&amp;q=<strong>:</strong>&amp;fq={!bbox sfield=store}&amp;pt=45.15,-93.85&amp;d=5</code>. The rectangular shape is faster to compute and so it&#8217;s sometimes used as an alternative to geofilt when it&#8217;s acceptable to return points outside of the radius. However, if the ideal goal is a circle but you want it to run faster, then instead consider using the RPT field and try a large "distErrPct" value like <code>0.1</code> (10% radius). This will return results outside the radius but it will do so somewhat uniformly around the shape.</p>
+<p>The <code>bbox</code> filter is very similar to <code>geofilt</code> except it uses the <em>bounding box</em> of the calculated circle. See the blue box in the diagram below. It takes the same parameters as geofilt.</p>
+</div>
+<div class="paragraph">
+<p>Here&#8217;s a sample query:</p>
+</div>
+<div class="paragraph">
+<p><code>&amp;q=<strong>:</strong>&amp;fq={!bbox sfield=store}&amp;pt=45.15,-93.85&amp;d=5</code></p>
+</div>
+<div class="paragraph">
+<p>The rectangular shape is faster to compute and so it&#8217;s sometimes used as an alternative to <code>geofilt</code> when it&#8217;s acceptable to return points outside of the radius. However, if the ideal goal is a circle but you want it to run faster, then instead consider using the RPT field and try a large <code>distErrPct</code> value like <code>0.1</code> (10% radius). This will return results outside the radius but it will do so somewhat uniformly around the shape.</p>
 </div>
 <div class="imageblock">
 <div class="content">
@@ -1490,15 +1504,27 @@ $('#toc').on('click', 'a', function() {
 </div>
 </div>
 <div class="sect2">
-<h3 id="SpatialSearch-Filteringbyanarbitraryrectangle">Filtering by an arbitrary rectangle</h3>
+<h3 id="SpatialSearch-Filteringbyanarbitraryrectangle">Filtering by an Arbitrary Rectangle</h3>
+<div class="paragraph">
+<p>Sometimes the spatial search requirement calls for finding everything in a rectangular area, such as the area covered by a map the user is looking at. For this case, geofilt and bbox won&#8217;t cut it. This is somewhat of a trick, but you can use Solr&#8217;s range query syntax for this by supplying the lower-left corner as the start of the range and the upper-right corner as the end of the range.</p>
+</div>
+<div class="paragraph">
+<p>Here&#8217;s an example:</p>
+</div>
 <div class="paragraph">
-<p>Sometimes the spatial search requirement calls for finding everything in a rectangular area, such as the area covered by a map the user is looking at. For this case, geofilt and bbox won&#8217;t cut it. This is somewhat of a trick, but you can use Solr&#8217;s range query syntax for this by supplying the lower-left corner as the start of the range and the upper-right corner as the end of the range. Here&#8217;s an example: <code>&amp;q=<strong>:</strong>&amp;fq=store:[45,-94 TO 46,-93]</code>. LatLonType (deprecated) does <strong>not</strong> support rectangles that cross the dateline. For RPT and BBoxField, if you are non-geospatial coordinates (<code>geo="false"</code>) then you must quote the points due to the space, e.g. <code>"x y"</code>.</p>
+<p><code>&amp;q=<strong>:</strong>&amp;fq=store:[45,-94 TO 46,-93]</code></p>
+</div>
+<div class="paragraph">
+<p>LatLonType (deprecated) does <strong>not</strong> support rectangles that cross the dateline. For RPT and BBoxField, if you are non-geospatial coordinates (<code>geo="false"</code>) then you must quote the points due to the space, e.g. <code>"x y"</code>.</p>
 </div>
 </div>
 <div class="sect2">
 <h3 id="SpatialSearch-Optimizing_CacheorNot">Optimizing: Cache or Not</h3>
 <div class="paragraph">
-<p>It&#8217;s most common to put a spatial query into an "fq" parameter – a filter query. By default, Solr will cache the query in the filter cache. If you know the filter query (be it spatial or not) is fairly unique and not likely to get a cache hit then specify <code>cache="false"</code> as a local-param as seen in the following example. The only spatial types which stand to benefit from this technique are LatLonPointSpatialField and LatLonType (deprecated). Enable docValues on the field (if it isn&#8217;t already). LatLonType (deprecated) additionally requires a <code>cost="100"</code> (or more) local-param.</p>
+<p>It&#8217;s most common to put a spatial query into an "fq" parameter – a filter query. By default, Solr will cache the query in the filter cache.</p>
+</div>
+<div class="paragraph">
+<p>If you know the filter query (be it spatial or not) is fairly unique and not likely to get a cache hit then specify <code>cache="false"</code> as a local-param as seen in the following example. The only spatial types which stand to benefit from this technique are LatLonPointSpatialField and LatLonType (deprecated). Enable docValues on the field (if it isn&#8217;t already). LatLonType (deprecated) additionally requires a <code>cost="100"</code> (or more) local-param.</p>
 </div>
 <div class="paragraph">
 <p><code>&amp;q=&#8230;&#8203;mykeywords&#8230;&#8203;&amp;fq=&#8230;&#8203;someotherfilters&#8230;&#8203;&amp;fq={!geofilt cache=false}&amp;sfield=store&amp;pt=45.15,-93.85&amp;d=5</code></p>
@@ -1513,7 +1539,26 @@ $('#toc').on('click', 'a', function() {
 <h2 id="SpatialSearch-DistanceSortingorBoosting_FunctionQueries_">Distance Sorting or Boosting (Function Queries)</h2>
 <div class="sectionbody">
 <div class="paragraph">
-<p>There are four distance function queries: <code>geodist</code>, see below, usually the most appropriate; <a href="http://wiki.apache.org/solr/FunctionQuery#dist"><code>dist</code></a>, to calculate the p-norm distance between multi-dimensional vectors; <a href="http://wiki.apache.org/solr/FunctionQuery#hsin.2C_ghhsin_-" class="bare">http://wiki.apache.org/solr/FunctionQuery#hsin.2C_ghhsin_-</a><em>Haversine_Formula[<code>hsin</code>], to calculate the distance between two points on a sphere; and <a href="https://wiki.apache.org/solr/FunctionQuery#sqedist" class="bare">https://wiki.apache.org/solr/FunctionQuery#sqedist</a></em>-_Squared_Euclidean_Distance[<code>sqedist</code>], to calculate the squared Euclidean distance between two points. For more information about these function queries, see the section on <a href="function-queries.html#function-queries">Function Queries</a>.</p>
+<p>There are four distance function queries:</p>
+</div>
+<div class="ulist">
+<ul>
+<li>
+<p><code>geodist</code>, see below, usually the most appropriate;</p>
+</li>
+<li>
+<p><a href="http://wiki.apache.org/solr/FunctionQuery#dist"><code>dist</code></a>, to calculate the p-norm distance between multi-dimensional vectors;</p>
+</li>
+<li>
+<p><a href="http://wiki.apache.org/solr/FunctionQuery#hsin.2C_ghhsin_-_Haversine_Formula"><code>hsin</code></a>, to calculate the distance between two points on a sphere;</p>
+</li>
+<li>
+<p><a href="https://wiki.apache.org/solr/FunctionQuery#sqedist_-_Squared_Euclidean_Distance"><code>sqedist</code></a>, to calculate the squared Euclidean distance between two points.</p>
+</li>
+</ul>
+</div>
+<div class="paragraph">
+<p>For more information about these function queries, see the section on <a href="function-queries.html#function-queries">Function Queries</a>.</p>
 </div>
 <div class="sect2">
 <h3 id="SpatialSearch-geodist"><code>geodist</code></h3>
@@ -1590,7 +1635,7 @@ $('#toc').on('click', 'a', function() {
 </ul>
 </div>
 <div class="paragraph">
-<p>RPT <em>shares</em> various features in common with LatLonPointSpatialField. Some are listed here:</p>
+<p>RPT <em>shares</em> various features in common with <code>LatLonPointSpatialField</code>. Some are listed here:</p>
 </div>
 <div class="ulist">
 <ul>
@@ -1598,10 +1643,10 @@ $('#toc').on('click', 'a', function() {
 <p>Latitude/Longitude indexed point data; possibly multi-valued</p>
 </li>
 <li>
-<p>Fast filtering with geofilt, bbox filters, and range query syntax (dateline crossing is supported)</p>
+<p>Fast filtering with <code>geofilt</code>, <code>bbox</code> filters, and range query syntax (dateline crossing is supported)</p>
 </li>
 <li>
-<p>Sort/boost via geodist</p>
+<p>Sort/boost via <code>geodist</code></p>
 </li>
 <li>
 <p>Well-Known-Text (WKT) shape syntax (required for specifying polygons &amp; other complex shapes), and GeoJSON too. In addition to indexing and searching, this works with the <code>wt=geojson</code> (GeoJSON Solr response-writer) and <code>[geo f=myfield]</code> (geo Solr document-transformer).</p>
@@ -1609,14 +1654,14 @@ $('#toc').on('click', 'a', function() {
 </ul>
 </div>
 <div class="sect2">
-<h3 id="SpatialSearch-Schemaconfiguration">Schema configuration</h3>
+<h3 id="SpatialSearch-Schemaconfiguration">Schema Configuration</h3>
 <div class="paragraph">
 <p>To use RPT, the field type must be registered and configured in <code>schema.xml</code>. There are many options for this field type.</p>
 </div>
 <table class="tableblock frame-all grid-all spread">
 <colgroup>
-<col style="width: 50%;">
-<col style="width: 50%;">
+<col style="width: 30%;">
+<col style="width: 70%;">
 </colgroup>
 <thead>
 <tr>
@@ -1684,13 +1729,19 @@ $('#toc').on('click', 'a', function() {
 </tbody>
 </table>
 <div class="paragraph">
-<p><strong><em>And there are others:</em></strong> <code>normWrapLongitude</code> <em>,</em> <code>datelineRule</code>, <code>validationRule</code>, <code>autoIndex</code>, <code>allowMultiOverlap</code>, <code>precisionModel</code>. For further info, see notes below about spatialContextFactory implementations referenced above, especially the link to the JTS based one.</p>
+<p><strong><em>And there are others:</em></strong> <code>normWrapLongitude</code> <em>,</em> <code>datelineRule</code>, <code>validationRule</code>, <code>autoIndex</code>, <code>allowMultiOverlap</code>, <code>precisionModel</code>. For further info, see notes below about <code>spatialContextFactory</code> implementations referenced above, especially the link to the JTS based one.</p>
 </div>
 </div>
 <div class="sect2">
 <h3 id="SpatialSearch-JTSandPolygons">JTS and Polygons</h3>
 <div class="paragraph">
-<p>As indicated above, <code>spatialContextFactory</code> must be set to <code>JTS</code> for polygon support, including multi-polygon. All other shapes, including even line-strings, are supported without JTS. JTS stands for <a href="http://sourceforge.net/projects/jts-topo-suite/">JTS Topology Suite</a>, which does not come with Solr due to its LGPL license. You must download it (a JAR file) and put that in a special location internal to Solr: <code>SOLR_INSTALL/server/solr-webapp/webapp/WEB-INF/lib/</code>. You can readily download it here: <a href="https://repo1.maven.org/maven2/com/vividsolutions/jts-core/" class="bare">https://repo1.maven.org/maven2/com/vividsolutions/jts-core/</a>. It will not work if placed in other more typical Solr lib directories, unfortunately. When activated, there are additional configuration attributes available; see <a href="https://locationtech.github.io/spatial4j/apidocs/org/locationtech/spatial4j/context/jts/JtsSpatialContextFactory.html">org.locat
 iontech.spatial4j.context.jts.JtsSpatialContextFactory</a> for the Javadocs, and remember to look at the superclass&#8217;s options in as well. One option in particular you should most likely enable is <code>autoIndex</code> (i.e., use JTS&#8217;s PreparedGeometry) as it&#8217;s been shown to be a major performance boost for non-trivial polygons.</p>
+<p>As indicated above, <code>spatialContextFactory</code> must be set to <code>JTS</code> for polygon support, including multi-polygon.</p>
+</div>
+<div class="paragraph">
+<p>All other shapes, including even line-strings, are supported without JTS. JTS stands for <a href="http://sourceforge.net/projects/jts-topo-suite/">JTS Topology Suite</a>, which does not come with Solr due to its LGPL license. You must download it (a JAR file) and put that in a special location internal to Solr: <code>SOLR_INSTALL/server/solr-webapp/webapp/WEB-INF/lib/</code>. You can readily download it here: <a href="https://repo1.maven.org/maven2/com/vividsolutions/jts-core/" class="bare">https://repo1.maven.org/maven2/com/vividsolutions/jts-core/</a>. It will not work if placed in other more typical Solr lib directories, unfortunately.</p>
+</div>
+<div class="paragraph">
+<p>When activated, there are additional configuration attributes available; see <a href="https://locationtech.github.io/spatial4j/apidocs/org/locationtech/spatial4j/context/jts/JtsSpatialContextFactory.html">org.locationtech.spatial4j.context.jts.JtsSpatialContextFactory</a> for the Javadocs, and remember to look at the superclass&#8217;s options in as well. One option in particular you should most likely enable is <code>autoIndex</code> (i.e., use JTS&#8217;s PreparedGeometry) as it&#8217;s been shown to be a major performance boost for non-trivial polygons.</p>
 </div>
 <div class="listingblock">
 <div class="content">
@@ -1709,16 +1760,16 @@ $('#toc').on('click', 'a', function() {
 <div class="paragraph">
 <p>Here&#8217;s an example polygon query for a field "geo" that can be either solr.SpatialRecursivePrefixTreeFieldType or RptWithGeometrySpatialField:</p>
 </div>
-<div class="literalblock">
+<div class="listingblock">
 <div class="content">
-<pre>&amp;q=*:*&amp;fq={!field f=geo}Intersects(POLYGON((-10 30, -40 40, -10 -20, 40 20, 0 0, -10 30)))</pre>
+<pre class="pygments highlight"><code data-lang="plain">&amp;q=*:*&amp;fq={!field f=geo}Intersects(POLYGON((-10 30, -40 40, -10 -20, 40 20, 0 0, -10 30)))</code></pre>
 </div>
 </div>
 <div class="paragraph">
 <p>Inside the parenthesis following the search predicate is the shape definition. The format of that shape is governed by the <code>format</code> attribute on the field type, defaulting to WKT. If you prefer GeoJSON, you can specify that instead.</p>
 </div>
 <div class="paragraph">
-<p><strong>Beyond this reference guide and Spatila4j&#8217;s docs, there are some details that remain at the Solr Wiki at</strong> <a href="http://wiki.apache.org/solr/SolrAdaptersForLuceneSpatial4" class="bare">http://wiki.apache.org/solr/SolrAdaptersForLuceneSpatial4</a></p>
+<p>Beyond this Reference Guide and Spatila4j&#8217;s docs, there are some details that remain at the Solr Wiki at <a href="http://wiki.apache.org/solr/SolrAdaptersForLuceneSpatial4" class="bare">http://wiki.apache.org/solr/SolrAdaptersForLuceneSpatial4</a>.</p>
 </div>
 </div>
 <div class="sect2">
@@ -1753,8 +1804,8 @@ $('#toc').on('click', 'a', function() {
 </div>
 <table class="tableblock frame-all grid-all spread">
 <colgroup>
-<col style="width: 50%;">
-<col style="width: 50%;">
+<col style="width: 30%;">
+<col style="width: 70%;">
 </colgroup>
 <thead>
 <tr>
@@ -1793,14 +1844,13 @@ $('#toc').on('click', 'a', function() {
 </tr>
 </tbody>
 </table>
-<div class="admonitionblock note">
+<div class="admonitionblock tip">
 <table>
 <tr>
 <td class="icon">
-<i class="fa icon-note" title="Note"></i>
+<i class="fa icon-tip" title="Tip"></i>
 </td>
 <td class="content">
-<div class="title">Tip</div>
 <div class="paragraph">
 <p>You&#8217;ll experiment with different distErrPct values (probably 0.10 - 0.20) with various input geometries till the default size is what you&#8217;re looking for. The specific details of how it&#8217;s computed isn&#8217;t important. For high-detail grids used in point-plotting (loosely one cell per pixel), set distErr to be the number of decimal-degrees of several pixels or so of the map being displayed. Also, you probably don&#8217;t want to use a geohash based grid because the cell orientation between grid levels flip-flops between being square and rectangle. Quad is consistent and has more levels, albeit at the expense of a larger index.</p>
 </div>
@@ -1809,12 +1859,12 @@ $('#toc').on('click', 'a', function() {
 </table>
 </div>
 <div class="paragraph">
-<p>Here&#8217;s some sample output in JSON (with some &#8230;&#8203;.. inserted for brevity):</p>
+<p>Here&#8217;s some sample output in JSON (with "&#8230;&#8203;" inserted for brevity):</p>
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="pygments highlight"><code data-lang="java"><span style="color: #666666">{</span>gridLevel<span style="color: #666666">=6,</span>columns<span style="color: #666666">=64,</span>rows<span style="color: #666666">=64,</span>minX<span style="color: #666666">=-180.0,</span>maxX<span style="color: #666666">=180.0,</span>minY<span style="color: #666666">=-90.0,</span>maxY<span style="color: #666666">=90.0,</span>
-counts_ints2D<span style="color: #666666">=[[0,</span> <span style="color: #666666">0,</span> <span style="color: #666666">2,</span> <span style="color: #666666">1,</span> <span style="color: #666666">....],[1,</span> <span style="color: #666666">1,</span> <span style="color: #666666">3,</span> <span style="color: #666666">2,</span> <span style="color: #666666">...],...]}</span></code></pre>
+<pre class="pygments highlight"><code data-lang="plain">{gridLevel=6,columns=64,rows=64,minX=-180.0,maxX=180.0,minY=-90.0,maxY=90.0,
+counts_ints2D=[[0, 0, 2, 1, ....],[1, 1, 3, 2, ...],...]}</code></pre>
 </div>
 </div>
 <div class="paragraph">
@@ -1855,17 +1905,17 @@ counts_ints2D<span style="color: #666666
 <div class="paragraph">
 <p>To search, you can use the <code>{!bbox}</code> query parser, or the range syntax e.g. <code>[10,-10 TO 15,20]</code>, or the ENVELOPE syntax wrapped in parenthesis with a leading search predicate. The latter is the only way to choose a predicate other than Intersects. For example:</p>
 </div>
-<div class="literalblock">
+<div class="listingblock">
 <div class="content">
-<pre>&amp;q={!field f=bbox}Contains(ENVELOPE(-10, 20, 15, 10))</pre>
+<pre class="pygments highlight"><code data-lang="plain">&amp;q={!field f=bbox}Contains(ENVELOPE(-10, 20, 15, 10))</code></pre>
 </div>
 </div>
 <div class="paragraph">
 <p>Now to sort the results by one of the relevancy modes, use it like this:</p>
 </div>
-<div class="literalblock">
+<div class="listingblock">
 <div class="content">
-<pre>&amp;q={!field f=bbox score=overlapRatio}Intersects(ENVELOPE(-10, 20, 15, 10))</pre>
+<pre class="pygments highlight"><code data-lang="plain">&amp;q={!field f=bbox score=overlapRatio}Intersects(ENVELOPE(-10, 20, 15, 10))</code></pre>
 </div>
 </div>
 <div class="paragraph">
@@ -1909,7 +1959,7 @@ counts_ints2D<span style="color: #666666
             <div class="row">
                 <div class="col-lg-12 footer">
                &copy;2017 Apache Software Foundation. All rights reserved. <br />
- Site last generated: 2017-05-03 <br />
+ Site last generated: 2017-05-09 <br />
 <p><img src="solr-sunOnly-small.png" alt="Apache Solr"/></p>
                 </div>
             </div>