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 [6/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/datadir-and-directoryfactory-in-solrconfig.html
==============================================================================
--- websites/production/lucene/content/solr/guide/test-10290/datadir-and-directoryfactory-in-solrconfig.html (original)
+++ websites/production/lucene/content/solr/guide/test-10290/datadir-and-directoryfactory-in-solrconfig.html Tue May  9 19:22:29 2017
@@ -1277,11 +1277,18 @@ $('#toc').on('click', 'a', function() {
     
 
 <div id="main-content">
-  <div class="sect1">
-<h2 id="DataDirandDirectoryFactoryinSolrConfig-SpecifyingaLocationforIndexDatawiththedataDirParameter">Specifying a Location for Index Data with the <code>dataDir</code> Parameter</h2>
+  <div id="preamble">
 <div class="sectionbody">
 <div class="paragraph">
-<p>By default, Solr stores its index data in a directory called <code>/data</code> under the core&#8217;s instanceDir. If you would like to specify a different directory for storing index data, you can configure dataDir in the core.properties file for the core, or use the <code>&lt;dataDir&gt;</code> parameter in the <code>solrconfig.xml</code> file. You can specify another directory either with a full pathname or a pathname relative to the instanceDir of the SolrCore. For example:</p>
+<p>Where and how Solr stores its indexes are configurable options.</p>
+</div>
+</div>
+</div>
+<div class="sect1">
+<h2 id="specifying-a-location-for-index-data-with-the-code-datadir-code-parameter">Specifying a Location for Index Data with the <code>dataDir</code> Parameter</h2>
+<div class="sectionbody">
+<div class="paragraph">
+<p>By default, Solr stores its index data in a directory called <code>/data</code> under the core&#8217;s instance directory (<code>instanceDir</code>). If you would like to specify a different directory for storing index data, you can configure the <code>dataDir</code> in the <code>core.properties</code> file for the core, or use the <code>&lt;dataDir&gt;</code> parameter in the <code>solrconfig.xml</code> file. You can specify another directory either with an absolute path or a pathname relative to the instanceDir of the SolrCore. For example:</p>
 </div>
 <div class="listingblock">
 <div class="content">
@@ -1289,7 +1296,7 @@ $('#toc').on('click', 'a', function() {
 </div>
 </div>
 <div class="paragraph">
-<p>$\{solr.core.name} will cause the name current core to be substituted, which results in each core&#8217;s data being kept in a separate subdirectory.</p>
+<p>The <code>${solr.core.name}</code> substitution will cause the name of the current core to be substituted, which results in each core&#8217;s data being kept in a separate subdirectory.</p>
 </div>
 <div class="paragraph">
 <p>If you are using replication to replicate the Solr index (as described in <a href="legacy-scaling-and-distribution.html#legacy-scaling-and-distribution">Legacy Scaling and Distribution</a>), then the <code>&lt;dataDir&gt;</code> directory should correspond to the index directory used in the replication configuration.</p>
@@ -1318,11 +1325,11 @@ $('#toc').on('click', 'a', function() {
 <pre class="pygments highlight"><code data-lang="xml"><span style="color: #008000; font-weight: bold">&lt;directoryFactory</span> <span style="color: #7D9029">class=</span><span style="color: #BA2121">&quot;org.apache.solr.core.RAMDirectoryFactory&quot;</span><span style="color: #008000; font-weight: bold">/&gt;</span></code></pre>
 </div>
 </div>
-<div class="admonitionblock important">
+<div class="admonitionblock note">
 <table>
 <tr>
 <td class="icon">
-<i class="fa icon-important" title="Important"></i>
+<i class="fa icon-note" title="Note"></i>
 </td>
 <td class="content">
 <div class="paragraph">
@@ -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/dataimport-screen.html
==============================================================================
--- websites/production/lucene/content/solr/guide/test-10290/dataimport-screen.html (original)
+++ websites/production/lucene/content/solr/guide/test-10290/dataimport-screen.html Tue May  9 19:22:29 2017
@@ -1284,9 +1284,13 @@ $('#toc').on('click', 'a', function() {
 <div class="content">
 <img src="images/dataimport-screen/dataimport.png" alt="image" width="485" height="250">
 </div>
+<div class="title">Figure 1. The Dataimport Screen</div>
 </div>
 <div class="paragraph">
-<p>This screen also lets you adjust various options to control how the data is imported to Solr, and view the data import configuration file that controls the import. For more information about data importing with DIH, see the section on <a href="uploading-structured-data-store-data-with-the-data-import-handler.html#uploading-structured-data-store-data-with-the-data-import-handler">Uploading Structured Data Store Data with the Data Import Handler</a>.</p>
+<p>This screen also lets you adjust various options to control how the data is imported to Solr, and view the data import configuration file that controls the import.</p>
+</div>
+<div class="paragraph">
+<p>For more information about data importing with DIH, see the section on <a href="uploading-structured-data-store-data-with-the-data-import-handler.html#uploading-structured-data-store-data-with-the-data-import-handler">Uploading Structured Data Store Data with the Data Import Handler</a>.</p>
 </div>
 </div>
 
@@ -1324,7 +1328,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/de-duplication.html
==============================================================================
--- websites/production/lucene/content/solr/guide/test-10290/de-duplication.html (original)
+++ websites/production/lucene/content/solr/guide/test-10290/de-duplication.html Tue May  9 19:22:29 2017
@@ -1280,12 +1280,15 @@ $('#toc').on('click', 'a', function() {
   <div id="preamble">
 <div class="sectionbody">
 <div class="paragraph">
-<p>Preventing duplicate or near duplicate documents from entering an index or tagging documents with a signature/fingerprint for duplicate field collapsing can be efficiently achieved with a low collision or fuzzy hash algorithm. Solr natively supports de-duplication techniques of this type via the <code>&lt;Signature&gt;</code> class and allows for the easy addition of new hash/signature implementations. A Signature can be implemented several ways:</p>
+<p>If duplicate, or near-duplicate documents are a concern in your index, de-duplication may be worth implementing.</p>
+</div>
+<div class="paragraph">
+<p>Preventing duplicate or near duplicate documents from entering an index or tagging documents with a signature/fingerprint for duplicate field collapsing can be efficiently achieved with a low collision or fuzzy hash algorithm. Solr natively supports de-duplication techniques of this type via the <code>Signature</code> class and allows for the easy addition of new hash/signature implementations. A Signature can be implemented several ways:</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>
@@ -1296,15 +1299,15 @@ $('#toc').on('click', 'a', function() {
 <tbody>
 <tr>
 <td class="tableblock halign-left valign-top"><p class="tableblock">MD5Signature</p></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock">128 bit hash used for exact duplicate detection.</p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">128-bit hash used for exact duplicate detection.</p></td>
 </tr>
 <tr>
 <td class="tableblock halign-left valign-top"><p class="tableblock">Lookup3Signature</p></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock">64 bit hash used for exact duplicate detection, much faster than MD5 and smaller to index</p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">64-bit hash used for exact duplicate detection. This is much faster than MD5 and smaller to index.</p></td>
 </tr>
 <tr>
 <td class="tableblock halign-left valign-top"><p class="tableblock"><a href="http://wiki.apache.org/solr/TextProfileSignature">TextProfileSignature</a></p></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock">Fuzzy hashing implementation from nutch for near duplicate detection. It&#8217;s tunable but works best on longer text.</p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">Fuzzy hashing implementation from Apache Nutch for near duplicate detection. It&#8217;s tunable but works best on longer text.</p></td>
 </tr>
 </tbody>
 </table>
@@ -1319,7 +1322,10 @@ $('#toc').on('click', 'a', function() {
 </td>
 <td class="content">
 <div class="paragraph">
-<p>Adding in the de-duplication process will change the <code>allowDups</code> setting so that it applies to an update Term (with <code>signatureField</code> in this case) rather than the unique field Term. Of course the <code>signatureField</code> could be the unique field, but generally you want the unique field to be unique. When a document is added, a signature will automatically be generated and attached to the document in the specified <code>signatureField</code>.</p>
+<p>Adding in the de-duplication process will change the <code>allowDups</code> setting so that it applies to an update term (with <code>signatureField</code> in this case) rather than the unique field Term.</p>
+</div>
+<div class="paragraph">
+<p>Of course the <code>signatureField</code> could be the unique field, but generally you want the unique field to be unique. When a document is added, a signature will automatically be generated and attached to the document in the specified <code>signatureField</code>.</p>
 </div>
 </td>
 </tr>
@@ -1358,9 +1364,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: 30%;">
+<col style="width: 50%;">
 </colgroup>
 <thead>
 <tr>
@@ -1416,7 +1422,7 @@ $('#toc').on('click', 'a', function() {
 <div class="sect2">
 <h3 id="De-Duplication-Inschema.xml">In <code>schema.xml</code></h3>
 <div class="paragraph">
-<p>If you are using a separate field for storing the signature you must have it indexed:</p>
+<p>If you are using a separate field for storing the signature, you must have it indexed:</p>
 </div>
 <div class="listingblock">
 <div class="content">
@@ -1437,7 +1443,7 @@ $('#toc').on('click', 'a', function() {
 </div>
 </div>
 <div class="paragraph">
-<p>(This example assumes you have other sections of your request handler defined.)</p>
+<p>This example assumes you have other sections of your request handler defined.</p>
 </div>
 <div class="admonitionblock tip">
 <table>
@@ -1492,7 +1498,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/defining-core-properties.html
==============================================================================
--- websites/production/lucene/content/solr/guide/test-10290/defining-core-properties.html (original)
+++ websites/production/lucene/content/solr/guide/test-10290/defining-core-properties.html Tue May  9 19:22:29 2017
@@ -1280,10 +1280,13 @@ $('#toc').on('click', 'a', function() {
   <div id="preamble">
 <div class="sectionbody">
 <div class="paragraph">
-<p>Core discovery means that creating a core is as simple as a <code>core.properties</code> file located on disk. The <code>core.properties</code> file is a simple Java Properties file where each line is just a key=value pair, e.g., <code>name=core1</code>. Notice that no quotes are required.</p>
+<p>Core discovery means that creating a core is as simple as a <code>core.properties</code> file located on disk.</p>
 </div>
 <div class="paragraph">
-<p>A minimal <code>core.properties</code> file looks like this (however, it can also be empty, see information on placement of <code>core.properties</code> below):</p>
+<p>The <code>core.properties</code> file is a simple Java Properties file where each line is just a key=value pair, e.g., <code>name=core1</code>. Notice that no quotes are required.</p>
+</div>
+<div class="paragraph">
+<p>A minimal <code>core.properties</code> file looks like the example below. However, it can also be empty, see information on placement of <code>core.properties</code> below.</p>
 </div>
 <div class="listingblock">
 <div class="content">
@@ -1322,7 +1325,7 @@ $('#toc').on('click', 'a', function() {
 <p>It is possible to segment Solr into multiple cores, each with its own configuration and indices. Cores may be dedicated to a single application or to very different ones, but all are administered through a common administration interface. You can create new Solr cores on the fly, shutdown cores, even replace one running core with another, all without ever stopping or restarting Solr.</p>
 </div>
 <div class="paragraph">
-<p>Your <code>core.properties</code> file can be empty if necessary. Suppose <code>core.properties</code> is located in <code>./cores/core1 ` (relative to `solr_home</code>) but is empty. In that case, the core name is assumed to be "core1". The instanceDir will be the folder containing <code>core.properties</code> (i.e., <code>./cores/core1</code>). The dataDir will be <code>../cores/core1/data</code>, etc.</p>
+<p>Your <code>core.properties</code> file can be empty if necessary. Suppose <code>core.properties</code> is located in <code>./cores/core1</code> (relative to <code>solr_home</code>) but is empty. In this case, the core name is assumed to be "core1". The instanceDir will be the folder containing <code>core.properties</code> (i.e., <code>./cores/core1</code>). The dataDir will be <code>../cores/core1/data</code>, etc.</p>
 </div>
 <div class="admonitionblock note">
 <table>
@@ -1347,15 +1350,15 @@ $('#toc').on('click', 'a', function() {
 <p>The minimal <code>core.properties</code> file is an empty file, in which case all of the properties are defaulted appropriately.</p>
 </div>
 <div class="paragraph">
-<p>Java properties files allow the hash ("#") or bang ("!") characters to specify comment-to-end-of-line.</p>
+<p>Java properties files allow the hash (<code>#</code>) or bang (<code>!</code>) characters to specify comment-to-end-of-line.</p>
 </div>
 <div class="paragraph">
 <p>This table defines the recognized properties:</p>
 </div>
 <table class="tableblock frame-all grid-all spread">
 <colgroup>
-<col style="width: 50%;">
-<col style="width: 50%;">
+<col style="width: 25%;">
+<col style="width: 75%;">
 </colgroup>
 <thead>
 <tr>
@@ -1459,7 +1462,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/defining-fields.html
==============================================================================
--- websites/production/lucene/content/solr/guide/test-10290/defining-fields.html (original)
+++ websites/production/lucene/content/solr/guide/test-10290/defining-fields.html Tue May  9 19:22:29 2017
@@ -1284,8 +1284,9 @@ $('#toc').on('click', 'a', function() {
 </div>
 </div>
 </div>
-<div class="sect2">
-<h3 id="DefiningFields-Example">Example</h3>
+<div class="sect1">
+<h2 id="DefiningFields-Example">Example</h2>
+<div class="sectionbody">
 <div class="paragraph">
 <p>The following example defines a field named <code>price</code> with a type named <code>float</code> and a default value of <code>0.0</code>; the <code>indexed</code> and <code>stored</code> properties are explicitly set to <code>true</code>, while any other properties specified on the <code>float</code> field type are inherited.</p>
 </div>
@@ -1295,12 +1296,14 @@ $('#toc').on('click', 'a', function() {
 </div>
 </div>
 </div>
-<div class="sect2">
-<h3 id="DefiningFields-FieldProperties">Field Properties</h3>
+</div>
+<div class="sect1">
+<h2 id="DefiningFields-FieldProperties">Field Properties</h2>
+<div class="sectionbody">
 <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>
@@ -1311,11 +1314,11 @@ $('#toc').on('click', 'a', function() {
 <tbody>
 <tr>
 <td class="tableblock halign-left valign-top"><p class="tableblock">name</p></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock">The name of the field. Field names should consist of alphanumeric or underscore characters only and not start with a digit. This is not currently strictly enforced, but other field names will not have first class support from all components and back compatibility is not guaranteed. Names with both leading and trailing underscores (e.g. <code><em>version</em></code>) are reserved. Every field must have a <code>name</code>.</p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">The name of the field. Field names should consist of alphanumeric or underscore characters only and not start with a digit. This is not currently strictly enforced, but other field names will not have first class support from all components and back compatibility is not guaranteed. Names with both leading and trailing underscores (e.g., <code>_version_</code>) are reserved. Every field must have a <code>name</code>.</p></td>
 </tr>
 <tr>
 <td class="tableblock halign-left valign-top"><p class="tableblock">type</p></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock">The name of the <code>fieldType</code> for this field. This will be found in the &#8220;<code>name</code>&#8221; attribute on the <code>fieldType</code> definition. Every field must have a <code>type</code>.</p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">The name of the <code>fieldType</code> for this field. This will be found in the <code>name</code> attribute on the <code>fieldType</code> definition. Every field must have a <code>type</code>.</p></td>
 </tr>
 <tr>
 <td class="tableblock halign-left valign-top"><p class="tableblock">default</p></td>
@@ -1324,17 +1327,19 @@ $('#toc').on('click', 'a', function() {
 </tbody>
 </table>
 </div>
-<div class="sect2">
-<h3 id="DefiningFields-OptionalFieldTypeOverrideProperties">Optional Field Type Override Properties</h3>
+</div>
+<div class="sect1">
+<h2 id="DefiningFields-OptionalFieldTypeOverrideProperties">Optional Field Type Override Properties</h2>
+<div class="sectionbody">
 <div class="paragraph">
-<p>Fields can have many of the same properties as field types. Properties from the table below which are specified on an individual field will override any explicit value for that property specified on the the <code>&lt;fieldType/&gt;</code> of the field, or any implicit default property value provided by the underlying <code>FieldType</code> implementation. The table below is reproduced from <a href="field-type-definitions-and-properties.html#field-type-definitions-and-properties">Field Type Definitions and Properties</a>, which has more details:</p>
+<p>Fields can have many of the same properties as field types. Properties from the table below which are specified on an individual field will override any explicit value for that property specified on the the <code>fieldType</code> of the field, or any implicit default property value provided by the underlying <code>fieldType</code> implementation. The table below is reproduced from <a href="field-type-definitions-and-properties.html#field-type-definitions-and-properties">Field Type Definitions and Properties</a>, which has more details:</p>
 </div>
 <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: 40%;">
+<col style="width: 20%;">
+<col style="width: 20%;">
 </colgroup>
 <thead>
 <tr>
@@ -1359,7 +1364,7 @@ $('#toc').on('click', 'a', function() {
 </tr>
 <tr>
 <td class="tableblock halign-left valign-top"><p class="tableblock">docValues</p></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock">If true, the value of the field will be put in a column-oriented <a href="https://cwiki.apache.org/confluence/display/solr/DocValues">DocValues</a> structure.</p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">If true, the value of the field will be put in a column-oriented <a href="docvalues.html#docvalues">DocValues</a> structure.</p></td>
 <td class="tableblock halign-left valign-top"><p class="tableblock">true or false</p></td>
 <td class="tableblock halign-left valign-top"><p class="tableblock">false</p></td>
 </tr>
@@ -1407,7 +1412,7 @@ $('#toc').on('click', 'a', function() {
 </tr>
 <tr>
 <td class="tableblock halign-left valign-top"><p class="tableblock">useDocValuesAsStored</p></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock">If the field has <a href="https://cwiki.apache.org/confluence/display/solr/DocValues">docValues</a> enabled, setting this to true would allow the field to be returned as if it were a stored field (even if it has <code>stored=false</code>) when matching &#8220;*&#8221; in an <a href="https://cwiki.apache.org/confluence/display/solr/Common+Query+Parameters#CommonQueryParameters-Thefl(FieldList)Parameter">fl parameter</a>.</p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">If the field has <code><a href="docvalues.html#docvalues">docValues</a></code> enabled, setting this to true would allow the field to be returned as if it were a stored field (even if it has <code>stored=false</code>) when matching &#8220;*&#8221; in an <a href="common-query-parameters.html#CommonQueryParameters-Thefl_FieldList_Parameter">fl parameter</a>.</p></td>
 <td class="tableblock halign-left valign-top"><p class="tableblock">true or false</p></td>
 <td class="tableblock halign-left valign-top"><p class="tableblock">true</p></td>
 </tr>
@@ -1420,20 +1425,6 @@ $('#toc').on('click', 'a', function() {
 </tbody>
 </table>
 </div>
-<div class="sect1">
-<h2 id="DefiningFields-RelatedTopics">Related Topics</h2>
-<div class="sectionbody">
-<div class="ulist">
-<ul>
-<li>
-<p><a href="http://wiki.apache.org/solr/SchemaXml#Fields">SchemaXML-Fields</a></p>
-</li>
-<li>
-<p><a href="http://wiki.apache.org/solr/FieldOptionsByUseCase">Field Options by Use Case</a></p>
-</li>
-</ul>
-</div>
-</div>
 </div>
 </div>
 
@@ -1471,7 +1462,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/detecting-languages-during-indexing.html
==============================================================================
--- websites/production/lucene/content/solr/guide/test-10290/detecting-languages-during-indexing.html (original)
+++ websites/production/lucene/content/solr/guide/test-10290/detecting-languages-during-indexing.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 can identify languages and map text to language-specific fields during indexing using the <code>langid</code> UpdateRequestProcessor. Solr supports two implementations of this feature:</p>
+<p>Solr can identify languages and map text to language-specific fields during indexing using the <code>langid</code> UpdateRequestProcessor.</p>
+</div>
+<div class="paragraph">
+<p>Solr supports two implementations of this feature:</p>
 </div>
 <div class="ulist">
 <ul>
@@ -1296,7 +1299,10 @@ $('#toc').on('click', 'a', function() {
 <p>You can see a comparison between the two implementations here: <a href="http://blog.mikemccandless.com/2011/10/accuracy-and-performance-of-googles.html" class="bare">http://blog.mikemccandless.com/2011/10/accuracy-and-performance-of-googles.html</a>. In general, the LangDetect implementation supports more languages with higher performance.</p>
 </div>
 <div class="paragraph">
-<p>For specific information on each of these language identification implementations, including a list of supported languages for each, see the relevant project websites. For more information about the <code>langid</code> UpdateRequestProcessor, see the Solr wiki: <a href="http://wiki.apache.org/solr/LanguageDetection" class="bare">http://wiki.apache.org/solr/LanguageDetection</a>. For more information about language analysis in Solr, see <a href="language-analysis.html#language-analysis">Language Analysis</a>.</p>
+<p>For specific information on each of these language identification implementations, including a list of supported languages for each, see the relevant project websites.</p>
+</div>
+<div class="paragraph">
+<p>For more information about language analysis in Solr, see <a href="language-analysis.html#language-analysis">Language Analysis</a>.</p>
 </div>
 </div>
 </div>
@@ -1313,12 +1319,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>processor class<span style="color: #666666">=</span><span style="color: #BA2121">&quot;org.apache.solr.update.processor.TikaLanguageIdentifierUpdateProcessorFactory&quot;</span><span style="color: #666666">&gt;</span>
-  <span style="color: #666666">&lt;</span>lst name<span style="color: #666666">=</span><span style="color: #BA2121">&quot;defaults&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;langid.fl&quot;</span><span style="color: #666666">&gt;</span>title<span style="color: #666666">,</span>subject<span style="color: #666666">,</span>text<span style="color: #666666">,</span>keywords<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;langid.langField&quot;</span><span style="color: #666666">&gt;</span>language_s<span style="color: #666666">&lt;/</span>str<span style="color: #666666">&gt;</span>
-  <span style="color: #666666">&lt;/</span>lst<span style="color: #666666">&gt;</span>
-<span style="color: #666666">&lt;/</span>processor<span style="color: #666666">&gt;</span></code></pre>
+<pre class="pygments highlight"><code data-lang="xml"><span style="color: #008000; font-weight: bold">&lt;processor</span> <span style="color: #7D9029">class=</span><span style="color: #BA2121">&quot;org.apache.solr.update.processor.TikaLanguageIdentifierUpdateProcessorFactory&quot;</span><span style="color: #008000; font-weight: bold">&gt;</span>
+  <span style="color: #008000; font-weight: bold">&lt;lst</span> <span style="color: #7D9029">name=</span><span style="color: #BA2121">&quot;defaults&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;langid.fl&quot;</span><span style="color: #008000; font-weight: bold">&gt;</span>title,subject,text,keywords<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;langid.langField&quot;</span><span style="color: #008000; font-weight: bold">&gt;</span>language_s<span style="color: #008000; font-weight: bold">&lt;/str&gt;</span>
+  <span style="color: #008000; font-weight: bold">&lt;/lst&gt;</span>
+<span style="color: #008000; font-weight: bold">&lt;/processor&gt;</span></code></pre>
 </div>
 </div>
 </div>
@@ -1329,12 +1335,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>processor class<span style="color: #666666">=</span><span style="color: #BA2121">&quot;org.apache.solr.update.processor.LangDetectLanguageIdentifierUpdateProcessorFactory&quot;</span><span style="color: #666666">&gt;</span>
-  <span style="color: #666666">&lt;</span>lst name<span style="color: #666666">=</span><span style="color: #BA2121">&quot;defaults&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;langid.fl&quot;</span><span style="color: #666666">&gt;</span>title<span style="color: #666666">,</span>subject<span style="color: #666666">,</span>text<span style="color: #666666">,</span>keywords<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;langid.langField&quot;</span><span style="color: #666666">&gt;</span>language_s<span style="color: #666666">&lt;/</span>str<span style="color: #666666">&gt;</span>
-  <span style="color: #666666">&lt;/</span>lst<span style="color: #666666">&gt;</span>
-<span style="color: #666666">&lt;/</span>processor<span style="color: #666666">&gt;</span></code></pre>
+<pre class="pygments highlight"><code data-lang="xml"><span style="color: #008000; font-weight: bold">&lt;processor</span> <span style="color: #7D9029">class=</span><span style="color: #BA2121">&quot;org.apache.solr.update.processor.LangDetectLanguageIdentifierUpdateProcessorFactory&quot;</span><span style="color: #008000; font-weight: bold">&gt;</span>
+  <span style="color: #008000; font-weight: bold">&lt;lst</span> <span style="color: #7D9029">name=</span><span style="color: #BA2121">&quot;defaults&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;langid.fl&quot;</span><span style="color: #008000; font-weight: bold">&gt;</span>title,subject,text,keywords<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;langid.langField&quot;</span><span style="color: #008000; font-weight: bold">&gt;</span>language_s<span style="color: #008000; font-weight: bold">&lt;/str&gt;</span>
+  <span style="color: #008000; font-weight: bold">&lt;/lst&gt;</span>
+<span style="color: #008000; font-weight: bold">&lt;/processor&gt;</span></code></pre>
 </div>
 </div>
 </div>
@@ -1349,10 +1355,10 @@ $('#toc').on('click', 'a', function() {
 <table class="tableblock frame-all grid-all spread">
 <colgroup>
 <col style="width: 20%;">
-<col style="width: 20%;">
-<col style="width: 20%;">
-<col style="width: 20%;">
-<col style="width: 20%;">
+<col style="width: 10%;">
+<col style="width: 10%;">
+<col style="width: 10%;">
+<col style="width: 50%;">
 </colgroup>
 <thead>
 <tr>
@@ -1537,7 +1543,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/distributed-requests.html
==============================================================================
--- websites/production/lucene/content/solr/guide/test-10290/distributed-requests.html (original)
+++ websites/production/lucene/content/solr/guide/test-10290/distributed-requests.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 a Solr node receives a search request, that request is routed behind the scenes to a replica of a shard that is part of the collection being searched. The chosen replica acts as an aggregator: it creates internal requests to randomly chosen replicas of every shard in the collection, coordinates the responses, issues any subsequent internal requests as needed (for example, to refine facets values, or request additional stored fields), and constructs the final response for the client.</p>
+<p>When a Solr node receives a search request, the request is routed behind the scenes to a replica of a shard that is part of the collection being searched.</p>
+</div>
+<div class="paragraph">
+<p>The chosen replica acts as an aggregator: it creates internal requests to randomly chosen replicas of every shard in the collection, coordinates the responses, issues any subsequent internal requests as needed (for example, to refine facets values, or request additional stored fields), and constructs the final response for the client.</p>
 </div>
 </div>
 </div>
@@ -1295,7 +1298,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/gettingstarted/select?q=*:*</span></code></pre>
+<pre class="pygments highlight"><code data-lang="text">http://localhost:8983/solr/gettingstarted/select?q=*:*</code></pre>
 </div>
 </div>
 <div class="paragraph">
@@ -1303,7 +1306,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/gettingstarted/select?q=*:*&amp;shards=shard1</span></code></pre>
+<pre class="pygments highlight"><code data-lang="text">http://localhost:8983/solr/gettingstarted/select?q=*:*&amp;shards=shard1</code></pre>
 </div>
 </div>
 <div class="paragraph">
@@ -1311,18 +1314,18 @@ $('#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/gettingstarted/select?q=*:*&amp;shards=shard1,shard2</span></code></pre>
+<pre class="pygments highlight"><code data-lang="text">http://localhost:8983/solr/gettingstarted/select?q=*:*&amp;shards=shard1,shard2</code></pre>
 </div>
 </div>
 <div class="paragraph">
 <p>In both of the above examples, the shard Id(s) will be used to pick a random replica of that shard.</p>
 </div>
 <div class="paragraph">
-<p>Alternatively, you can specify the explict replicas you wish to use in place of a shard Ids:</p>
+<p>Alternatively, you can specify the explicit replicas you wish to use in place of a shard Ids:</p>
 </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/gettingstarted/select?q=*:*&amp;shards=localhost:7574/solr/gettingstarted,localhost:8983/solr/gettingstarted</span></code></pre>
+<pre class="pygments highlight"><code data-lang="text">http://localhost:8983/solr/gettingstarted/select?q=*:*&amp;shards=localhost:7574/solr/gettingstarted,localhost:8983/solr/gettingstarted</code></pre>
 </div>
 </div>
 <div class="paragraph">
@@ -1330,7 +1333,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/gettingstarted/select?q=*:*&amp;shards=localhost:7574/solr/gettingstarted|localhost:7500/solr/gettingstarted</span></code></pre>
+<pre class="pygments highlight"><code data-lang="text">http://localhost:8983/solr/gettingstarted/select?q=*:*&amp;shards=localhost:7574/solr/gettingstarted|localhost:7500/solr/gettingstarted</code></pre>
 </div>
 </div>
 <div class="paragraph">
@@ -1338,7 +1341,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/gettingstarted/select?q=*:*&amp;shards=shard1,localhost:7574/solr/gettingstarted|localhost:7500/solr/gettingstarted</span></code></pre>
+<pre class="pygments highlight"><code data-lang="text">http://localhost:8983/solr/gettingstarted/select?q=*:*&amp;shards=shard1,localhost:7574/solr/gettingstarted|localhost:7500/solr/gettingstarted</code></pre>
 </div>
 </div>
 </div>
@@ -1350,7 +1353,7 @@ $('#toc').on('click', 'a', function() {
 <p>You can directly configure aspects of the concurrency and thread-pooling used within distributed search in Solr. This allows for finer grained control and you can tune it to target your own specific requirements. The default configuration favors throughput over latency.</p>
 </div>
 <div class="paragraph">
-<p>To configure the standard handler, provide a configuration like this in the solrconfig.xml:</p>
+<p>To configure the standard handler, provide a configuration like this in <code>solrconfig.xml</code>:</p>
 </div>
 <div class="listingblock">
 <div class="content">
@@ -1368,9 +1371,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: 15%;">
+<col style="width: 65%;">
 </colgroup>
 <thead>
 <tr>
@@ -1397,11 +1400,7 @@ $('#toc').on('click', 'a', function() {
 </tr>
 <tr>
 <td class="tableblock halign-left valign-top"><p class="tableblock"><code>maxConnections</code></p></td>
-<td class="tableblock halign-left valign-top"><div><div class="literalblock">
-<div class="content">
-<pre>10000</pre>
-</div>
-</div></div></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock"><code>10000</code></p></td>
 <td class="tableblock halign-left valign-top"><p class="tableblock">The total maximum number of concurrent connections in distributed searches.</p></td>
 </tr>
 <tr>
@@ -1523,7 +1522,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/distributed-search-with-index-sharding.html
==============================================================================
--- websites/production/lucene/content/solr/guide/test-10290/distributed-search-with-index-sharding.html (original)
+++ websites/production/lucene/content/solr/guide/test-10290/distributed-search-with-index-sharding.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>When using traditional index sharding, you will need to consider how to query your documents.</p>
+</div>
+<div class="paragraph">
 <p>It is highly recommended that you use <a href="solrcloud.html#solrcloud">SolrCloud</a> when needing to scale up or scale out. The setup described below is legacy and was used prior to the existence of SolrCloud. SolrCloud provides for a truly distributed set of features with support for things like automatic routing, leader election, optimistic concurrency and other sanity checks that are expected out of a distributed system.</p>
 </div>
 <div class="paragraph">
@@ -1308,13 +1311,13 @@ $('#toc').on('click', 'a', function() {
 <p>If a query request includes the <code>shards</code> parameter, the Solr server distributes the request across all the shards listed as arguments to the parameter. The <code>shards</code> parameter uses this syntax:</p>
 </div>
 <div class="paragraph">
-<p><code><em>host</em></code> <code>:</code> <code><em>port</em></code> <code>/</code> <code><em>base_url</em></code> <code>[,</code> <code><em>host</em></code> <code>:</code> <code><em>port</em></code> <code>/</code> <code><em>base_url</em></code> <code>]*</code></p>
+<p><code>host:port/base_url,host:port/base_url*</code></p>
 </div>
 <div class="paragraph">
 <p>For example, the <code>shards</code> parameter below causes the search to be distributed across two Solr servers: <strong>solr1</strong> and <strong>solr2</strong>, both of which are running on port 8983:</p>
 </div>
 <div class="paragraph">
-<p>` <a href="http://localhost:8983/solr/core1/select?shards=solr1:8983/solr/core1,solr2:8983/solr/core1&amp;indent=true&amp;q=ipod+solr" class="bare">http://localhost:8983/solr/core1/select?shards=solr1:8983/solr/core1,solr2:8983/solr/core1&amp;indent=true&amp;q=ipod+solr</a> `</p>
+<p><code>http://localhost:8983/solr/core1/select?shards=solr1:8983/solr/core1,solr2:8983/solr/core1&amp;indent=true&amp;q=ipod+solr</code></p>
 </div>
 <div class="paragraph">
 <p>Rather than require users to include the shards parameter explicitly, it is usually preferred to configure this parameter as a default in the RequestHandler section of <code>solrconfig.xml</code>.</p>
@@ -1327,7 +1330,7 @@ $('#toc').on('click', 'a', function() {
 </td>
 <td class="content">
 <div class="paragraph">
-<p>Do not add the <code>shards</code> parameter to the standard requestHandler; otherwise, search queries may enter an infinite loop. Instead, define a new requestHandler that uses the <code>shards</code> parameter, and pass distributed search requests to that handler.</p>
+<p>Do not add the <code>shards</code> parameter to the standard request handler; doing so may cause search queries may enter an infinite loop. Instead, define a new request handler that uses the <code>shards</code> parameter, and pass distributed search requests to that handler.</p>
 </div>
 </td>
 </tr>
@@ -1403,7 +1406,7 @@ $('#toc').on('click', 'a', function() {
 <h2 id="DistributedSearchwithIndexSharding-AvoidingDistributedDeadlock">Avoiding Distributed Deadlock</h2>
 <div class="sectionbody">
 <div class="paragraph">
-<p>Like in SolrCloud mode, inter-shard requests could lead to a distributed deadlock. It can be avoided by following the instructions <a href="distributed-requests.html#distributed-requests">here</a>.</p>
+<p>Like in SolrCloud mode, inter-shard requests could lead to a distributed deadlock. It can be avoided by following the instructions in the section  <a href="distributed-requests.html#distributed-requests">Distributed Requests</a>.</p>
 </div>
 </div>
 </div>
@@ -1411,21 +1414,21 @@ $('#toc').on('click', 'a', function() {
 <h2 id="DistributedSearchwithIndexSharding-TestingIndexShardingonTwoLocalServers">Testing Index Sharding on Two Local Servers</h2>
 <div class="sectionbody">
 <div class="paragraph">
-<p>For simple functionality testing, it&#8217;s easiest to just set up two local Solr servers on different ports. (In a production environment, of course, these servers would be deployed on separate machines.)</p>
+<p>For simple functional testing, it&#8217;s easiest to just set up two local Solr servers on different ports. (In a production environment, of course, these servers would be deployed on separate machines.)</p>
 </div>
 <div class="olist arabic">
 <ol class="arabic">
 <li>
-<p>Make two Solr home directories:</p>
+<p>Make two Solr home directories and copy <code>solr.xml</code> into the new directories:</p>
 <div class="listingblock">
 <div class="content">
-<pre class="pygments highlight"><code data-lang="java">mkdir example<span style="color: #666666">/</span>nodes
-mkdir example<span style="color: #666666">/</span>nodes<span style="color: #666666">/</span>node1
-<span style="border: 1px solid #FF0000">#</span> Copy solr<span style="color: #666666">.</span><span style="color: #7D9029">xml</span> into <span style="color: #008000; font-weight: bold">this</span> solr<span style="color: #666666">.</span><span style="color: #7D9029">home</span>
-cp server<span style="color: #666666">/</span>solr<span style="color: #666666">/</span>solr<span style="color: #666666">.</span><span style="color: #7D9029">xml</span> example<span style="color: #666666">/</span>nodes<span style="color: #666666">/</span>node1<span style="color: #666666">/.</span>
-<span style="border: 1px solid #FF0000">#</span> Repeat the above steps <span style="color: #008000; font-weight: bold">for</span> the second node
-mkdir example<span style="color: #666666">/</span>nodes<span style="color: #666666">/</span>node2
-cp server<span style="color: #666666">/</span>solr<span style="color: #666666">/</span>solr<span style="color: #666666">.</span><span style="color: #7D9029">xml</span> example<span style="color: #666666">/</span>nodes<span style="color: #666666">/</span>node2<span style="color: #666666">/.</span></code></pre>
+<pre class="pygments highlight"><code data-lang="bash">mkdir example/nodes
+mkdir example/nodes/node1
+<span style="color: #408080; font-style: italic"># Copy solr.xml into this solr.home</span>
+cp server/solr/solr.xml example/nodes/node1/.
+<span style="color: #408080; font-style: italic"># Repeat the above steps for the second node</span>
+mkdir example/nodes/node2
+cp server/solr/solr.xml example/nodes/node2/.</code></pre>
 </div>
 </div>
 </li>
@@ -1433,11 +1436,11 @@ cp server<span style="color: #666666">/<
 <p>Start the two Solr instances</p>
 <div class="listingblock">
 <div class="content">
-<pre class="pygments highlight"><code data-lang="java"><span style="border: 1px solid #FF0000">#</span> Start first node on port <span style="color: #666666">8983</span>
-bin<span style="color: #666666">/</span>solr start <span style="color: #666666">-</span>s example<span style="color: #666666">/</span>nodes<span style="color: #666666">/</span>node1 <span style="color: #666666">-</span>p <span style="color: #666666">8983</span>
+<pre class="pygments highlight"><code data-lang="bash"><span style="color: #408080; font-style: italic"># Start first node on port 8983</span>
+bin/solr start -s example/nodes/node1 -p <span style="color: #666666">8983</span>
 
-<span style="border: 1px solid #FF0000">#</span> Start second node on port <span style="color: #666666">8984</span>
-bin<span style="color: #666666">/</span>solr start <span style="color: #666666">-</span>s example<span style="color: #666666">/</span>nodes<span style="color: #666666">/</span>node2 <span style="color: #666666">-</span>p <span style="color: #666666">8984</span></code></pre>
+<span style="color: #408080; font-style: italic"># Start second node on port 8984</span>
+bin/solr start -s example/nodes/node2 -p <span style="color: #666666">8984</span></code></pre>
 </div>
 </div>
 </li>
@@ -1445,19 +1448,19 @@ bin<span style="color: #666666">/</span>
 <p>Create a core on both the nodes with the sample_techproducts_configs.</p>
 <div class="listingblock">
 <div class="content">
-<pre class="pygments highlight"><code data-lang="java">bin<span style="color: #666666">/</span>solr create_core <span style="color: #666666">-</span>c core1 <span style="color: #666666">-</span>p <span style="color: #666666">8983</span> <span style="color: #666666">-</span>d sample_techproducts_configs
-<span style="border: 1px solid #FF0000">#</span> Create a core on the Solr node running on port <span style="color: #666666">8984</span>
-bin<span style="color: #666666">/</span>solr create_core <span style="color: #666666">-</span>c core1 <span style="color: #666666">-</span>p <span style="color: #666666">8984</span> <span style="color: #666666">-</span>d sample_techproducts_configs</code></pre>
+<pre class="pygments highlight"><code data-lang="bash">bin/solr create_core -c core1 -p <span style="color: #666666">8983</span> -d sample_techproducts_configs
+<span style="color: #408080; font-style: italic"># Create a core on the Solr node running on port 8984</span>
+bin/solr create_core -c core1 -p <span style="color: #666666">8984</span> -d sample_techproducts_configs</code></pre>
 </div>
 </div>
 </li>
 <li>
-<p>In the third window, index an example document to each of the server:</p>
+<p>In a third window, index an example document to each of the server:</p>
 <div class="listingblock">
 <div class="content">
-<pre class="pygments highlight"><code data-lang="java">bin<span style="color: #666666">/</span>post <span style="color: #666666">-</span>c core1 example<span style="color: #666666">/</span>exampledocs<span style="color: #666666">/</span>monitor<span style="color: #666666">.</span><span style="color: #7D9029">xml</span> <span style="color: #666666">-</span>port <span style="color: #666666">8983</span>
+<pre class="pygments highlight"><code data-lang="bash">bin/post -c core1 example/exampledocs/monitor.xml -port <span style="color: #666666">8983</span>
 
-bin<span style="color: #666666">/</span>post <span style="color: #666666">-</span>c core1 example<span style="color: #666666">/</span>exampledocs<span style="color: #666666">/</span>monitor2<span style="color: #666666">.</span><span style="color: #7D9029">xml</span> <span style="color: #666666">-</span>port <span style="color: #666666">8984</span></code></pre>
+bin/post -c core1 example/exampledocs/monitor2.xml -port <span style="color: #666666">8984</span></code></pre>
 </div>
 </div>
 </li>
@@ -1465,7 +1468,7 @@ bin<span style="color: #666666">/</span>
 <p>Search on the node on port 8983:</p>
 <div class="listingblock">
 <div class="content">
-<pre class="pygments highlight"><code data-lang="bash">curl http://localhost:8983/solr/core1/select?q<span style="color: #666666">=</span>*:*&amp;<span style="color: #19177C">wt</span><span style="color: #666666">=</span>xml&amp;<span style="color: #19177C">indent</span><span style="color: #666666">=</span><span style="color: #008000">true</span></code></pre>
+<pre class="pygments highlight"><code data-lang="text">curl http://localhost:8983/solr/core1/select?q=*:*&amp;wt=xml&amp;indent=true</code></pre>
 </div>
 </div>
 <div class="paragraph">
@@ -1476,7 +1479,7 @@ bin<span style="color: #666666">/</span>
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="pygments highlight"><code data-lang="bash">curl http://localhost:8984/solr/core1/select?q<span style="color: #666666">=</span>*:*&amp;<span style="color: #19177C">wt</span><span style="color: #666666">=</span>xml&amp;<span style="color: #19177C">indent</span><span style="color: #666666">=</span><span style="color: #008000">true</span></code></pre>
+<pre class="pygments highlight"><code data-lang="text">curl http://localhost:8984/solr/core1/select?q=*:*&amp;wt=xml&amp;indent=true</code></pre>
 </div>
 </div>
 <div class="paragraph">
@@ -1487,7 +1490,7 @@ bin<span style="color: #666666">/</span>
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="pygments highlight"><code data-lang="bash">curl http://localhost:8983/solr/core1/select?q<span style="color: #666666">=</span>*:*&amp;<span style="color: #19177C">indent</span><span style="color: #666666">=</span>true&amp;<span style="color: #19177C">shards</span><span style="color: #666666">=</span>localhost:8983/solr/core1,localhost:8984/solr/core1&amp;<span style="color: #19177C">fl</span><span style="color: #666666">=</span>id,name</code></pre>
+<pre class="pygments highlight"><code data-lang="text">curl http://localhost:8983/solr/core1/select?q=*:*&amp;indent=true&amp;shards=localhost:8983/solr/core1,localhost:8984/solr/core1&amp;fl=id,name</code></pre>
 </div>
 </div>
 <div class="paragraph">
@@ -1495,29 +1498,29 @@ bin<span style="color: #666666">/</span>
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="pygments highlight"><code data-lang="java"><span style="color: #666666">&lt;</span>response<span style="color: #666666">&gt;</span>
-  <span style="color: #666666">&lt;</span>lst name<span style="color: #666666">=</span><span style="color: #BA2121">&quot;responseHeader&quot;</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;status&quot;</span><span style="color: #666666">&gt;0&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;QTime&quot;</span><span style="color: #666666">&gt;8&lt;/</span><span style="color: #B00040">int</span><span style="color: #666666">&gt;</span>
-    <span style="color: #666666">&lt;</span>lst name<span style="color: #666666">=</span><span style="color: #BA2121">&quot;params&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;q&quot;</span><span style="color: #666666">&gt;*:*&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;shards&quot;</span><span style="color: #666666">&gt;</span>localhost<span style="color: #666666">:8983/</span>solr<span style="color: #666666">/</span>core1<span style="color: #666666">,</span>localhost<span style="color: #666666">:8984/</span>solr<span style="color: #666666">/</span>core1<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;indent&quot;</span><span style="color: #666666">&gt;</span><span style="color: #008000; font-weight: bold">true</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;fl&quot;</span><span style="color: #666666">&gt;</span>id<span style="color: #666666">,</span>name<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;wt&quot;</span><span style="color: #666666">&gt;</span>xml<span style="color: #666666">&lt;/</span>str<span style="color: #666666">&gt;</span>
-    <span style="color: #666666">&lt;/</span>lst<span style="color: #666666">&gt;</span>
-  <span style="color: #666666">&lt;/</span>lst<span style="color: #666666">&gt;</span>
-  <span style="color: #666666">&lt;</span>result name<span style="color: #666666">=</span><span style="color: #BA2121">&quot;response&quot;</span> numFound<span style="color: #666666">=</span><span style="color: #BA2121">&quot;2&quot;</span> start<span style="color: #666666">=</span><span style="color: #BA2121">&quot;0&quot;</span> maxScore<span style="color: #666666">=</span><span style="color: #BA2121">&quot;1.0&quot;</span><span style="color: #666666">&gt;</span>
-    <span style="color: #666666">&lt;</span>doc<span style="color: #666666">&gt;</span>
-      <span style="color: #666666">&lt;</span>str name<span style="color: #666666">=</span><span style="color: #BA2121">&quot;id&quot;</span><span style="color: #666666">&gt;3007</span>WFP<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;name&quot;</span><span style="color: #666666">&gt;</span>Dell Widescreen UltraSharp <span style="color: #666666">3007</span>WFP<span style="color: #666666">&lt;/</span>str<span style="color: #666666">&gt;</span>
-    <span style="color: #666666">&lt;/</span>doc<span style="color: #666666">&gt;</span>
-    <span style="color: #666666">&lt;</span>doc<span style="color: #666666">&gt;</span>
-      <span style="color: #666666">&lt;</span>str name<span style="color: #666666">=</span><span style="color: #BA2121">&quot;id&quot;</span><span style="color: #666666">&gt;</span>VA902B<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;name&quot;</span><span style="color: #666666">&gt;</span>ViewSonic VA902B <span style="color: #666666">-</span> flat panel display <span style="color: #666666">-</span> TFT <span style="color: #666666">-</span> <span style="color: #666666">19</span><span style="border: 1px solid #FF0000">&quot;</span><span style="color: #666666">&lt;/</span>str<span style="color: #666666">&gt;</span>
-    <span style="color: #666666">&lt;/</span>doc<span style="color: #666666">&gt;</span>
-  <span style="color: #666666">&lt;/</span>result<span style="color: #666666">&gt;</span>
-<span style="color: #666666">&lt;/</span>response<span style="color: #666666">&gt;</span></code></pre>
+<pre class="pygments highlight"><code data-lang="xml"><span style="color: #008000; font-weight: bold">&lt;response&gt;</span>
+  <span style="color: #008000; font-weight: bold">&lt;lst</span> <span style="color: #7D9029">name=</span><span style="color: #BA2121">&quot;responseHeader&quot;</span><span style="color: #008000; font-weight: bold">&gt;</span>
+    <span style="color: #008000; font-weight: bold">&lt;int</span> <span style="color: #7D9029">name=</span><span style="color: #BA2121">&quot;status&quot;</span><span style="color: #008000; font-weight: bold">&gt;</span>0<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;QTime&quot;</span><span style="color: #008000; font-weight: bold">&gt;</span>8<span style="color: #008000; font-weight: bold">&lt;/int&gt;</span>
+    <span style="color: #008000; font-weight: bold">&lt;lst</span> <span style="color: #7D9029">name=</span><span style="color: #BA2121">&quot;params&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;q&quot;</span><span style="color: #008000; font-weight: bold">&gt;</span>*:*<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;shards&quot;</span><span style="color: #008000; font-weight: bold">&gt;</span>localhost:8983/solr/core1,localhost:8984/solr/core1<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;indent&quot;</span><span style="color: #008000; font-weight: bold">&gt;</span>true<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;fl&quot;</span><span style="color: #008000; font-weight: bold">&gt;</span>id,name<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;wt&quot;</span><span style="color: #008000; font-weight: bold">&gt;</span>xml<span style="color: #008000; font-weight: bold">&lt;/str&gt;</span>
+    <span style="color: #008000; font-weight: bold">&lt;/lst&gt;</span>
+  <span style="color: #008000; font-weight: bold">&lt;/lst&gt;</span>
+  <span style="color: #008000; font-weight: bold">&lt;result</span> <span style="color: #7D9029">name=</span><span style="color: #BA2121">&quot;response&quot;</span> <span style="color: #7D9029">numFound=</span><span style="color: #BA2121">&quot;2&quot;</span> <span style="color: #7D9029">start=</span><span style="color: #BA2121">&quot;0&quot;</span> <span style="color: #7D9029">maxScore=</span><span style="color: #BA2121">&quot;1.0&quot;</span><span style="color: #008000; font-weight: bold">&gt;</span>
+    <span style="color: #008000; font-weight: bold">&lt;doc&gt;</span>
+      <span style="color: #008000; font-weight: bold">&lt;str</span> <span style="color: #7D9029">name=</span><span style="color: #BA2121">&quot;id&quot;</span><span style="color: #008000; font-weight: bold">&gt;</span>3007WFP<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;name&quot;</span><span style="color: #008000; font-weight: bold">&gt;</span>Dell Widescreen UltraSharp 3007WFP<span style="color: #008000; font-weight: bold">&lt;/str&gt;</span>
+    <span style="color: #008000; font-weight: bold">&lt;/doc&gt;</span>
+    <span style="color: #008000; font-weight: bold">&lt;doc&gt;</span>
+      <span style="color: #008000; font-weight: bold">&lt;str</span> <span style="color: #7D9029">name=</span><span style="color: #BA2121">&quot;id&quot;</span><span style="color: #008000; font-weight: bold">&gt;</span>VA902B<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;name&quot;</span><span style="color: #008000; font-weight: bold">&gt;</span>ViewSonic VA902B - flat panel display - TFT - 19&quot;<span style="color: #008000; font-weight: bold">&lt;/str&gt;</span>
+    <span style="color: #008000; font-weight: bold">&lt;/doc&gt;</span>
+  <span style="color: #008000; font-weight: bold">&lt;/result&gt;</span>
+<span style="color: #008000; font-weight: bold">&lt;/response&gt;</span></code></pre>
 </div>
 </div>
 </li>
@@ -1561,7 +1564,7 @@ bin<span style="color: #666666">/</span>
             <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/documents-fields-and-schema-design.html
==============================================================================
--- websites/production/lucene/content/solr/guide/test-10290/documents-fields-and-schema-design.html (original)
+++ websites/production/lucene/content/solr/guide/test-10290/documents-fields-and-schema-design.html Tue May  9 19:22:29 2017
@@ -1349,7 +1349,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/documents-screen.html
==============================================================================
--- websites/production/lucene/content/solr/guide/test-10290/documents-screen.html (original)
+++ websites/production/lucene/content/solr/guide/test-10290/documents-screen.html Tue May  9 19:22:29 2017
@@ -1286,6 +1286,7 @@ $('#toc').on('click', 'a', function() {
 <div class="content">
 <img src="images/documents-screen/documents_add_screen.png" alt="image" height="400">
 </div>
+<div class="title">Figure 1. The Documents Screen</div>
 </div>
 <div class="paragraph">
 <p>The screen allows you to:</p>
@@ -1303,6 +1304,30 @@ $('#toc').on('click', 'a', function() {
 </li>
 </ul>
 </div>
+<div class="admonitionblock tip">
+<table>
+<tr>
+<td class="icon">
+<i class="fa icon-tip" title="Tip"></i>
+</td>
+<td class="content">
+<div class="paragraph">
+<p>There are other ways to load data, see also these sections:</p>
+</div>
+<div class="ulist">
+<ul>
+<li>
+<p><a href="uploading-data-with-index-handlers.html#uploading-data-with-index-handlers">Uploading Data with Index Handlers</a></p>
+</li>
+<li>
+<p><a href="uploading-data-with-solr-cell-using-apache-tika.html#uploading-data-with-solr-cell-using-apache-tika">Uploading Data with Solr Cell using Apache Tika</a></p>
+</li>
+</ul>
+</div>
+</td>
+</tr>
+</table>
+</div>
 <div class="paragraph">
 <p>The first step is to define the RequestHandler to use (aka, 'qt'). By default <code>/update</code> will be defined. To use Solr Cell, for example, change the request handler to <code>/update/extract</code>.</p>
 </div>
@@ -1311,8 +1336,9 @@ $('#toc').on('click', 'a', function() {
 </div>
 </div>
 </div>
-<div class="sect2">
-<h3 id="DocumentsScreen-JSON">JSON</h3>
+<div class="sect1">
+<h2 id="DocumentsScreen-JSON">JSON</h2>
+<div class="sectionbody">
 <div class="paragraph">
 <p>When using the JSON document type, the functionality is similar to using a requestHandler on the command line. Instead of putting the documents in a curl command, they can instead be input into the Document entry box. The document structure should still be in proper JSON format.</p>
 </div>
@@ -1323,8 +1349,10 @@ $('#toc').on('click', 'a', function() {
 <p>This option will only add or overwrite documents to the index; for other update tasks, see the <a href="#DocumentsScreen-SolrCommand">Solr Command</a> option.</p>
 </div>
 </div>
-<div class="sect2">
-<h3 id="DocumentsScreen-CSV">CSV</h3>
+</div>
+<div class="sect1">
+<h2 id="DocumentsScreen-CSV">CSV</h2>
+<div class="sectionbody">
 <div class="paragraph">
 <p>When using the CSV document type, the functionality is similar to using a requestHandler on the command line. Instead of putting the documents in a curl command, they can instead be input into the Document entry box. The document structure should still be in proper CSV format, with columns delimited and one row per document.</p>
 </div>
@@ -1332,14 +1360,18 @@ $('#toc').on('click', 'a', function() {
 <p>Then you can choose when documents should be added to the index (Commit Within), and whether existing documents should be overwritten with incoming documents with the same id (if this is not <strong>true</strong>, then the incoming documents will be dropped).</p>
 </div>
 </div>
-<div class="sect2">
-<h3 id="DocumentsScreen-DocumentBuilder">Document Builder</h3>
+</div>
+<div class="sect1">
+<h2 id="DocumentsScreen-DocumentBuilder">Document Builder</h2>
+<div class="sectionbody">
 <div class="paragraph">
 <p>The Document Builder provides a wizard-like interface to enter fields of a document</p>
 </div>
 </div>
-<div class="sect2">
-<h3 id="DocumentsScreen-FileUpload">File Upload</h3>
+</div>
+<div class="sect1">
+<h2 id="DocumentsScreen-FileUpload">File Upload</h2>
+<div class="sectionbody">
 <div class="paragraph">
 <p>The File Upload option allows choosing a prepared file and uploading it. If using only <code>/update</code> for the Request-Handler option, you will be limited to XML, CSV, and JSON.</p>
 </div>
@@ -1350,8 +1382,10 @@ $('#toc').on('click', 'a', function() {
 <p>Then you can choose when documents should be added to the index (Commit Within), and whether existing documents should be overwritten with incoming documents with the same id (if this is not <strong>true</strong>, then the incoming documents will be dropped).</p>
 </div>
 </div>
-<div class="sect2">
-<h3 id="DocumentsScreen-SolrCommand">Solr Command</h3>
+</div>
+<div class="sect1">
+<h2 id="DocumentsScreen-SolrCommand">Solr Command</h2>
+<div class="sectionbody">
 <div class="paragraph">
 <p>The Solr Command option allows you use XML or JSON to perform specific actions on documents, such as defining documents to be added or deleted, updating only certain fields of documents, or commit and optimize commands on the index.</p>
 </div>
@@ -1359,8 +1393,10 @@ $('#toc').on('click', 'a', function() {
 <p>The documents should be structured as they would be if using <code>/update</code> on the command line.</p>
 </div>
 </div>
-<div class="sect2">
-<h3 id="DocumentsScreen-XML">XML</h3>
+</div>
+<div class="sect1">
+<h2 id="DocumentsScreen-XML">XML</h2>
+<div class="sectionbody">
 <div class="paragraph">
 <p>When using the XML document type, the functionality is similar to using a requestHandler on the command line. Instead of putting the documents in a curl command, they can instead be input into the Document entry box. The document structure should still be in proper Solr XML format, with each document separated by <code>&lt;doc&gt;</code> tags and each field defined.</p>
 </div>
@@ -1371,20 +1407,6 @@ $('#toc').on('click', 'a', function() {
 <p>This option will only add or overwrite documents to the index; for other update tasks, see the <a href="#DocumentsScreen-SolrCommand">Solr Command</a> option.</p>
 </div>
 </div>
-<div class="sect1">
-<h2 id="DocumentsScreen-RelatedTopics">Related Topics</h2>
-<div class="sectionbody">
-<div class="ulist">
-<ul>
-<li>
-<p><a href="uploading-data-with-index-handlers.html#uploading-data-with-index-handlers">Uploading Data with Index Handlers</a></p>
-</li>
-<li>
-<p><a href="uploading-data-with-solr-cell-using-apache-tika.html#uploading-data-with-solr-cell-using-apache-tika">Uploading Data with Solr Cell using Apache Tika</a></p>
-</li>
-</ul>
-</div>
-</div>
 </div>
 </div>
 
@@ -1422,7 +1444,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/docvalues.html
==============================================================================
--- websites/production/lucene/content/solr/guide/test-10290/docvalues.html (original)
+++ websites/production/lucene/content/solr/guide/test-10290/docvalues.html Tue May  9 19:22:29 2017
@@ -1285,7 +1285,7 @@ $('#toc').on('click', 'a', function() {
 </div>
 </div>
 <div class="sect1">
-<h2 id="DocValues-WhyDocValues_">Why DocValues?</h2>
+<h2 id="why-docvalues">Why DocValues?</h2>
 <div class="sectionbody">
 <div class="paragraph">
 <p>The standard way that Solr builds the index is with an <em>inverted index</em>. This style builds a list of terms found in all the documents in the index and next to each term is a list of documents that the term appears in (as well as how many times the term appears in that document). This makes search very fast - since users search by terms, having a ready list of term-to-document values makes the query process faster.</p>
@@ -1319,9 +1319,7 @@ $('#toc').on('click', 'a', function() {
 <i class="fa icon-important" title="Important"></i>
 </td>
 <td class="content">
-<div class="paragraph">
-<p>If you have already indexed data into your Solr index, you will need to completely re-index your content after changing your field definitions in <code>schema.xml</code> in order to successfully use docValues.</p>
-</div>
+If you have already indexed data into your Solr index, you will need to completely re-index your content after changing your field definitions in <code>schema.xml</code> in order to successfully use docValues.
 </td>
 </tr>
 </table>
@@ -1361,57 +1359,80 @@ $('#toc').on('click', 'a', function() {
 <p>Boolean fields</p>
 </li>
 <li>
-<p>&#8230;&#8203;.
-[Int/Long/Float/Double/Date]PointField</p>
+<p>Int|Long|Float|Double|Date PointField</p>
+<div class="ulist">
+<ul>
+<li>
+<p>If the field is single-valued (i.e., multi-valued is false), Lucene will use the NUMERIC type.</p>
+</li>
+<li>
+<p>If the field is multi-valued, Lucene will use the SORTED_NUMERIC type.</p>
 </li>
 </ul>
 </div>
-<div class="literalblock">
+</li>
+</ul>
+</div>
+<div class="paragraph">
+<p>These Lucene types are related to how the <a href="https://lucene.apache.org/core/7_0_0//core/org/apache/lucene/index/DocValuesType.html">values are sorted and stored</a>.</p>
+</div>
+<div class="paragraph">
+<p>There is an additional configuration option available, which is to modify the <code>docValuesFormat</code> <a href="field-type-definitions-and-properties.html#FieldTypeDefinitionsandProperties-docValuesFormat">used by the field type</a>. The default implementation employs a mixture of loading some things into memory and keeping some on disk. In some cases, however, you may choose to specify an alternative <a href="https://lucene.apache.org/core/7_0_0//core/org/apache/lucene/codecs/DocValuesFormat.html">DocValuesFormat implementation</a>. For example, you could choose to keep everything in memory by specifying <code>docValuesFormat="Memory"</code> on a field type:</p>
+</div>
+<div class="listingblock">
 <div class="content">
-<pre>** If the field is single-valued (i.e., multi-valued is false), Lucene will use the NUMERIC type.
-** If the field is multi-valued, Lucene will use the SORTED_NUMERIC type.
-
-These Lucene types are related to how the {lucene-javadocs}/core/org/apache/lucene/index/DocValuesType.html[values are sorted and stored].
-
-There is an additional configuration option available, which is to modify the `docValuesFormat` &lt;&lt;field-type-definitions-and-properties.adoc#FieldTypeDefinitionsandProperties-docValuesFormat,used by the field type&gt;&gt;. The default implementation employs a mixture of loading some things into memory and keeping some on disk. In some cases, however, you may choose to specify an alternative {lucene-javadocs}/core/org/apache/lucene/codecs/DocValuesFormat.html[DocValuesFormat implementation]. For example, you could choose to keep everything in memory by specifying `docValuesFormat="Memory"` on a field type:
-
-[source,xml]
-----
-&lt;fieldType name="string_in_mem_dv" class="solr.StrField" docValues="true" docValuesFormat="Memory" /&gt;
-----
-
-Please note that the `docValuesFormat` option may change in future releases.
-
-[NOTE]
-====
-
-Lucene index back-compatibility is only supported for the default codec. If you choose to customize the `docValuesFormat` in your schema.xml, upgrading to a future version of Solr may require you to either switch back to the default codec and optimize your index to rewrite it into the default codec before upgrading, or re-build your entire index from scratch after upgrading.
-
-====
-
-[[DocValues-UsingDocValues]]
-== Using DocValues
-
-// OLD_CONFLUENCE_ID: DocValues-Sorting,Faceting&amp;Functions
-
-[[DocValues-Sorting_Faceting_Functions]]
-=== Sorting, Faceting &amp; Functions
-
-If `docValues="true"` for a field, then DocValues will automatically be used any time the field is used for &lt;&lt;common-query-parameters.adoc#CommonQueryParameters-ThesortParameter,sorting&gt;&gt;, &lt;&lt;faceting.adoc#faceting,faceting&gt;&gt; or &lt;&lt;function-queries.adoc#function-queries,Function Queries&gt;&gt;.
-
-[[DocValues-RetrievingDocValuesDuringSearch]]
-=== Retrieving DocValues During Search
-
-Field values retrieved during search queries are typically returned from stored values. However, non-stored docValues fields will be also returned along with other stored fields when all fields (or pattern matching globs) are specified to be returned (e.g. "`fl=*`") for search queries depending on the effective value of the `useDocValuesAsStored` parameter for each field. For schema versions &gt;= 1.6, the implicit default is `useDocValuesAsStored="true"`. See &lt;&lt;field-type-definitions-and-properties.adoc#field-type-definitions-and-properties,Field Type Definitions and Properties&gt;&gt; &amp; &lt;&lt;defining-fields.adoc#defining-fields,Defining Fields&gt;&gt; for more details.
-
-When `useDocValuesAsStored="false"`, non-stored DocValues fields can still be explicitly requested by name in the &lt;&lt;common-query-parameters.adoc#CommonQueryParameters-Thefl_FieldList_Parameter,fl param&gt;&gt;, but will not match glob patterns (`"*"`). Note that returning DocValues along with "regular" stored fields at query time has performance implications that stored fields may not because DocValues are column-oriented and may therefore incur additional cost to retrieve for each returned document. Also note that while returning non-stored fields from DocValues, the values of a multi-valued field are returned in sorted order (and not insertion order). If you require the multi-valued fields to be returned in the original insertion order, then make your multi-valued field as stored (such a change requires re-indexing).
-
-In cases where the query is returning _only_ docValues fields performance may improve since returning stored fields requires disk reads and decompression whereas returning docValues fields in the fl list only requires memory access.
-
-When retrieving fields from their docValues form (using https://cwiki.apache.org/confluence/display/solr/Exporting+Result+Sets[/export handler], https://cwiki.apache.org/confluence/display/solr/Streaming+Expressions[streaming expressions] or if the field is requested in the `fl` parameter), two important differences between regular stored fields and docValues fields must be understood:
-
-1.  Order is _not_ preserved. For simply retrieving stored fields, the insertion order is the return order. For docValues, it is the _sorted_ order.
-2.  Multiple identical entries are collapsed into a single value. Thus if I insert values 4, 5, 2, 4, 1, my return will be 1, 2, 4, 5.</pre>
+<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;string_in_mem_dv&quot;</span> <span style="color: #7D9029">class=</span><span style="color: #BA2121">&quot;solr.StrField&quot;</span> <span style="color: #7D9029">docValues=</span><span style="color: #BA2121">&quot;true&quot;</span> <span style="color: #7D9029">docValuesFormat=</span><span style="color: #BA2121">&quot;Memory&quot;</span> <span style="color: #008000; font-weight: bold">/&gt;</span></code></pre>
+</div>
+</div>
+<div class="paragraph">
+<p>Please note that the <code>docValuesFormat</code> option may change in future releases.</p>
+</div>
+<div class="admonitionblock note">
+<table>
+<tr>
+<td class="icon">
+<i class="fa icon-note" title="Note"></i>
+</td>
+<td class="content">
+Lucene index back-compatibility is only supported for the default codec. If you choose to customize the <code>docValuesFormat</code> in your schema.xml, upgrading to a future version of Solr may require you to either switch back to the default codec and optimize your index to rewrite it into the default codec before upgrading, or re-build your entire index from scratch after upgrading.
+</td>
+</tr>
+</table>
+</div>
+</div>
+</div>
+<div class="sect1">
+<h2 id="using-docvalues">Using DocValues</h2>
+<div class="sectionbody">
+<div class="sect2">
+<h3 id="sorting-faceting-functions">Sorting, Faceting &amp; Functions</h3>
+<div class="paragraph">
+<p>If <code>docValues="true"</code> for a field, then DocValues will automatically be used any time the field is used for <a href="common-query-parameters.html#CommonQueryParameters-ThesortParameter">sorting</a>, <a href="faceting.html#faceting">faceting</a> or <a href="function-queries.html#function-queries">function queries</a>.</p>
+</div>
+</div>
+<div class="sect2">
+<h3 id="DocValues-RetrievingDocValuesDuringSearch">Retrieving DocValues During Search</h3>
+<div class="paragraph">
+<p>Field values retrieved during search queries are typically returned from stored values. However, non-stored docValues fields will be also returned along with other stored fields when all fields (or pattern matching globs) are specified to be returned (e.g. &#8220;fl=*&#8221;) for search queries depending on the effective value of the <code>useDocValuesAsStored</code> parameter for each field. For schema versions &gt;= 1.6, the implicit default is <code>useDocValuesAsStored="true"</code>. See <a href="field-type-definitions-and-properties.html#field-type-definitions-and-properties">Field Type Definitions and Properties</a> &amp; <a href="defining-fields.html#defining-fields">Defining Fields</a> for more details.</p>
+</div>
+<div class="paragraph">
+<p>When <code>useDocValuesAsStored="false"</code>, non-stored DocValues fields can still be explicitly requested by name in the <a href="common-query-parameters.html#CommonQueryParameters-Thefl_FieldList_Parameter">fl param</a>, but will not match glob patterns (<code>"*"</code>). Note that returning DocValues along with "regular" stored fields at query time has performance implications that stored fields may not because DocValues are column-oriented and may therefore incur additional cost to retrieve for each returned document. Also note that while returning non-stored fields from DocValues, the values of a multi-valued field are returned in sorted order (and not insertion order). If you require the multi-valued fields to be returned in the original insertion order, then make your multi-valued field as stored (such a change requires re-indexing).</p>
+</div>
+<div class="paragraph">
+<p>In cases where the query is returning <em>only</em> docValues fields performance may improve since returning stored fields requires disk reads and decompression whereas returning docValues fields in the fl list only requires memory access.</p>
+</div>
+<div class="paragraph">
+<p>When retrieving fields from their docValues form (using the <a href="exporting-result-sets.html#exporting-result-sets">/export handler</a>, <a href="streaming-expressions.html#streaming-expressions">streaming expressions</a> or if the field is requested in the <code>fl</code> parameter), two important differences between regular stored fields and docValues fields must be understood:</p>
+</div>
+<div class="olist arabic">
+<ol class="arabic">
+<li>
+<p>Order is <em>not</em> preserved. For simply retrieving stored fields, the insertion order is the return order. For docValues, it is the <em>sorted</em> order.</p>
+</li>
+<li>
+<p>Multiple identical entries are collapsed into a single value. Thus if I insert values 4, 5, 2, 4, 1, my return will be 1, 2, 4, 5.</p>
+</li>
+</ol>
 </div>
 </div>
 </div>
@@ -1452,7 +1473,7 @@ When retrieving fields from their docVal
             <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/dynamic-fields.html
==============================================================================
--- websites/production/lucene/content/solr/guide/test-10290/dynamic-fields.html (original)
+++ websites/production/lucene/content/solr/guide/test-10290/dynamic-fields.html Tue May  9 19:22:29 2017
@@ -1277,10 +1277,11 @@ $('#toc').on('click', 'a', function() {
     
 
 <div id="main-content">
-  <div id="preamble">
-<div class="sectionbody">
+  <div class="paragraph">
+<p><em>Dynamic fields</em> allow Solr to index fields that you did not explicitly define in your schema.</p>
+</div>
 <div class="paragraph">
-<p><em>Dynamic fields</em> allow Solr to index fields that you did not explicitly define in your schema. This is useful if you discover you have forgotten to define one or more fields. Dynamic fields can make your application less brittle by providing some flexibility in the documents you can add to Solr.</p>
+<p>This is useful if you discover you have forgotten to define one or more fields. Dynamic fields can make your application less brittle by providing some flexibility in the documents you can add to Solr.</p>
 </div>
 <div class="paragraph">
 <p>A dynamic field is just like a regular field except it has a name with a wildcard in it. When you are indexing documents, a field that does not match any explicitly defined fields can be matched with a dynamic field.</p>
@@ -1300,20 +1301,6 @@ $('#toc').on('click', 'a', function() {
 <p>It is recommended that you include basic dynamic field mappings (like that shown above) in your <code>schema.xml</code>. The mappings can be very useful.</p>
 </div>
 </div>
-</div>
-<div class="sect1">
-<h2 id="DynamicFields-RelatedTopics">Related Topics</h2>
-<div class="sectionbody">
-<div class="ulist">
-<ul>
-<li>
-<p><a href="http://wiki.apache.org/solr/SchemaXml#Dynamic_fields">SchemaXML-Dynamic Fields</a></p>
-</li>
-</ul>
-</div>
-</div>
-</div>
-</div>
 
 <!-- Adds tags, if any -->
     <div class="tags">
@@ -1349,7 +1336,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>