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 [23/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/result-grouping.html
==============================================================================
--- websites/production/lucene/content/solr/guide/test-10290/result-grouping.html (original)
+++ websites/production/lucene/content/solr/guide/test-10290/result-grouping.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>Result Grouping groups documents with a common field value into groups and returns the top documents for each group. For example, if you searched for "DVD" on an electronic retailer&#8217;s e-commerce site, you might be returned three categories such as "TV and Video," "Movies," and "Computers," with three results per category. In this case, the query term "DVD" appeared in all three categories, so Solr groups them together in order to increase relevancy for the user.</p>
+<p>Result Grouping groups documents with a common field value into groups and returns the top documents for each group.</p>
+</div>
+<div class="paragraph">
+<p>For example, if you searched for "DVD" on an electronic retailer&#8217;s e-commerce site, you might be returned three categories such as "TV and Video", "Movies", and "Computers" with three results per category. In this case, the query term "DVD" appeared in all three categories, so Solr groups them together in order to increase relevancy for the user.</p>
 </div>
 <div class="admonitionblock note">
 <table>
@@ -1304,7 +1307,7 @@ $('#toc').on('click', 'a', function() {
 <p>You can however combine grouping with faceting. Grouped faceting supports <code>facet.field</code> and <code>facet.range</code> but currently doesn&#8217;t support date and pivot faceting. The facet counts are computed based on the first <code>group.field</code> parameter, and other <code>group.field</code> parameters are ignored.</p>
 </div>
 <div class="paragraph">
-<p>Grouped faceting differs from non grouped facets (sum of all facets) == (total of products with that property) as shown in the following example:</p>
+<p>Grouped faceting differs from non grouped facets <code>(sum of all facets) == (total of products with that property)</code> as shown in the following example:</p>
 </div>
 <div class="paragraph">
 <p>Object 1</p>
@@ -1367,9 +1370,9 @@ $('#toc').on('click', 'a', function() {
 </div>
 <table class="tableblock frame-all grid-all spread">
 <colgroup>
-<col style="width: 34%;">
-<col style="width: 33%;">
-<col style="width: 33%;">
+<col style="width: 20%;">
+<col style="width: 20%;">
+<col style="width: 60%;">
 </colgroup>
 <thead>
 <tr>
@@ -1395,8 +1398,17 @@ $('#toc').on('click', 'a', function() {
 <td class="tableblock halign-left valign-top"><div><div class="paragraph">
 <p>Group based on the unique values of a function query.</p>
 </div>
-<div class="paragraph">
-<p><strong>NOTE:</strong> This option does not work with <a href="#ResultGrouping-DistributedResultGroupingCaveats">distributed searches</a>.</p>
+<div class="admonitionblock note">
+<table>
+<tr>
+<td class="icon">
+<i class="fa icon-note" title="Note"></i>
+</td>
+<td class="content">
+This option does not work with <a href="#ResultGrouping-DistributedResultGroupingCaveats">distributed searches</a>.
+</td>
+</tr>
+</table>
 </div></div></td>
 </tr>
 <tr>
@@ -1496,54 +1508,51 @@ $('#toc').on('click', 'a', function() {
 <p>In this example, we will group results based on the <code>manu_exact</code> field, which specifies the manufacturer of the items in the sample dataset.</p>
 </div>
 <div class="paragraph">
-<p><code><a href="http://localhost:8983/solr/techproducts/select?wt=json&amp;indent=true&amp;fl=id,name&amp;q=solr+memory&amp;group=true&amp;group.field=manu_exact" class="bare">http://localhost:8983/solr/techproducts/select?wt=json&amp;indent=true&amp;fl=id,name&amp;q=solr+memory&amp;group=true&amp;group.field=manu_exact</a></code></p>
+<p><code>http://localhost:8983/solr/techproducts/select?wt=json&amp;indent=true&amp;fl=id,name&amp;q=solr+memory&amp;group=true&amp;group.field=manu_exact</code></p>
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="pygments highlight"><code data-lang="java"><span style="color: #666666">{</span>
-<span style="color: #666666">...</span>
-<span style="color: #BA2121">&quot;grouped&quot;</span><span style="color: #666666">:{</span>
-  <span style="color: #BA2121">&quot;manu_exact&quot;</span><span style="color: #666666">:{</span>
-    <span style="color: #BA2121">&quot;matches&quot;</span><span style="color: #666666">:6,</span>
-    <span style="color: #BA2121">&quot;groups&quot;</span><span style="color: #666666">:[{</span>
-        <span style="color: #BA2121">&quot;groupValue&quot;</span><span style="color: #666666">:</span><span style="color: #BA2121">&quot;Apache Software Foundation&quot;</span><span style="color: #666666">,</span>
-        <span style="color: #BA2121">&quot;doclist&quot;</span><span style="color: #666666">:{</span><span style="color: #BA2121">&quot;numFound&quot;</span><span style="color: #666666">:1,</span><span style="color: #BA2121">&quot;start&quot;</span><span style="color: #666666">:0,</span><span style="color: #BA2121">&quot;docs&quot;</span><span style="color: #666666">:[</span>
-            <span style="color: #666666">{</span>
-              <span style="color: #BA2121">&quot;id&quot;</span><span style="color: #666666">:</span><span style="color: #BA2121">&quot;SOLR1000&quot;</span><span style="color: #666666">,</span>
-              <span style="color: #BA2121">&quot;name&quot;</span><span style="color: #666666">:</span><span style="color: #BA2121">&quot;Solr, the Enterprise Search Server&quot;</span><span style="color: #666666">}]</span>
-        <span style="color: #666666">}},</span>
-      <span style="color: #666666">{</span>
-        <span style="color: #BA2121">&quot;groupValue&quot;</span><span style="color: #666666">:</span><span style="color: #BA2121">&quot;Corsair Microsystems Inc.&quot;</span><span style="color: #666666">,</span>
-        <span style="color: #BA2121">&quot;doclist&quot;</span><span style="color: #666666">:{</span><span style="color: #BA2121">&quot;numFound&quot;</span><span style="color: #666666">:2,</span><span style="color: #BA2121">&quot;start&quot;</span><span style="color: #666666">:0,</span><span style="color: #BA2121">&quot;docs&quot;</span><span style="color: #666666">:[</span>
-            <span style="color: #666666">{</span>
-              <span style="color: #BA2121">&quot;id&quot;</span><span style="color: #666666">:</span><span style="color: #BA2121">&quot;VS1GB400C3&quot;</span><span style="color: #666666">,</span>
-              <span style="color: #BA2121">&quot;name&quot;</span><span style="color: #666666">:</span><span style="color: #BA2121">&quot;CORSAIR ValueSelect 1GB 184-Pin DDR SDRAM Unbuffered DDR 400 (PC 3200) System Memory - Retail&quot;</span><span style="color: #666666">}]</span>
-        <span style="color: #666666">}},</span>
-      <span style="color: #666666">{</span>
-        <span style="color: #BA2121">&quot;groupValue&quot;</span><span style="color: #666666">:</span><span style="color: #BA2121">&quot;A-DATA Technology Inc.&quot;</span><span style="color: #666666">,</span>
-        <span style="color: #BA2121">&quot;doclist&quot;</span><span style="color: #666666">:{</span><span style="color: #BA2121">&quot;numFound&quot;</span><span style="color: #666666">:1,</span><span style="color: #BA2121">&quot;start&quot;</span><span style="color: #666666">:0,</span><span style="color: #BA2121">&quot;docs&quot;</span><span style="color: #666666">:[</span>
-            <span style="color: #666666">{</span>
-              <span style="color: #BA2121">&quot;id&quot;</span><span style="color: #666666">:</span><span style="color: #BA2121">&quot;VDBDB1A16&quot;</span><span style="color: #666666">,</span>
-              <span style="color: #BA2121">&quot;name&quot;</span><span style="color: #666666">:</span><span style="color: #BA2121">&quot;A-DATA V-Series 1GB 184-Pin DDR SDRAM Unbuffered DDR 400 (PC 3200) System Memory - OEM&quot;</span><span style="color: #666666">}]</span>
-        <span style="color: #666666">}},</span>
-      <span style="color: #666666">{</span>
-        <span style="color: #BA2121">&quot;groupValue&quot;</span><span style="color: #666666">:</span><span style="color: #BA2121">&quot;Canon Inc.&quot;</span><span style="color: #666666">,</span>
-        <span style="color: #BA2121">&quot;doclist&quot;</span><span style="color: #666666">:{</span><span style="color: #BA2121">&quot;numFound&quot;</span><span style="color: #666666">:1,</span><span style="color: #BA2121">&quot;start&quot;</span><span style="color: #666666">:0,</span><span style="color: #BA2121">&quot;docs&quot;</span><span style="color: #666666">:[</span>
-            <span style="color: #666666">{</span>
-              <span style="color: #BA2121">&quot;id&quot;</span><span style="color: #666666">:</span><span style="color: #BA2121">&quot;0579B002&quot;</span><span style="color: #666666">,</span>
-              <span style="color: #BA2121">&quot;name&quot;</span><span style="color: #666666">:</span><span style="color: #BA2121">&quot;Canon PIXMA MP500 All-In-One Photo Printer&quot;</span><span style="color: #666666">}]</span>
-        <span style="color: #666666">}},</span>
-      <span style="color: #666666">{</span>
-        <span style="color: #BA2121">&quot;groupValue&quot;</span><span style="color: #666666">:</span><span style="color: #BA2121">&quot;ASUS Computer Inc.&quot;</span><span style="color: #666666">,</span>
-        <span style="color: #BA2121">&quot;doclist&quot;</span><span style="color: #666666">:{</span><span style="color: #BA2121">&quot;numFound&quot;</span><span style="color: #666666">:1,</span><span style="color: #BA2121">&quot;start&quot;</span><span style="color: #666666">:0,</span><span style="color: #BA2121">&quot;docs&quot;</span><span style="color: #666666">:[</span>
-            <span style="color: #666666">{</span>
-              <span style="color: #BA2121">&quot;id&quot;</span><span style="color: #666666">:</span><span style="color: #BA2121">&quot;EN7800GTX/2DHTV/256M&quot;</span><span style="color: #666666">,</span>
-              <span style="color: #BA2121">&quot;name&quot;</span><span style="color: #666666">:</span><span style="color: #BA2121">&quot;ASUS Extreme N7800GTX/2DHTV (256 MB)&quot;</span><span style="color: #666666">}]</span>
-        <span style="color: #666666">}</span>
-      <span style="color: #666666">}</span>
-    <span style="color: #666666">]</span>
-  <span style="color: #666666">}</span>
-<span style="color: #666666">}</span></code></pre>
+<pre class="pygments highlight"><code data-lang="json">{
+<span style="color: #008000; font-weight: bold">&quot;...&quot;</span>
+<span style="color: #BA2121">&quot;grouped&quot;</span>:{
+  <span style="color: #008000; font-weight: bold">&quot;manu_exact&quot;</span>:{
+    <span style="color: #008000; font-weight: bold">&quot;matches&quot;</span>:<span style="color: #666666">6</span>,
+    <span style="color: #008000; font-weight: bold">&quot;groups&quot;</span>:[{
+        <span style="color: #008000; font-weight: bold">&quot;groupValue&quot;</span>:<span style="color: #BA2121">&quot;Apache Software Foundation&quot;</span>,
+        <span style="color: #008000; font-weight: bold">&quot;doclist&quot;</span>:{<span style="color: #008000; font-weight: bold">&quot;numFound&quot;</span>:<span style="color: #666666">1</span>,<span style="color: #008000; font-weight: bold">&quot;start&quot;</span>:<span style="color: #666666">0</span>,<span style="color: #008000; font-weight: bold">&quot;docs&quot;</span>:[
+            {
+              <span style="color: #008000; font-weight: bold">&quot;id&quot;</span>:<span style="color: #BA2121">&quot;SOLR1000&quot;</span>,
+              <span style="color: #008000; font-weight: bold">&quot;name&quot;</span>:<span style="color: #BA2121">&quot;Solr, the Enterprise Search Server&quot;</span>}]
+        }},
+      {
+        <span style="color: #008000; font-weight: bold">&quot;groupValue&quot;</span>:<span style="color: #BA2121">&quot;Corsair Microsystems Inc.&quot;</span>,
+        <span style="color: #008000; font-weight: bold">&quot;doclist&quot;</span>:{<span style="color: #008000; font-weight: bold">&quot;numFound&quot;</span>:<span style="color: #666666">2</span>,<span style="color: #008000; font-weight: bold">&quot;start&quot;</span>:<span style="color: #666666">0</span>,<span style="color: #008000; font-weight: bold">&quot;docs&quot;</span>:[
+            {
+              <span style="color: #008000; font-weight: bold">&quot;id&quot;</span>:<span style="color: #BA2121">&quot;VS1GB400C3&quot;</span>,
+              <span style="color: #008000; font-weight: bold">&quot;name&quot;</span>:<span style="color: #BA2121">&quot;CORSAIR ValueSelect 1GB 184-Pin DDR SDRAM Unbuffered DDR 400 (PC 3200) System Memory - Retail&quot;</span>}]
+        }},
+      {
+        <span style="color: #008000; font-weight: bold">&quot;groupValue&quot;</span>:<span style="color: #BA2121">&quot;A-DATA Technology Inc.&quot;</span>,
+        <span style="color: #008000; font-weight: bold">&quot;doclist&quot;</span>:{<span style="color: #008000; font-weight: bold">&quot;numFound&quot;</span>:<span style="color: #666666">1</span>,<span style="color: #008000; font-weight: bold">&quot;start&quot;</span>:<span style="color: #666666">0</span>,<span style="color: #008000; font-weight: bold">&quot;docs&quot;</span>:[
+            {
+              <span style="color: #008000; font-weight: bold">&quot;id&quot;</span>:<span style="color: #BA2121">&quot;VDBDB1A16&quot;</span>,
+              <span style="color: #008000; font-weight: bold">&quot;name&quot;</span>:<span style="color: #BA2121">&quot;A-DATA V-Series 1GB 184-Pin DDR SDRAM Unbuffered DDR 400 (PC 3200) System Memory - OEM&quot;</span>}]
+        }},
+      {
+        <span style="color: #008000; font-weight: bold">&quot;groupValue&quot;</span>:<span style="color: #BA2121">&quot;Canon Inc.&quot;</span>,
+        <span style="color: #008000; font-weight: bold">&quot;doclist&quot;</span>:{<span style="color: #008000; font-weight: bold">&quot;numFound&quot;</span>:<span style="color: #666666">1</span>,<span style="color: #008000; font-weight: bold">&quot;start&quot;</span>:<span style="color: #666666">0</span>,<span style="color: #008000; font-weight: bold">&quot;docs&quot;</span>:[
+            {
+              <span style="color: #008000; font-weight: bold">&quot;id&quot;</span>:<span style="color: #BA2121">&quot;0579B002&quot;</span>,
+              <span style="color: #008000; font-weight: bold">&quot;name&quot;</span>:<span style="color: #BA2121">&quot;Canon PIXMA MP500 All-In-One Photo Printer&quot;</span>}]
+        }},
+      {
+        <span style="color: #008000; font-weight: bold">&quot;groupValue&quot;</span>:<span style="color: #BA2121">&quot;ASUS Computer Inc.&quot;</span>,
+        <span style="color: #008000; font-weight: bold">&quot;doclist&quot;</span>:{<span style="color: #008000; font-weight: bold">&quot;numFound&quot;</span>:<span style="color: #666666">1</span>,<span style="color: #008000; font-weight: bold">&quot;start&quot;</span>:<span style="color: #666666">0</span>,<span style="color: #008000; font-weight: bold">&quot;docs&quot;</span>:[
+            {
+              <span style="color: #008000; font-weight: bold">&quot;id&quot;</span>:<span style="color: #BA2121">&quot;EN7800GTX/2DHTV/256M&quot;</span>,
+              <span style="color: #008000; font-weight: bold">&quot;name&quot;</span>:<span style="color: #BA2121">&quot;ASUS Extreme N7800GTX/2DHTV (256 MB)&quot;</span>}]
+        }
+      }]}}}</code></pre>
 </div>
 </div>
 <div class="paragraph">
@@ -1553,41 +1562,41 @@ $('#toc').on('click', 'a', function() {
 <p>We can run the same query with the request parameter <code>group.main=true</code>. This will format the results as a single flat document list. This flat format does not include as much information as the normal result grouping query results – notably the <code>numFound</code> in each group – but it may be easier for existing Solr clients to parse.</p>
 </div>
 <div class="paragraph">
-<p><code><a href="http://localhost:8983/solr/techproducts/select?wt=json&amp;indent=true&amp;fl=id,name,manufacturer&amp;q=solr+memory&amp;group=true&amp;group.field=manu_exact&amp;group.main=true" class="bare">http://localhost:8983/solr/techproducts/select?wt=json&amp;indent=true&amp;fl=id,name,manufacturer&amp;q=solr+memory&amp;group=true&amp;group.field=manu_exact&amp;group.main=true</a></code></p>
+<p><code>http://localhost:8983/solr/techproducts/select?wt=json&amp;indent=true&amp;fl=id,name,manufacturer&amp;q=solr+memory&amp;group=true&amp;group.field=manu_exact&amp;group.main=true</code></p>
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="pygments highlight"><code data-lang="java"><span style="color: #666666">{</span>
-  <span style="color: #BA2121">&quot;responseHeader&quot;</span><span style="color: #666666">:{</span>
-    <span style="color: #BA2121">&quot;status&quot;</span><span style="color: #666666">:0,</span>
-    <span style="color: #BA2121">&quot;QTime&quot;</span><span style="color: #666666">:1,</span>
-    <span style="color: #BA2121">&quot;params&quot;</span><span style="color: #666666">:{</span>
-      <span style="color: #BA2121">&quot;fl&quot;</span><span style="color: #666666">:</span><span style="color: #BA2121">&quot;id,name,manufacturer&quot;</span><span style="color: #666666">,</span>
-      <span style="color: #BA2121">&quot;indent&quot;</span><span style="color: #666666">:</span><span style="color: #BA2121">&quot;true&quot;</span><span style="color: #666666">,</span>
-      <span style="color: #BA2121">&quot;q&quot;</span><span style="color: #666666">:</span><span style="color: #BA2121">&quot;solr memory&quot;</span><span style="color: #666666">,</span>
-      <span style="color: #BA2121">&quot;group.field&quot;</span><span style="color: #666666">:</span><span style="color: #BA2121">&quot;manu_exact&quot;</span><span style="color: #666666">,</span>
-      <span style="color: #BA2121">&quot;group.main&quot;</span><span style="color: #666666">:</span><span style="color: #BA2121">&quot;true&quot;</span><span style="color: #666666">,</span>
-      <span style="color: #BA2121">&quot;group&quot;</span><span style="color: #666666">:</span><span style="color: #BA2121">&quot;true&quot;</span><span style="color: #666666">,</span>
-      <span style="color: #BA2121">&quot;wt&quot;</span><span style="color: #666666">:</span><span style="color: #BA2121">&quot;json&quot;</span><span style="color: #666666">}},</span>
-  <span style="color: #BA2121">&quot;grouped&quot;</span><span style="color: #666666">:{},</span>
-  <span style="color: #BA2121">&quot;response&quot;</span><span style="color: #666666">:{</span><span style="color: #BA2121">&quot;numFound&quot;</span><span style="color: #666666">:6,</span><span style="color: #BA2121">&quot;start&quot;</span><span style="color: #666666">:0,</span><span style="color: #BA2121">&quot;docs&quot;</span><span style="color: #666666">:[</span>
-      <span style="color: #666666">{</span>
-        <span style="color: #BA2121">&quot;id&quot;</span><span style="color: #666666">:</span><span style="color: #BA2121">&quot;SOLR1000&quot;</span><span style="color: #666666">,</span>
-        <span style="color: #BA2121">&quot;name&quot;</span><span style="color: #666666">:</span><span style="color: #BA2121">&quot;Solr, the Enterprise Search Server&quot;</span><span style="color: #666666">},</span>
-      <span style="color: #666666">{</span>
-        <span style="color: #BA2121">&quot;id&quot;</span><span style="color: #666666">:</span><span style="color: #BA2121">&quot;VS1GB400C3&quot;</span><span style="color: #666666">,</span>
-        <span style="color: #BA2121">&quot;name&quot;</span><span style="color: #666666">:</span><span style="color: #BA2121">&quot;CORSAIR ValueSelect 1GB 184-Pin DDR SDRAM Unbuffered DDR 400 (PC 3200) System Memory - Retail&quot;</span><span style="color: #666666">},</span>
-      <span style="color: #666666">{</span>
-        <span style="color: #BA2121">&quot;id&quot;</span><span style="color: #666666">:</span><span style="color: #BA2121">&quot;VDBDB1A16&quot;</span><span style="color: #666666">,</span>
-        <span style="color: #BA2121">&quot;name&quot;</span><span style="color: #666666">:</span><span style="color: #BA2121">&quot;A-DATA V-Series 1GB 184-Pin DDR SDRAM Unbuffered DDR 400 (PC 3200) System Memory - OEM&quot;</span><span style="color: #666666">},</span>
-      <span style="color: #666666">{</span>
-        <span style="color: #BA2121">&quot;id&quot;</span><span style="color: #666666">:</span><span style="color: #BA2121">&quot;0579B002&quot;</span><span style="color: #666666">,</span>
-        <span style="color: #BA2121">&quot;name&quot;</span><span style="color: #666666">:</span><span style="color: #BA2121">&quot;Canon PIXMA MP500 All-In-One Photo Printer&quot;</span><span style="color: #666666">},</span>
-      <span style="color: #666666">{</span>
-        <span style="color: #BA2121">&quot;id&quot;</span><span style="color: #666666">:</span><span style="color: #BA2121">&quot;EN7800GTX/2DHTV/256M&quot;</span><span style="color: #666666">,</span>
-        <span style="color: #BA2121">&quot;name&quot;</span><span style="color: #666666">:</span><span style="color: #BA2121">&quot;ASUS Extreme N7800GTX/2DHTV (256 MB)&quot;</span><span style="color: #666666">}]</span>
-  <span style="color: #666666">}</span>
-<span style="color: #666666">}</span></code></pre>
+<pre class="pygments highlight"><code data-lang="json">{
+  <span style="color: #008000; font-weight: bold">&quot;responseHeader&quot;</span>:{
+    <span style="color: #008000; font-weight: bold">&quot;status&quot;</span>:<span style="color: #666666">0</span>,
+    <span style="color: #008000; font-weight: bold">&quot;QTime&quot;</span>:<span style="color: #666666">1</span>,
+    <span style="color: #008000; font-weight: bold">&quot;params&quot;</span>:{
+      <span style="color: #008000; font-weight: bold">&quot;fl&quot;</span>:<span style="color: #BA2121">&quot;id,name,manufacturer&quot;</span>,
+      <span style="color: #008000; font-weight: bold">&quot;indent&quot;</span>:<span style="color: #BA2121">&quot;true&quot;</span>,
+      <span style="color: #008000; font-weight: bold">&quot;q&quot;</span>:<span style="color: #BA2121">&quot;solr memory&quot;</span>,
+      <span style="color: #008000; font-weight: bold">&quot;group.field&quot;</span>:<span style="color: #BA2121">&quot;manu_exact&quot;</span>,
+      <span style="color: #008000; font-weight: bold">&quot;group.main&quot;</span>:<span style="color: #BA2121">&quot;true&quot;</span>,
+      <span style="color: #008000; font-weight: bold">&quot;group&quot;</span>:<span style="color: #BA2121">&quot;true&quot;</span>,
+      <span style="color: #008000; font-weight: bold">&quot;wt&quot;</span>:<span style="color: #BA2121">&quot;json&quot;</span>}},
+  <span style="color: #008000; font-weight: bold">&quot;grouped&quot;</span>:{},
+  <span style="color: #008000; font-weight: bold">&quot;response&quot;</span>:{<span style="color: #008000; font-weight: bold">&quot;numFound&quot;</span>:<span style="color: #666666">6</span>,<span style="color: #008000; font-weight: bold">&quot;start&quot;</span>:<span style="color: #666666">0</span>,<span style="color: #008000; font-weight: bold">&quot;docs&quot;</span>:[
+      {
+        <span style="color: #008000; font-weight: bold">&quot;id&quot;</span>:<span style="color: #BA2121">&quot;SOLR1000&quot;</span>,
+        <span style="color: #008000; font-weight: bold">&quot;name&quot;</span>:<span style="color: #BA2121">&quot;Solr, the Enterprise Search Server&quot;</span>},
+      {
+        <span style="color: #008000; font-weight: bold">&quot;id&quot;</span>:<span style="color: #BA2121">&quot;VS1GB400C3&quot;</span>,
+        <span style="color: #008000; font-weight: bold">&quot;name&quot;</span>:<span style="color: #BA2121">&quot;CORSAIR ValueSelect 1GB 184-Pin DDR SDRAM Unbuffered DDR 400 (PC 3200) System Memory - Retail&quot;</span>},
+      {
+        <span style="color: #008000; font-weight: bold">&quot;id&quot;</span>:<span style="color: #BA2121">&quot;VDBDB1A16&quot;</span>,
+        <span style="color: #008000; font-weight: bold">&quot;name&quot;</span>:<span style="color: #BA2121">&quot;A-DATA V-Series 1GB 184-Pin DDR SDRAM Unbuffered DDR 400 (PC 3200) System Memory - OEM&quot;</span>},
+      {
+        <span style="color: #008000; font-weight: bold">&quot;id&quot;</span>:<span style="color: #BA2121">&quot;0579B002&quot;</span>,
+        <span style="color: #008000; font-weight: bold">&quot;name&quot;</span>:<span style="color: #BA2121">&quot;Canon PIXMA MP500 All-In-One Photo Printer&quot;</span>},
+      {
+        <span style="color: #008000; font-weight: bold">&quot;id&quot;</span>:<span style="color: #BA2121">&quot;EN7800GTX/2DHTV/256M&quot;</span>,
+        <span style="color: #008000; font-weight: bold">&quot;name&quot;</span>:<span style="color: #BA2121">&quot;ASUS Extreme N7800GTX/2DHTV (256 MB)&quot;</span>}]
+  }
+}</code></pre>
 </div>
 </div>
 </div>
@@ -1597,47 +1606,47 @@ $('#toc').on('click', 'a', function() {
 <p>In this example, we will use the <code>group.query</code> parameter to find the top three results for "memory" in two different price ranges: 0.00 to 99.99, and over 100.</p>
 </div>
 <div class="paragraph">
-<p><a href="http://localhost:8983/solr/techproducts/select?wt=json&amp;indent=true&amp;fl=name,price&amp;q=memory&amp;group=true&amp;group.query=price:%5B0+TO+99.99%5D&amp;group.query=price:%5B100+TO+" class="bare">http://localhost:8983/solr/techproducts/select?wt=json&amp;indent=true&amp;fl=name,price&amp;q=memory&amp;group=true&amp;group.query=price:%5B0+TO+99.99%5D&amp;group.query=price:%5B100+TO+</a><strong>%5D&amp;group.limit=3[<code><a href="http://localhost:8983/solr/techproducts/select?wt=json&amp;indent=true&amp;fl=name,price&amp;q=memory&amp;group=true&amp;group.query=price:">0+TO+99.99</a>&amp;group.query=price:[100+TO+</strong>]&amp;group.limit=3</code>]</p>
+<p><code>http://localhost:8983/solr/techproducts/select?wt=json&amp;indent=true&amp;fl=name,price&amp;q=memory&amp;group=true&amp;group.query=price:0+TO+99.99&amp;group.query=price:[100+TO+*]&amp;group.limit=3</code></p>
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="pygments highlight"><code data-lang="java"><span style="color: #666666">{</span>
-  <span style="color: #BA2121">&quot;responseHeader&quot;</span><span style="color: #666666">:{</span>
-    <span style="color: #BA2121">&quot;status&quot;</span><span style="color: #666666">:0,</span>
-    <span style="color: #BA2121">&quot;QTime&quot;</span><span style="color: #666666">:42,</span>
-    <span style="color: #BA2121">&quot;params&quot;</span><span style="color: #666666">:{</span>
-      <span style="color: #BA2121">&quot;fl&quot;</span><span style="color: #666666">:</span><span style="color: #BA2121">&quot;name,price&quot;</span><span style="color: #666666">,</span>
-      <span style="color: #BA2121">&quot;indent&quot;</span><span style="color: #666666">:</span><span style="color: #BA2121">&quot;true&quot;</span><span style="color: #666666">,</span>
-      <span style="color: #BA2121">&quot;q&quot;</span><span style="color: #666666">:</span><span style="color: #BA2121">&quot;memory&quot;</span><span style="color: #666666">,</span>
-      <span style="color: #BA2121">&quot;group.limit&quot;</span><span style="color: #666666">:</span><span style="color: #BA2121">&quot;3&quot;</span><span style="color: #666666">,</span>
-      <span style="color: #BA2121">&quot;group.query&quot;</span><span style="color: #666666">:[</span><span style="color: #BA2121">&quot;price:[0 TO 99.99]&quot;</span><span style="color: #666666">,</span>
-      <span style="color: #BA2121">&quot;price:[100 TO *]&quot;</span><span style="color: #666666">],</span>
-      <span style="color: #BA2121">&quot;group&quot;</span><span style="color: #666666">:</span><span style="color: #BA2121">&quot;true&quot;</span><span style="color: #666666">,</span>
-      <span style="color: #BA2121">&quot;wt&quot;</span><span style="color: #666666">:</span><span style="color: #BA2121">&quot;json&quot;</span><span style="color: #666666">}},</span>
-  <span style="color: #BA2121">&quot;grouped&quot;</span><span style="color: #666666">:{</span>
-    <span style="color: #BA2121">&quot;price:[0 TO 99.99]&quot;</span><span style="color: #666666">:{</span>
-      <span style="color: #BA2121">&quot;matches&quot;</span><span style="color: #666666">:5,</span>
-      <span style="color: #BA2121">&quot;doclist&quot;</span><span style="color: #666666">:{</span><span style="color: #BA2121">&quot;numFound&quot;</span><span style="color: #666666">:1,</span><span style="color: #BA2121">&quot;start&quot;</span><span style="color: #666666">:0,</span><span style="color: #BA2121">&quot;docs&quot;</span><span style="color: #666666">:[</span>
-          <span style="color: #666666">{</span>
-            <span style="color: #BA2121">&quot;name&quot;</span><span style="color: #666666">:</span><span style="color: #BA2121">&quot;CORSAIR ValueSelect 1GB 184-Pin DDR SDRAM Unbuffered DDR 400 (PC 3200) System Memory - Retail&quot;</span><span style="color: #666666">,</span>
-            <span style="color: #BA2121">&quot;price&quot;</span><span style="color: #666666">:74.99}]</span>
-      <span style="color: #666666">}},</span>
-    <span style="color: #BA2121">&quot;price:[100 TO *]&quot;</span><span style="color: #666666">:{</span>
-      <span style="color: #BA2121">&quot;matches&quot;</span><span style="color: #666666">:5,</span>
-      <span style="color: #BA2121">&quot;doclist&quot;</span><span style="color: #666666">:{</span><span style="color: #BA2121">&quot;numFound&quot;</span><span style="color: #666666">:3,</span><span style="color: #BA2121">&quot;start&quot;</span><span style="color: #666666">:0,</span><span style="color: #BA2121">&quot;docs&quot;</span><span style="color: #666666">:[</span>
-          <span style="color: #666666">{</span>
-            <span style="color: #BA2121">&quot;name&quot;</span><span style="color: #666666">:</span><span style="color: #BA2121">&quot;CORSAIR  XMS 2GB (2 x 1GB) 184-Pin DDR SDRAM Unbuffered DDR 400 (PC 3200) Dual Channel Kit System Memory - Retail&quot;</span><span style="color: #666666">,</span>
-            <span style="color: #BA2121">&quot;price&quot;</span><span style="color: #666666">:185.0},</span>
-          <span style="color: #666666">{</span>
-            <span style="color: #BA2121">&quot;name&quot;</span><span style="color: #666666">:</span><span style="color: #BA2121">&quot;Canon PIXMA MP500 All-In-One Photo Printer&quot;</span><span style="color: #666666">,</span>
-            <span style="color: #BA2121">&quot;price&quot;</span><span style="color: #666666">:179.99},</span>
-          <span style="color: #666666">{</span>
-            <span style="color: #BA2121">&quot;name&quot;</span><span style="color: #666666">:</span><span style="color: #BA2121">&quot;ASUS Extreme N7800GTX/2DHTV (256 MB)&quot;</span><span style="color: #666666">,</span>
-            <span style="color: #BA2121">&quot;price&quot;</span><span style="color: #666666">:479.95}]</span>
-      <span style="color: #666666">}</span>
-    <span style="color: #666666">}</span>
-  <span style="color: #666666">}</span>
-<span style="color: #666666">}</span></code></pre>
+<pre class="pygments highlight"><code data-lang="json">{
+  <span style="color: #008000; font-weight: bold">&quot;responseHeader&quot;</span>:{
+    <span style="color: #008000; font-weight: bold">&quot;status&quot;</span>:<span style="color: #666666">0</span>,
+    <span style="color: #008000; font-weight: bold">&quot;QTime&quot;</span>:<span style="color: #666666">42</span>,
+    <span style="color: #008000; font-weight: bold">&quot;params&quot;</span>:{
+      <span style="color: #008000; font-weight: bold">&quot;fl&quot;</span>:<span style="color: #BA2121">&quot;name,price&quot;</span>,
+      <span style="color: #008000; font-weight: bold">&quot;indent&quot;</span>:<span style="color: #BA2121">&quot;true&quot;</span>,
+      <span style="color: #008000; font-weight: bold">&quot;q&quot;</span>:<span style="color: #BA2121">&quot;memory&quot;</span>,
+      <span style="color: #008000; font-weight: bold">&quot;group.limit&quot;</span>:<span style="color: #BA2121">&quot;3&quot;</span>,
+      <span style="color: #008000; font-weight: bold">&quot;group.query&quot;</span>:[<span style="color: #BA2121">&quot;price:[0 TO 99.99]&quot;</span>,
+      <span style="color: #BA2121">&quot;price:[100 TO *]&quot;</span>],
+      <span style="color: #008000; font-weight: bold">&quot;group&quot;</span>:<span style="color: #BA2121">&quot;true&quot;</span>,
+      <span style="color: #008000; font-weight: bold">&quot;wt&quot;</span>:<span style="color: #BA2121">&quot;json&quot;</span>}},
+  <span style="color: #008000; font-weight: bold">&quot;grouped&quot;</span>:{
+    <span style="color: #008000; font-weight: bold">&quot;price:[0 TO 99.99]&quot;</span>:{
+      <span style="color: #008000; font-weight: bold">&quot;matches&quot;</span>:<span style="color: #666666">5</span>,
+      <span style="color: #008000; font-weight: bold">&quot;doclist&quot;</span>:{<span style="color: #008000; font-weight: bold">&quot;numFound&quot;</span>:<span style="color: #666666">1</span>,<span style="color: #008000; font-weight: bold">&quot;start&quot;</span>:<span style="color: #666666">0</span>,<span style="color: #008000; font-weight: bold">&quot;docs&quot;</span>:[
+          {
+            <span style="color: #008000; font-weight: bold">&quot;name&quot;</span>:<span style="color: #BA2121">&quot;CORSAIR ValueSelect 1GB 184-Pin DDR SDRAM Unbuffered DDR 400 (PC 3200) System Memory - Retail&quot;</span>,
+            <span style="color: #008000; font-weight: bold">&quot;price&quot;</span>:<span style="color: #666666">74.99</span>}]
+      }},
+    <span style="color: #008000; font-weight: bold">&quot;price:[100 TO *]&quot;</span>:{
+      <span style="color: #008000; font-weight: bold">&quot;matches&quot;</span>:<span style="color: #666666">5</span>,
+      <span style="color: #008000; font-weight: bold">&quot;doclist&quot;</span>:{<span style="color: #008000; font-weight: bold">&quot;numFound&quot;</span>:<span style="color: #666666">3</span>,<span style="color: #008000; font-weight: bold">&quot;start&quot;</span>:<span style="color: #666666">0</span>,<span style="color: #008000; font-weight: bold">&quot;docs&quot;</span>:[
+          {
+            <span style="color: #008000; font-weight: bold">&quot;name&quot;</span>:<span style="color: #BA2121">&quot;CORSAIR  XMS 2GB (2 x 1GB) 184-Pin DDR SDRAM Unbuffered DDR 400 (PC 3200) Dual Channel Kit System Memory - Retail&quot;</span>,
+            <span style="color: #008000; font-weight: bold">&quot;price&quot;</span>:<span style="color: #666666">185.0</span>},
+          {
+            <span style="color: #008000; font-weight: bold">&quot;name&quot;</span>:<span style="color: #BA2121">&quot;Canon PIXMA MP500 All-In-One Photo Printer&quot;</span>,
+            <span style="color: #008000; font-weight: bold">&quot;price&quot;</span>:<span style="color: #666666">179.99</span>},
+          {
+            <span style="color: #008000; font-weight: bold">&quot;name&quot;</span>:<span style="color: #BA2121">&quot;ASUS Extreme N7800GTX/2DHTV (256 MB)&quot;</span>,
+            <span style="color: #008000; font-weight: bold">&quot;price&quot;</span>:<span style="color: #666666">479.95</span>}]
+      }
+    }
+  }
+}</code></pre>
 </div>
 </div>
 <div class="paragraph">
@@ -1700,7 +1709,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/rule-based-authorization-plugin.html
==============================================================================
--- websites/production/lucene/content/solr/guide/test-10290/rule-based-authorization-plugin.html (original)
+++ websites/production/lucene/content/solr/guide/test-10290/rule-based-authorization-plugin.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 allows configuring roles to control user access to the system. This is accomplished through rule-based permission definitions which are assigned to users. The roles are fully customizable, and provide the ability to limit access to specific collections, request handlers, request parameters, and request methods.</p>
+<p>Solr allows configuring roles to control user access to the system.</p>
+</div>
+<div class="paragraph">
+<p>This is accomplished through rule-based permission definitions which are assigned to users. The roles are fully customizable, and provide the ability to limit access to specific collections, request handlers, request parameters, and request methods.</p>
 </div>
 <div class="paragraph">
 <p>The roles can be used with any of the authentication plugins or with a custom authentication plugin if you have created one. You will only need to ensure that you configure the role-to-user mappings with the proper user IDs that your authentication system provides.</p>
@@ -1294,7 +1297,7 @@ $('#toc').on('click', 'a', function() {
 <h2 id="Rule-BasedAuthorizationPlugin-EnabletheAuthorizationPlugin">Enable the Authorization Plugin</h2>
 <div class="sectionbody">
 <div class="paragraph">
-<p>The plugin must be enabled in <code>security.json</code>. This file and where to put it in your system is described in detail in the section <a href="authentication-and-authorization-plugins.html#AuthenticationandAuthorizationPlugins-EnabledPluginswithsecurity.json">Enable Plugins with security.json</a>.</p>
+<p>The plugin must be enabled in <code>security.json</code>. This file and where to put it in your system is described in detail in the section <a href="authentication-and-authorization-plugins.html#AuthenticationandAuthorizationPlugins-EnablePluginswithsecurity.json">Enable Plugins with security.json</a>.</p>
 </div>
 <div class="paragraph">
 <p>This file has two parts, the <code>authentication</code> part and the <code>authorization</code> part. The <code>authentication</code> part stores information about the class being used for authentication.</p>
@@ -1316,8 +1319,8 @@ $('#toc').on('click', 'a', function() {
 <span style="color: #008000; font-weight: bold">&quot;authorization&quot;</span>:{
    <span style="color: #008000; font-weight: bold">&quot;class&quot;</span>:<span style="color: #BA2121">&quot;solr.RuleBasedAuthorizationPlugin&quot;</span>,
    <span style="color: #008000; font-weight: bold">&quot;permissions&quot;</span>:[{<span style="color: #008000; font-weight: bold">&quot;name&quot;</span>:<span style="color: #BA2121">&quot;security-edit&quot;</span>,
-      <span style="color: #008000; font-weight: bold">&quot;role&quot;</span>:<span style="color: #BA2121">&quot;admin&quot;</span>}]
-   <span style="color: #BA2121">&quot;user-role&quot;</span>:{<span style="color: #008000; font-weight: bold">&quot;solr&quot;</span>:<span style="color: #BA2121">&quot;admin&quot;</span>}
+      <span style="color: #008000; font-weight: bold">&quot;role&quot;</span>:<span style="color: #BA2121">&quot;admin&quot;</span>}],
+   <span style="color: #008000; font-weight: bold">&quot;user-role&quot;</span>:{<span style="color: #008000; font-weight: bold">&quot;solr&quot;</span>:<span style="color: #BA2121">&quot;admin&quot;</span>}
 }}</code></pre>
 </div>
 </div>
@@ -1517,8 +1520,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>
@@ -1559,12 +1562,12 @@ $('#toc').on('click', 'a', function() {
 <div class="listingblock">
 <div class="content">
 <pre class="pygments highlight"><code data-lang="json"><span style="color: #BA2121">&quot;params&quot;</span><span style="border: 1px solid #FF0000">:</span> {
-   <span style="color: #008000; font-weight: bold">&quot;action&quot;</span>: [<span style="border: 1px solid #FF0000">LIST</span>, <span style="border: 1px solid #FF0000">CLUSTERSTATUS</span>]
+   <span style="color: #008000; font-weight: bold">&quot;action&quot;</span>: [<span style="color: #BA2121">&quot;LIST&quot;</span>, <span style="color: #BA2121">&quot;CLUSTERSTATUS&quot;</span>]
 }</code></pre>
 </div>
 </div>
 <div class="paragraph">
-<p>The value of the parameter can be a simple string or it could be a regular expression. use the prefix <code>REGEX:</code> to use a regular expression match instead of a string identity match</p>
+<p>The value of the parameter can be a simple string or it could be a regular expression. Use the prefix <code>REGEX:</code> to use a regular expression match instead of a string identity match</p>
 </div>
 <div class="paragraph">
 <p>If the commands LIST and CLUSTERSTATUS are case insensitive, the above example should be as follows</p>
@@ -1602,7 +1605,7 @@ $('#toc').on('click', 'a', function() {
 </div>
 </div>
 <div class="paragraph">
-<p>Apply an update permission on all collections to a role called &#8216;dev&#8217; and read permissions to a role called &#8216;guest&#8217;:</p>
+<p>Apply an update permission on all collections to a role called <code>dev</code> and read permissions to a role called <code>guest</code>:</p>
 </div>
 <div class="listingblock">
 <div class="content">
@@ -1708,7 +1711,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/rule-based-replica-placement.html
==============================================================================
--- websites/production/lucene/content/solr/guide/test-10290/rule-based-replica-placement.html (original)
+++ websites/production/lucene/content/solr/guide/test-10290/rule-based-replica-placement.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>When Solr needs to assign nodes to collections, it can either automatically assign them randomly or the user can specify a set of nodes where it should create the replicas. With very large clusters, it is hard to specify exact node names and it still does not give you fine grained control over how nodes are chosen for a shard. The user should be in complete control of where the nodes are allocated for each collection, shard and replica. This helps to optimally allocate hardware resources across the cluster.</p>
+<p>When Solr needs to assign nodes to collections, it can either automatically assign them randomly or the user can specify a set of nodes where it should create the replicas.</p>
+</div>
+<div class="paragraph">
+<p>With very large clusters, it is hard to specify exact node names and it still does not give you fine grained control over how nodes are chosen for a shard. The user should be in complete control of where the nodes are allocated for each collection, shard and replica. This helps to optimally allocate hardware resources across the cluster.</p>
 </div>
 <div class="paragraph">
 <p>Rule-based replica assignment allows the creation of rules to determine the placement of replicas in the cluster. In the future, this feature will help to automatically add or remove replicas when systems go down, or when higher throughput is required. This enables a more hands-off approach to administration of the cluster.</p>
@@ -1342,8 +1345,6 @@ $('#toc').on('click', 'a', function() {
 <div class="paragraph">
 <p>A rule is a set of conditions that a node must satisfy before a replica core can be created there.</p>
 </div>
-<div class="sect2">
-<h3 id="Rule-basedReplicaPlacement-RuleConditions.1">Rule Conditions</h3>
 <div class="paragraph">
 <p>There are three possible conditions.</p>
 </div>
@@ -1356,11 +1357,10 @@ $('#toc').on('click', 'a', function() {
 <p><strong>replica</strong>: this can be a number or a wild-card (* means any number zero to infinity).</p>
 </li>
 <li>
-<p><strong>tag</strong>: this is an attribute of a node in the cluster that can be used in a rule, e.g. “freedisk”, “cores”, “rack”, “dc”, etc. The tag name can be a custom string. If creating a custom tag, a snitch is responsible for providing tags and values. The section <a href="#Rule-basedReplicaPlacement-Snitches">Snitches</a> below describes how to add a custom tag, and defines six pre-defined tags (cores, freedisk, host, port, node, and sysprop).</p>
+<p><strong>tag</strong>: this is an attribute of a node in the cluster that can be used in a rule, e.g., “freedisk”, “cores”, “rack”, “dc”, etc. The tag name can be a custom string. If creating a custom tag, a snitch is responsible for providing tags and values. The section <a href="#Rule-basedReplicaPlacement-Snitches">Snitches</a> below describes how to add a custom tag, and defines six pre-defined tags (cores, freedisk, host, port, node, and sysprop).</p>
 </li>
 </ul>
 </div>
-</div>
 <div class="sect2">
 <h3 id="Rule-basedReplicaPlacement-RuleOperators">Rule Operators</h3>
 <div class="paragraph">
@@ -1369,16 +1369,16 @@ $('#toc').on('click', 'a', function() {
 <div class="ulist">
 <ul>
 <li>
-<p><strong>equals (no operator required)</strong>: tag:x means tag value must be equal to ‘x’</p>
+<p><strong>equals (no operator required)</strong>: <code>tag:x</code> means tag value must be equal to ‘x’</p>
 </li>
 <li>
-<p><strong>greater than (&gt;)</strong>: tag:&gt;x means tag value greater than ‘x’. x must be a number</p>
+<p><strong>greater than (&gt;)</strong>: <code>tag:&gt;x</code> means tag value greater than ‘x’. x must be a number</p>
 </li>
 <li>
-<p><strong>less than (&lt;)</strong>: tag:&lt;x means tag value less than ‘x’. x must be a number</p>
+<p><strong>less than (&lt;)</strong>: <code>tag:&lt;x</code> means tag value less than ‘x’. x must be a number</p>
 </li>
 <li>
-<p><strong>not equal (!)</strong>: tag:!x means tag value MUST NOT be equal to ‘x’. The equals check is performed on String value</p>
+<p><strong>not equal (!)</strong>: <code>tag:!x</code> means tag value MUST NOT be equal to ‘x’. The equals check is performed on String value</p>
 </li>
 </ul>
 </div>
@@ -1487,8 +1487,8 @@ $('#toc').on('click', 'a', function() {
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="pygments highlight"><code data-lang="bash">replica:&lt;<span style="color: #666666">2</span>,node:*
-// this is equivalent to replica:&lt;<span style="color: #666666">2</span>,node:*,shard:**. We can omit shard:** because ** is the default value of shard</code></pre>
+<pre class="pygments highlight"><code data-lang="text">replica:&lt;2,node:*
+// this is equivalent to replica:&lt;2,node:*,shard:**. We can omit shard:** because ** is the default value of shard</code></pre>
 </div>
 </div>
 </div>
@@ -1606,7 +1606,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/running-solr-on-hdfs.html
==============================================================================
--- websites/production/lucene/content/solr/guide/test-10290/running-solr-on-hdfs.html (original)
+++ websites/production/lucene/content/solr/guide/test-10290/running-solr-on-hdfs.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 has support for writing and reading its index and transaction log files to the HDFS distributed filesystem. This does not use Hadoop MapReduce to process Solr data, rather it only uses the HDFS filesystem for index and transaction log file storage. To use Hadoop MapReduce to process Solr data, see the MapReduceIndexerTool in the Solr contrib area.</p>
+<p>Solr has support for writing and reading its index and transaction log files to the HDFS distributed filesystem.</p>
+</div>
+<div class="paragraph">
+<p>This does not use Hadoop MapReduce to process Solr data, rather it only uses the HDFS filesystem for index and transaction log file storage. To use Hadoop MapReduce to process Solr data, see the MapReduceIndexerTool in the Solr contrib area.</p>
 </div>
 <div class="paragraph">
 <p>To use HDFS rather than a local filesystem, you must be using Hadoop 2.x and you will need to instruct Solr to use the <code>HdfsDirectoryFactory</code>. There are also several additional parameters to define. These can be set in one of three ways:</p>
@@ -1306,12 +1309,12 @@ $('#toc').on('click', 'a', function() {
 <div class="sect2">
 <h3 id="RunningSolronHDFS-StandaloneSolrInstances">Standalone Solr Instances</h3>
 <div class="paragraph">
-<p>For standalone Solr instances, there are a few parameters you should be sure to modify before starting Solr. These can be set in <code>solrconfig.xml</code>(more on that <a href="#RunningSolronHDFS-Settings">below</a>), or passed to the <code>bin/solr</code> script at startup.</p>
+<p>For standalone Solr instances, there are a few parameters you should be sure to modify before starting Solr. These can be set in <code>solrconfig.xml</code>(more on that <a href="#RunningSolronHDFS-HdfsDirectoryFactoryParameters">below</a>), or passed to the <code>bin/solr</code> script at startup.</p>
 </div>
 <div class="ulist">
 <ul>
 <li>
-<p>You need to use an HdfsDirectoryFactory and a data dir of the form <code>hdfs://host:port/path</code></p>
+<p>You need to use an <code>HdfsDirectoryFactory</code> and a data dir of the form <code>hdfs://host:port/path</code></p>
 </li>
 <li>
 <p>You need to specify an UpdateLog location of the form <code>hdfs://host:port/path</code></p>
@@ -1326,14 +1329,14 @@ $('#toc').on('click', 'a', function() {
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="pygments highlight"><code data-lang="java">bin<span style="color: #666666">/</span>solr start <span style="color: #666666">-</span>Dsolr<span style="color: #666666">.</span><span style="color: #7D9029">directoryFactory</span><span style="color: #666666">=</span>HdfsDirectoryFactory
-     <span style="color: #666666">-</span>Dsolr<span style="color: #666666">.</span><span style="color: #7D9029">lock</span><span style="color: #666666">.</span><span style="color: #7D9029">type</span><span style="color: #666666">=</span>hdfs
-     <span style="color: #666666">-</span>Dsolr<span style="color: #666666">.</span><span style="color: #7D9029">data</span><span style="color: #666666">.</span><span style="color: #7D9029">dir</span><span style="color: #666666">=</span>hdfs<span style="color: #666666">:</span><span style="color: #408080; font-style: italic">//host:port/path</span>
-     <span style="color: #666666">-</span>Dsolr<span style="color: #666666">.</span><span style="color: #7D9029">updatelog</span><span style="color: #666666">=</span>hdfs<span style="color: #666666">:</span><span style="color: #408080; font-style: italic">//host:port/path</span></code></pre>
+<pre class="pygments highlight"><code data-lang="bash">bin/solr start -Dsolr.directoryFactory<span style="color: #666666">=</span>HdfsDirectoryFactory
+     -Dsolr.lock.type<span style="color: #666666">=</span>hdfs
+     -Dsolr.data.dir<span style="color: #666666">=</span>hdfs://host:port/path
+     -Dsolr.updatelog<span style="color: #666666">=</span>hdfs://host:port/path</code></pre>
 </div>
 </div>
 <div class="paragraph">
-<p>This example will start Solr in standalone mode, using the defined JVM properties (explained in more detail <a href="#RunningSolronHDFS-Settings">below</a>).</p>
+<p>This example will start Solr in standalone mode, using the defined JVM properties (explained in more detail <a href="#RunningSolronHDFS-HdfsDirectoryFactoryParameters">below</a>).</p>
 </div>
 </div>
 <div class="sect2">
@@ -1353,9 +1356,9 @@ $('#toc').on('click', 'a', function() {
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="pygments highlight"><code data-lang="java">bin<span style="color: #666666">/</span>solr start <span style="color: #666666">-</span>c <span style="color: #666666">-</span>Dsolr<span style="color: #666666">.</span><span style="color: #7D9029">directoryFactory</span><span style="color: #666666">=</span>HdfsDirectoryFactory
-     <span style="color: #666666">-</span>Dsolr<span style="color: #666666">.</span><span style="color: #7D9029">lock</span><span style="color: #666666">.</span><span style="color: #7D9029">type</span><span style="color: #666666">=</span>hdfs
-     <span style="color: #666666">-</span>Dsolr<span style="color: #666666">.</span><span style="color: #7D9029">hdfs</span><span style="color: #666666">.</span><span style="color: #7D9029">home</span><span style="color: #666666">=</span>hdfs<span style="color: #666666">:</span><span style="color: #408080; font-style: italic">//host:port/path</span></code></pre>
+<pre class="pygments highlight"><code data-lang="bash">bin/solr start -c -Dsolr.directoryFactory<span style="color: #666666">=</span>HdfsDirectoryFactory
+     -Dsolr.lock.type<span style="color: #666666">=</span>hdfs
+     -Dsolr.hdfs.home<span style="color: #666666">=</span>hdfs://host:port/path</code></pre>
 </div>
 </div>
 <div class="paragraph">
@@ -1372,10 +1375,10 @@ $('#toc').on('click', 'a', function() {
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="pygments highlight"><code data-lang="java"><span style="border: 1px solid #FF0000">#</span> Set HDFS DirectoryFactory <span style="color: #666666">&amp;</span> Settings
-<span style="color: #666666">-</span>Dsolr<span style="color: #666666">.</span><span style="color: #7D9029">directoryFactory</span><span style="color: #666666">=</span>HdfsDirectoryFactory <span style="border: 1px solid #FF0000">\</span>
-<span style="color: #666666">-</span>Dsolr<span style="color: #666666">.</span><span style="color: #7D9029">lock</span><span style="color: #666666">.</span><span style="color: #7D9029">type</span><span style="color: #666666">=</span>hdfs <span style="border: 1px solid #FF0000">\</span>
-<span style="color: #666666">-</span>Dsolr<span style="color: #666666">.</span><span style="color: #7D9029">hdfs</span><span style="color: #666666">.</span><span style="color: #7D9029">home</span><span style="color: #666666">=</span>hdfs<span style="color: #666666">:</span><span style="color: #408080; font-style: italic">//host:port/path \</span></code></pre>
+<pre class="pygments highlight"><code data-lang="bash"><span style="color: #408080; font-style: italic"># Set HDFS DirectoryFactory &amp; Settings</span>
+-Dsolr.directoryFactory<span style="color: #666666">=</span>HdfsDirectoryFactory <span style="color: #BB6622; font-weight: bold">\</span>
+-Dsolr.lock.type<span style="color: #666666">=</span>hdfs <span style="color: #BB6622; font-weight: bold">\</span>
+-Dsolr.hdfs.home<span style="color: #666666">=</span>hdfs://host:port/path <span style="color: #BB6622; font-weight: bold">\</span></code></pre>
 </div>
 </div>
 </div>
@@ -1389,7 +1392,7 @@ $('#toc').on('click', 'a', function() {
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="pygments highlight"><code data-lang="java"><span style="color: #666666">-</span>XX<span style="color: #666666">:</span>MaxDirectMemorySize<span style="color: #666666">=20</span>g</code></pre>
+<pre class="pygments highlight"><code data-lang="bash">-XX:MaxDirectMemorySize<span style="color: #666666">=</span>20g</code></pre>
 </div>
 </div>
 </div>
@@ -1404,10 +1407,10 @@ $('#toc').on('click', 'a', function() {
 <h3 id="RunningSolronHDFS-SolrHDFSSettings">Solr HDFS Settings</h3>
 <table class="tableblock frame-all grid-all spread">
 <colgroup>
-<col style="width: 25%;">
-<col style="width: 25%;">
-<col style="width: 25%;">
-<col style="width: 25%;">
+<col style="width: 20%;">
+<col style="width: 30%;">
+<col style="width: 10%;">
+<col style="width: 40%;">
 </colgroup>
 <thead>
 <tr>
@@ -1431,9 +1434,9 @@ $('#toc').on('click', 'a', function() {
 <h3 id="RunningSolronHDFS-BlockCacheSettings">Block Cache Settings</h3>
 <table class="tableblock frame-all grid-all spread">
 <colgroup>
-<col style="width: 34%;">
-<col style="width: 33%;">
-<col style="width: 33%;">
+<col style="width: 30%;">
+<col style="width: 10%;">
+<col style="width: 60%;">
 </colgroup>
 <thead>
 <tr>
@@ -1464,11 +1467,7 @@ $('#toc').on('click', 'a', function() {
 <td class="tableblock halign-left valign-top"><p class="tableblock">Number of memory slabs to allocate. Each slab is 128 MB in size.</p></td>
 </tr>
 <tr>
-<td class="tableblock halign-left valign-top"><div><div class="literalblock">
-<div class="content">
-<pre>solr.hdfs.blockcache.global</pre>
-</div>
-</div></div></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock"><code>solr.hdfs.blockcache.global</code></p></td>
 <td class="tableblock halign-left valign-top"><p class="tableblock">true</p></td>
 <td class="tableblock halign-left valign-top"><p class="tableblock">Enable/Disable using one global cache for all SolrCores. The settings used will be from the first HdfsDirectoryFactory created.</p></td>
 </tr>
@@ -1479,9 +1478,9 @@ $('#toc').on('click', 'a', function() {
 <h3 id="RunningSolronHDFS-NRTCachingDirectorySettings">NRTCachingDirectory Settings</h3>
 <table class="tableblock frame-all grid-all spread">
 <colgroup>
-<col style="width: 34%;">
-<col style="width: 33%;">
-<col style="width: 33%;">
+<col style="width: 30%;">
+<col style="width: 10%;">
+<col style="width: 60%;">
 </colgroup>
 <thead>
 <tr>
@@ -1516,9 +1515,9 @@ $('#toc').on('click', 'a', function() {
 </div>
 <table class="tableblock frame-all grid-all spread">
 <colgroup>
-<col style="width: 34%;">
-<col style="width: 33%;">
-<col style="width: 33%;">
+<col style="width: 30%;">
+<col style="width: 10%;">
+<col style="width: 60%;">
 </colgroup>
 <thead>
 <tr>
@@ -1543,9 +1542,9 @@ $('#toc').on('click', 'a', function() {
 </div>
 <table class="tableblock frame-all grid-all spread">
 <colgroup>
-<col style="width: 34%;">
-<col style="width: 33%;">
-<col style="width: 33%;">
+<col style="width: 30%;">
+<col style="width: 10%;">
+<col style="width: 60%;">
 </colgroup>
 <thead>
 <tr>
@@ -1588,17 +1587,17 @@ $('#toc').on('click', 'a', function() {
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="pygments highlight"><code data-lang="java"><span style="color: #666666">&lt;</span>directoryFactory name<span style="color: #666666">=</span><span style="color: #BA2121">&quot;DirectoryFactory&quot;</span> class<span style="color: #666666">=</span><span style="color: #BA2121">&quot;solr.HdfsDirectoryFactory&quot;</span><span style="color: #666666">&gt;</span>
-  <span style="color: #666666">&lt;</span>str name<span style="color: #666666">=</span><span style="color: #BA2121">&quot;solr.hdfs.home&quot;</span><span style="color: #666666">&gt;</span>hdfs<span style="color: #666666">:</span><span style="color: #408080; font-style: italic">//host:port/solr&lt;/str&gt;</span>
-  <span style="color: #666666">&lt;</span>bool name<span style="color: #666666">=</span><span style="color: #BA2121">&quot;solr.hdfs.blockcache.enabled&quot;</span><span style="color: #666666">&gt;</span><span style="color: #008000; font-weight: bold">true</span><span style="color: #666666">&lt;/</span>bool<span style="color: #666666">&gt;</span>
-  <span style="color: #666666">&lt;</span><span style="color: #B00040">int</span> name<span style="color: #666666">=</span><span style="color: #BA2121">&quot;solr.hdfs.blockcache.slab.count&quot;</span><span style="color: #666666">&gt;1&lt;/</span><span style="color: #B00040">int</span><span style="color: #666666">&gt;</span>
-  <span style="color: #666666">&lt;</span>bool name<span style="color: #666666">=</span><span style="color: #BA2121">&quot;solr.hdfs.blockcache.direct.memory.allocation&quot;</span><span style="color: #666666">&gt;</span><span style="color: #008000; font-weight: bold">true</span><span style="color: #666666">&lt;/</span>bool<span style="color: #666666">&gt;</span>
-  <span style="color: #666666">&lt;</span><span style="color: #B00040">int</span> name<span style="color: #666666">=</span><span style="color: #BA2121">&quot;solr.hdfs.blockcache.blocksperbank&quot;</span><span style="color: #666666">&gt;16384&lt;/</span><span style="color: #B00040">int</span><span style="color: #666666">&gt;</span>
-  <span style="color: #666666">&lt;</span>bool name<span style="color: #666666">=</span><span style="color: #BA2121">&quot;solr.hdfs.blockcache.read.enabled&quot;</span><span style="color: #666666">&gt;</span><span style="color: #008000; font-weight: bold">true</span><span style="color: #666666">&lt;/</span>bool<span style="color: #666666">&gt;</span>
-  <span style="color: #666666">&lt;</span>bool name<span style="color: #666666">=</span><span style="color: #BA2121">&quot;solr.hdfs.nrtcachingdirectory.enable&quot;</span><span style="color: #666666">&gt;</span><span style="color: #008000; font-weight: bold">true</span><span style="color: #666666">&lt;/</span>bool<span style="color: #666666">&gt;</span>
-  <span style="color: #666666">&lt;</span><span style="color: #B00040">int</span> name<span style="color: #666666">=</span><span style="color: #BA2121">&quot;solr.hdfs.nrtcachingdirectory.maxmergesizemb&quot;</span><span style="color: #666666">&gt;16&lt;/</span><span style="color: #B00040">int</span><span style="color: #666666">&gt;</span>
-  <span style="color: #666666">&lt;</span><span style="color: #B00040">int</span> name<span style="color: #666666">=</span><span style="color: #BA2121">&quot;solr.hdfs.nrtcachingdirectory.maxcachedmb&quot;</span><span style="color: #666666">&gt;192&lt;/</span><span style="color: #B00040">int</span><span style="color: #666666">&gt;</span>
-<span style="color: #666666">&lt;/</span>directoryFactory<span style="color: #666666">&gt;</span></code></pre>
+<pre class="pygments highlight"><code data-lang="xml"><span style="color: #008000; font-weight: bold">&lt;directoryFactory</span> <span style="color: #7D9029">name=</span><span style="color: #BA2121">&quot;DirectoryFactory&quot;</span> <span style="color: #7D9029">class=</span><span style="color: #BA2121">&quot;solr.HdfsDirectoryFactory&quot;</span><span style="color: #008000; font-weight: bold">&gt;</span>
+  <span style="color: #008000; font-weight: bold">&lt;str</span> <span style="color: #7D9029">name=</span><span style="color: #BA2121">&quot;solr.hdfs.home&quot;</span><span style="color: #008000; font-weight: bold">&gt;</span>hdfs://host:port/solr<span style="color: #008000; font-weight: bold">&lt;/str&gt;</span>
+  <span style="color: #008000; font-weight: bold">&lt;bool</span> <span style="color: #7D9029">name=</span><span style="color: #BA2121">&quot;solr.hdfs.blockcache.enabled&quot;</span><span style="color: #008000; font-weight: bold">&gt;</span>true<span style="color: #008000; font-weight: bold">&lt;/bool&gt;</span>
+  <span style="color: #008000; font-weight: bold">&lt;int</span> <span style="color: #7D9029">name=</span><span style="color: #BA2121">&quot;solr.hdfs.blockcache.slab.count&quot;</span><span style="color: #008000; font-weight: bold">&gt;</span>1<span style="color: #008000; font-weight: bold">&lt;/int&gt;</span>
+  <span style="color: #008000; font-weight: bold">&lt;bool</span> <span style="color: #7D9029">name=</span><span style="color: #BA2121">&quot;solr.hdfs.blockcache.direct.memory.allocation&quot;</span><span style="color: #008000; font-weight: bold">&gt;</span>true<span style="color: #008000; font-weight: bold">&lt;/bool&gt;</span>
+  <span style="color: #008000; font-weight: bold">&lt;int</span> <span style="color: #7D9029">name=</span><span style="color: #BA2121">&quot;solr.hdfs.blockcache.blocksperbank&quot;</span><span style="color: #008000; font-weight: bold">&gt;</span>16384<span style="color: #008000; font-weight: bold">&lt;/int&gt;</span>
+  <span style="color: #008000; font-weight: bold">&lt;bool</span> <span style="color: #7D9029">name=</span><span style="color: #BA2121">&quot;solr.hdfs.blockcache.read.enabled&quot;</span><span style="color: #008000; font-weight: bold">&gt;</span>true<span style="color: #008000; font-weight: bold">&lt;/bool&gt;</span>
+  <span style="color: #008000; font-weight: bold">&lt;bool</span> <span style="color: #7D9029">name=</span><span style="color: #BA2121">&quot;solr.hdfs.nrtcachingdirectory.enable&quot;</span><span style="color: #008000; font-weight: bold">&gt;</span>true<span style="color: #008000; font-weight: bold">&lt;/bool&gt;</span>
+  <span style="color: #008000; font-weight: bold">&lt;int</span> <span style="color: #7D9029">name=</span><span style="color: #BA2121">&quot;solr.hdfs.nrtcachingdirectory.maxmergesizemb&quot;</span><span style="color: #008000; font-weight: bold">&gt;</span>16<span style="color: #008000; font-weight: bold">&lt;/int&gt;</span>
+  <span style="color: #008000; font-weight: bold">&lt;int</span> <span style="color: #7D9029">name=</span><span style="color: #BA2121">&quot;solr.hdfs.nrtcachingdirectory.maxcachedmb&quot;</span><span style="color: #008000; font-weight: bold">&gt;</span>192<span style="color: #008000; font-weight: bold">&lt;/int&gt;</span>
+<span style="color: #008000; font-weight: bold">&lt;/directoryFactory&gt;</span></code></pre>
 </div>
 </div>
 <div class="paragraph">
@@ -1606,12 +1605,12 @@ $('#toc').on('click', 'a', function() {
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="pygments highlight"><code data-lang="java"><span style="color: #666666">&lt;</span>directoryFactory name<span style="color: #666666">=</span><span style="color: #BA2121">&quot;DirectoryFactory&quot;</span> class<span style="color: #666666">=</span><span style="color: #BA2121">&quot;solr.HdfsDirectoryFactory&quot;</span><span style="color: #666666">&gt;</span>
-   <span style="color: #666666">...</span>
-  <span style="color: #666666">&lt;</span>bool name<span style="color: #666666">=</span><span style="color: #BA2121">&quot;solr.hdfs.security.kerberos.enabled&quot;</span><span style="color: #666666">&gt;</span><span style="color: #008000; font-weight: bold">true</span><span style="color: #666666">&lt;/</span>bool<span style="color: #666666">&gt;</span>
-  <span style="color: #666666">&lt;</span>str name<span style="color: #666666">=</span><span style="color: #BA2121">&quot;solr.hdfs.security.kerberos.keytabfile&quot;</span><span style="color: #666666">&gt;/</span>etc<span style="color: #666666">/</span>krb5<span style="color: #666666">.</span><span style="color: #7D9029">keytab</span><span style="color: #666666">&lt;/</span>str<span style="color: #666666">&gt;</span>
-  <span style="color: #666666">&lt;</span>str name<span style="color: #666666">=</span><span style="color: #BA2121">&quot;solr.hdfs.security.kerberos.principal&quot;</span><span style="color: #666666">&gt;</span>solr<span style="color: #666666">/</span>admin<span style="color: #AA22FF">@KERBEROS.COM</span><span style="color: #666666">&lt;/</span>str<span style="color: #666666">&gt;</span>
-<span style="color: #666666">&lt;/</span>directoryFactory<span style="color: #666666">&gt;</span></code></pre>
+<pre class="pygments highlight"><code data-lang="xml"><span style="color: #008000; font-weight: bold">&lt;directoryFactory</span> <span style="color: #7D9029">name=</span><span style="color: #BA2121">&quot;DirectoryFactory&quot;</span> <span style="color: #7D9029">class=</span><span style="color: #BA2121">&quot;solr.HdfsDirectoryFactory&quot;</span><span style="color: #008000; font-weight: bold">&gt;</span>
+   ...
+  <span style="color: #008000; font-weight: bold">&lt;bool</span> <span style="color: #7D9029">name=</span><span style="color: #BA2121">&quot;solr.hdfs.security.kerberos.enabled&quot;</span><span style="color: #008000; font-weight: bold">&gt;</span>true<span style="color: #008000; font-weight: bold">&lt;/bool&gt;</span>
+  <span style="color: #008000; font-weight: bold">&lt;str</span> <span style="color: #7D9029">name=</span><span style="color: #BA2121">&quot;solr.hdfs.security.kerberos.keytabfile&quot;</span><span style="color: #008000; font-weight: bold">&gt;</span>/etc/krb5.keytab<span style="color: #008000; font-weight: bold">&lt;/str&gt;</span>
+  <span style="color: #008000; font-weight: bold">&lt;str</span> <span style="color: #7D9029">name=</span><span style="color: #BA2121">&quot;solr.hdfs.security.kerberos.principal&quot;</span><span style="color: #008000; font-weight: bold">&gt;</span>solr/admin@KERBEROS.COM<span style="color: #008000; font-weight: bold">&lt;/str&gt;</span>
+<span style="color: #008000; font-weight: bold">&lt;/directoryFactory&gt;</span></code></pre>
 </div>
 </div>
 </div>
@@ -1627,9 +1626,9 @@ $('#toc').on('click', 'a', function() {
 </div>
 <table class="tableblock frame-all grid-all spread">
 <colgroup>
-<col style="width: 34%;">
-<col style="width: 33%;">
-<col style="width: 33%;">
+<col style="width: 40%;">
+<col style="width: 10%;">
+<col style="width: 50%;">
 </colgroup>
 <thead>
 <tr>
@@ -1666,7 +1665,7 @@ $('#toc').on('click', 'a', function() {
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="pygments highlight"><code data-lang="java"><span style="color: #A0A000">http:</span><span style="color: #408080; font-style: italic">//localhost:8983/solr/admin/collections?action=CLUSTERPROP&amp;name=autoAddReplicas&amp;val=false</span></code></pre>
+<pre class="pygments highlight"><code data-lang="text">http://localhost:8983/solr/admin/collections?action=CLUSTERPROP&amp;name=autoAddReplicas&amp;val=false</code></pre>
 </div>
 </div>
 <div class="paragraph">
@@ -1674,7 +1673,7 @@ $('#toc').on('click', 'a', function() {
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="pygments highlight"><code data-lang="java"><span style="color: #A0A000">http:</span><span style="color: #408080; font-style: italic">//localhost:8983/solr/admin/collections?action=CLUSTERPROP&amp;name=autoAddReplicas</span></code></pre>
+<pre class="pygments highlight"><code data-lang="text">http://localhost:8983/solr/admin/collections?action=CLUSTERPROP&amp;name=autoAddReplicas</code></pre>
 </div>
 </div>
 </div>
@@ -1716,7 +1715,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/running-solr.html
==============================================================================
--- websites/production/lucene/content/solr/guide/test-10290/running-solr.html (original)
+++ websites/production/lucene/content/solr/guide/test-10290/running-solr.html Tue May  9 19:22:29 2017
@@ -1426,15 +1426,13 @@ $('#toc').on('click', 'a', function() {
 <p>That&#8217;s it! Solr is running. If you need convincing, use a Web browser to see the Admin Console.</p>
 </div>
 <div class="paragraph">
-<p>` <a href="http://localhost:8983/solr/" class="bare">http://localhost:8983/solr/</a> `</p>
+<p><code>http://localhost:8983/solr/</code></p>
 </div>
 <div class="imageblock">
 <div class="content">
 <img src="images/running-solr/SolrAdminDashboard.png" alt="image" width="900" height="456">
 </div>
-</div>
-<div class="paragraph">
-<p><em>The Solr Admin interface.</em></p>
+<div class="title">Figure 1. The Solr Admin interface.</div>
 </div>
 <div class="paragraph">
 <p>If Solr is not running, your browser will complain that it cannot connect to the server. Check your port number and try again.</p>
@@ -1528,7 +1526,7 @@ Time spent: 0:00:00.153</code></pre>
 <p>For example, the following query searches all document fields for "video":</p>
 </div>
 <div class="paragraph">
-<p><code><a href="http://localhost:8983/solr/gettingstarted/select?q=video" class="bare">http://localhost:8983/solr/gettingstarted/select?q=video</a></code></p>
+<p><code>http://localhost:8983/solr/gettingstarted/select?q=video</code></p>
 </div>
 <div class="paragraph">
 <p>Notice how the URL includes the host name (<code>localhost</code>), the port number where the server is listening (<code>8983</code>), the application name (<code>solr</code>), the request handler for queries (<code>select</code>), and finally, the query itself (<code>q=video</code>).</p>
@@ -1543,27 +1541,25 @@ Time spent: 0:00:00.153</code></pre>
 <div class="content">
 <img src="images/running-solr/solr34_responseHeader.png" alt="image" width="600" height="634">
 </div>
-</div>
-<div class="paragraph">
-<p><em>An XML response to a query.</em></p>
+<div class="title">Figure 2. An XML response to a query.</div>
 </div>
 <div class="paragraph">
 <p>Once you have mastered the basic idea of a query, it is easy to add enhancements to explore the query syntax. This one is the same as before but the results only contain the ID, name, and price for each returned document. If you don&#8217;t specify which fields you want, all of them are returned.</p>
 </div>
 <div class="paragraph">
-<p><code><a href="http://localhost:8983/solr/gettingstarted/select?q=video&amp;fl=id,name,price" class="bare">http://localhost:8983/solr/gettingstarted/select?q=video&amp;fl=id,name,price</a></code></p>
+<p><code>http://localhost:8983/solr/gettingstarted/select?q=video&amp;fl=id,name,price</code></p>
 </div>
 <div class="paragraph">
 <p>Here is another example which searches for "black" in the <code>name</code> field only. If you do not tell Solr which field to search, it will search default fields, as specified in the schema.</p>
 </div>
 <div class="paragraph">
-<p><code><a href="http://localhost:8983/solr/gettingstarted/select?q=name:black" class="bare">http://localhost:8983/solr/gettingstarted/select?q=name:black</a></code></p>
+<p><code>http://localhost:8983/solr/gettingstarted/select?q=name:black</code></p>
 </div>
 <div class="paragraph">
 <p>You can provide ranges for fields. The following query finds every document whose price is between $0 and $400.</p>
 </div>
 <div class="paragraph">
-<p><code><a href="http://localhost:8983/solr/gettingstarted/select?q=price:">0%20TO%20400</a>&amp;fl=id,name,price</code></p>
+<p><code>http://localhost:8983/solr/gettingstarted/select?q=price:0%20TO%20400&amp;fl=id,name,price</code></p>
 </div>
 <div class="paragraph">
 <p><a href="faceting.html#faceting">Faceted browsing</a> is one of Solr&#8217;s key features. It allows users to narrow search results in ways that are meaningful to your application. For example, a shopping site could provide facets to narrow search results by manufacturer or price.</p>
@@ -1572,7 +1568,7 @@ Time spent: 0:00:00.153</code></pre>
 <p>Faceting information is returned as a third part of Solr&#8217;s query response. To get a taste of this power, take a look at the following query. It adds <code>facet=true</code> and <code>facet.field=cat</code>.</p>
 </div>
 <div class="paragraph">
-<p><code><a href="http://localhost:8983/solr/gettingstarted/select?q=price:">0%20TO%20400</a>&amp;fl=id,name,price&amp;facet=true&amp;facet.field=cat</code></p>
+<p><code>http://localhost:8983/solr/gettingstarted/select?q=price:0%20TO%20400&amp;fl=id,name,price&amp;facet=true&amp;facet.field=cat</code></p>
 </div>
 <div class="paragraph">
 <p>In addition to the familiar <code>responseHeader</code> and response from Solr, a <code>facet_counts</code> element is also present. Here is a view with the <code>responseHeader</code> and response collapsed so you can see the faceting information clearly.</p>
@@ -1624,7 +1620,7 @@ Time spent: 0:00:00.153</code></pre>
 <p>The facet information shows how many of the query results have each possible value of the <code>cat</code> field. You could easily use this information to provide users with a quick way to narrow their query results. You can filter results by adding one or more filter queries to the Solr request. This request constrains documents with a category of "software".</p>
 </div>
 <div class="paragraph">
-<p><code><a href="http://localhost:8983/solr/gettingstarted/select?q=price:0%20TO%20400&amp;fl=id,name,price&amp;facet=true&amp;facet.field=cat&amp;fq=cat:software" class="bare">http://localhost:8983/solr/gettingstarted/select?q=price:0%20TO%20400&amp;fl=id,name,price&amp;facet=true&amp;facet.field=cat&amp;fq=cat:software</a></code></p>
+<p><code>http://localhost:8983/solr/gettingstarted/select?q=price:0%20TO%20400&amp;fl=id,name,price&amp;facet=true&amp;facet.field=cat&amp;fq=cat:software</code></p>
 </div>
 </div>
 </div>
@@ -1664,7 +1660,7 @@ Time spent: 0:00:00.153</code></pre>
             <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/running-your-analyzer.html
==============================================================================
--- websites/production/lucene/content/solr/guide/test-10290/running-your-analyzer.html (original)
+++ websites/production/lucene/content/solr/guide/test-10290/running-your-analyzer.html Tue May  9 19:22:29 2017
@@ -1278,10 +1278,13 @@ $('#toc').on('click', 'a', function() {
 
 <div id="main-content">
   <div class="paragraph">
-<p>Once you&#8217;ve <a href="field-type-definitions-and-properties.html#field-type-definitions-and-properties">defined a field type in your Schema</a>, and specified the analysis steps that you want applied to it, you should test it out to make sure that it behaves the way you expect it to. Luckily, there is a very handy page in the Solr <a href="using-the-solr-administration-user-interface.html#using-the-solr-administration-user-interface">admin interface</a> that lets you do just that. You can invoke the analyzer for any text field, provide sample input, and display the resulting token stream.</p>
+<p>Once you&#8217;ve <a href="field-type-definitions-and-properties.html#field-type-definitions-and-properties">defined a field type in your Schema</a>, and specified the analysis steps that you want applied to it, you should test it out to make sure that it behaves the way you expect it to.</p>
 </div>
 <div class="paragraph">
-<p>For example, let&#8217;s look at some of the "Text" field types available in the &#8220;bin/solr -e techproducts&#8221; example configuration, and use the <a href="analysis-screen.html#analysis-screen">Analysis Screen</a> (<a href="http://localhost:8983/solr/#/techproducts/analysis" class="bare">http://localhost:8983/solr/#/techproducts/analysis</a>) to compare how the tokens produced at index time for the sentence &#8220;Running an Analyzer&#8221; match up with a slightly different query text of &#8220;run my analyzer&#8221;</p>
+<p>Luckily, there is a very handy page in the Solr <a href="using-the-solr-administration-user-interface.html#using-the-solr-administration-user-interface">admin interface</a> that lets you do just that. You can invoke the analyzer for any text field, provide sample input, and display the resulting token stream.</p>
+</div>
+<div class="paragraph">
+<p>For example, let&#8217;s look at some of the "Text" field types available in the <code>bin/solr -e techproducts</code> example configuration, and use the <a href="analysis-screen.html#analysis-screen">Analysis Screen</a> (<code>http://localhost:8983/solr/#/techproducts/analysis</code>) to compare how the tokens produced at index time for the sentence "Running an Analyzer" match up with a slightly different query text of "run my analyzer"</p>
 </div>
 <div class="paragraph">
 <p>We can begin with &#8220;<code>text_ws</code>&#8221; - one of the most simplified Text field types available:</p>
@@ -1295,7 +1298,7 @@ $('#toc').on('click', 'a', function() {
 <p>By looking at the start and end positions for each term, we can see that the only thing this field type does is tokenize text on whitespace. Notice in this image that the term "Running" has a start position of 0 and an end position of 7, while "an" has a start position of 8 and an end position of 10, and "Analyzer" starts at 11 and ends at 19. If the whitespace between the terms was also included, the count would be 21; since it is 19, we know that whitespace has been removed from this query.</p>
 </div>
 <div class="paragraph">
-<p>Note also that the indexed terms and the query terms are still very different. "Running" doesn&#8217;t match "run", "Analyzer" doesn&#8217;t match "analyzer" (to a computer), and obviously "an" and "my" are totally different words. If our objective is to allow queries like &#8220;run my analyzer&#8221; to match indexed text like &#8220;Running an Analyzer&#8221; then we will evidently need to pick a different field type with index &amp; query time text analysis that does more processing of the inputs.</p>
+<p>Note also that the indexed terms and the query terms are still very different. "Running" doesn&#8217;t match "run", "Analyzer" doesn&#8217;t match "analyzer" (to a computer), and obviously "an" and "my" are totally different words. If our objective is to allow queries like "run my analyzer" to match indexed text like "Running an Analyzer" then we will evidently need to pick a different field type with index &amp; query time text analysis that does more processing of the inputs.</p>
 </div>
 <div class="paragraph">
 <p>In particular we will want:</p>
@@ -1384,7 +1387,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>