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 [13/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/hadoop-authentication-plugin.html
==============================================================================
--- websites/production/lucene/content/solr/guide/test-10290/hadoop-authentication-plugin.html (original)
+++ websites/production/lucene/content/solr/guide/test-10290/hadoop-authentication-plugin.html Tue May  9 19:22:29 2017
@@ -1280,10 +1280,19 @@ $('#toc').on('click', 'a', function() {
   <div id="preamble">
 <div class="sectionbody">
 <div class="paragraph">
-<p>This enables Solr to use the <a href="https://hadoop.apache.org/docs/stable/hadoop-auth/index.html">Hadoop authentication library</a> for securing the Solr nodes. This authentication plugin is a thin wrapper that delegates all functionality to the Hadoop authentication library. All configuration parameters for the library are passed through the plugin.</p>
+<p>The Hadoop authentication plugin enables Solr to use the <a href="https://hadoop.apache.org/docs/stable/hadoop-auth/index.html">Hadoop authentication library</a> for securing Solr nodes.</p>
 </div>
 <div class="paragraph">
-<p>This plugin can be particularly useful in leveraging an extended set of features or newly available features in the Hadoop authentication library. Please note that the version of Hadoop library used by Solr is upgraded periodically. While Solr will ensure the stability and backwards compatibility of the structure of the plugin configuration (viz., the parameter names of this plugin), the values of these parameters may change based on the version of Hadoop library. Please review the Hadoop documentation for the version used by your Solr installation for more details. For some of the authentication schemes (e.g., Kerberos), Solr provides a native implementation of authentication plugin. If you require a more stable setup, in terms of configuration, ability to perform rolling upgrades, backward compatibility, etc., you should consider using such plugin. Please review the section <a href="authentication-and-authorization-plugins.html#authentication-and-authorization-plugins">Authenti
 cation and Authorization Plugins</a> for an overview of authentication plugin options in Solr.</p>
+<p>This authentication plugin is a thin wrapper that delegates all functionality to the Hadoop authentication library. All configuration parameters for the library are passed through the plugin.</p>
+</div>
+<div class="paragraph">
+<p>This plugin can be particularly useful in leveraging an extended set of features or newly available features in the Hadoop authentication library.</p>
+</div>
+<div class="paragraph">
+<p>Please note that the version of Hadoop library used by Solr is upgraded periodically. While Solr will ensure the stability and backwards compatibility of the structure of the plugin configuration (viz., the parameter names of this plugin), the values of these parameters may change based on the version of Hadoop library. Please review the Hadoop documentation for the version used by your Solr installation for more details.</p>
+</div>
+<div class="paragraph">
+<p>For some of the authentication schemes (e.g., Kerberos), Solr provides a native implementation of authentication plugin. If you require a more stable setup, in terms of configuration, ability to perform rolling upgrades, backward compatibility, etc., you should consider using such plugin. Please review the section <a href="authentication-and-authorization-plugins.html#authentication-and-authorization-plugins">Authentication and Authorization Plugins</a> for an overview of authentication plugin options in Solr.</p>
 </div>
 <div class="paragraph">
 <p>There are two plugin classes:</p>
@@ -1306,7 +1315,7 @@ $('#toc').on('click', 'a', function() {
 </td>
 <td class="content">
 <div class="paragraph">
-<p>For most SolrCloud or standalone Solr setups, the HadoopAuthPlugin should suffice.</p>
+<p>For most SolrCloud or standalone Solr setups, the <code>HadoopAuthPlugin</code> should suffice.</p>
 </div>
 </td>
 </tr>
@@ -1319,13 +1328,13 @@ $('#toc').on('click', 'a', function() {
 <div class="sectionbody">
 <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>
-<th class="tableblock halign-left valign-top">Parameter name</th>
+<th class="tableblock halign-left valign-top">Parameter Name</th>
 <th class="tableblock halign-left valign-top">Required</th>
 <th class="tableblock halign-left valign-top">Description</th>
 </tr>
@@ -1349,12 +1358,12 @@ $('#toc').on('click', 'a', function() {
 <tr>
 <td class="tableblock halign-left valign-top"><p class="tableblock">authConfigs</p></td>
 <td class="tableblock halign-left valign-top"><p class="tableblock">Yes</p></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock">Configuration parameters required by the authentication scheme defined by the type property. See <a href="https://hadoop.apache.org/docs/stable/hadoop-auth/Configuration.html">configuration</a> options.</p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">Configuration parameters required by the authentication scheme defined by the type property. For more details, see <a href="https://hadoop.apache.org/docs/stable/hadoop-auth/Configuration.html">Hadoop configuration</a> options.</p></td>
 </tr>
 <tr>
 <td class="tableblock halign-left valign-top"><p class="tableblock">defaultConfigs</p></td>
 <td class="tableblock halign-left valign-top"><p class="tableblock">No</p></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock">Default values for the configuration parameters specified by the <code>authConfigs</code> property. The default values are specified as a collection of key-value pairs (i.e., property-name : default_value).</p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">Default values for the configuration parameters specified by the <code>authConfigs</code> property. The default values are specified as a collection of key-value pairs (i.e., <code>property-name:default_value</code>).</p></td>
 </tr>
 <tr>
 <td class="tableblock halign-left valign-top"><p class="tableblock">enableDelegationToken</p></td>
@@ -1369,12 +1378,12 @@ $('#toc').on('click', 'a', function() {
 <tr>
 <td class="tableblock halign-left valign-top"><p class="tableblock">proxyUserConfigs</p></td>
 <td class="tableblock halign-left valign-top"><p class="tableblock">No</p></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock">Configures proxy users for the underlying Hadoop authentication mechanism. This configuration is expressed as a collection of key-value pairs (i.e., property-name : value).</p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">Configures proxy users for the underlying Hadoop authentication mechanism. This configuration is expressed as a collection of key-value pairs (i.e., <code>property-name:value</code>).</p></td>
 </tr>
 <tr>
 <td class="tableblock halign-left valign-top"><p class="tableblock">clientBuilderFactory</p></td>
 <td class="tableblock halign-left valign-top"><p class="tableblock">No</p></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock">The HttpClientBuilderFactory implementation used for the Solr internal communication. Only applicable for ConfigurableInternodeAuthHadoopPlugin</p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">The <code>HttpClientBuilderFactory</code> implementation used for the Solr internal communication. Only applicable for <code>ConfigurableInternodeAuthHadoopPlugin</code>.</p></td>
 </tr>
 </tbody>
 </table>
@@ -1386,7 +1395,10 @@ $('#toc').on('click', 'a', function() {
 <div class="sect2">
 <h3 id="HadoopAuthenticationPlugin-KerberosAuthenticationusingHadoopAuthenticationPlugin">Kerberos Authentication using Hadoop Authentication Plugin</h3>
 <div class="paragraph">
-<p>This example lets you configure Solr to use Kerberos Authentication, similar to how you would use the <a href="kerberos-authentication-plugin.html#kerberos-authentication-plugin">Kerberos Authentication Plugin</a>. After consulting the Hadoop authentication library&#8217;s documentation, you can supply per host configuration parameters using the "solr." prefix. As an example, the Hadoop authentication library expects a parameter "kerberos.principal", which can be supplied as a system property named "solr.kerberos.principal" when starting a Solr node. Refer to the <a href="kerberos-authentication-plugin.html#kerberos-authentication-plugin">Kerberos Authentication Plugin</a> page for other typical configuration parameters.</p>
+<p>This example lets you configure Solr to use Kerberos Authentication, similar to how you would use the <a href="kerberos-authentication-plugin.html#kerberos-authentication-plugin">Kerberos Authentication Plugin</a>.</p>
+</div>
+<div class="paragraph">
+<p>After consulting the Hadoop authentication library&#8217;s documentation, you can supply per host configuration parameters using the <code>solr.*</code> prefix. As an example, the Hadoop authentication library expects a parameter <code>kerberos.principal</code>, which can be supplied as a system property named <code>solr.kerberos.principal</code> when starting a Solr node. Refer to the section <a href="kerberos-authentication-plugin.html#kerberos-authentication-plugin">Kerberos Authentication Plugin</a> for other typical configuration parameters.</p>
 </div>
 <div class="paragraph">
 <p>Please note that this example uses <code>ConfigurableInternodeAuthHadoopPlugin</code>, and hence you must provide the <code>clientBuilderFactory</code> implementation. As a result, all internode communication will use the Kerberos mechanism, instead of PKI authentication.</p>
@@ -1396,42 +1408,42 @@ $('#toc').on('click', 'a', function() {
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="pygments highlight"><code data-lang="bash"><span style="color: #666666">{</span>
-    <span style="color: #BA2121">&quot;authentication&quot;</span>: <span style="color: #666666">{</span>
-        <span style="color: #BA2121">&quot;class&quot;</span>: <span style="color: #BA2121">&quot;solr.ConfigurableInternodeAuthHadoopPlugin&quot;</span>,
-        <span style="color: #BA2121">&quot;sysPropPrefix&quot;</span>: <span style="color: #BA2121">&quot;solr.&quot;</span>,
-        <span style="color: #BA2121">&quot;type&quot;</span>: <span style="color: #BA2121">&quot;kerberos&quot;</span>,
-        <span style="color: #BA2121">&quot;clientBuilderFactory&quot;</span>: <span style="color: #BA2121">&quot;org.apache.solr.client.solrj.impl.Krb5HttpClientBuilder&quot;</span>,
-        <span style="color: #BA2121">&quot;initKerberosZk&quot;</span>: <span style="color: #BA2121">&quot;true&quot;</span>,
-        <span style="color: #BA2121">&quot;authConfigs&quot;</span>: <span style="color: #666666">[</span>
+<pre class="pygments highlight"><code data-lang="json">{
+    <span style="color: #008000; font-weight: bold">&quot;authentication&quot;</span>: {
+        <span style="color: #008000; font-weight: bold">&quot;class&quot;</span>: <span style="color: #BA2121">&quot;solr.ConfigurableInternodeAuthHadoopPlugin&quot;</span>,
+        <span style="color: #008000; font-weight: bold">&quot;sysPropPrefix&quot;</span>: <span style="color: #BA2121">&quot;solr.&quot;</span>,
+        <span style="color: #008000; font-weight: bold">&quot;type&quot;</span>: <span style="color: #BA2121">&quot;kerberos&quot;</span>,
+        <span style="color: #008000; font-weight: bold">&quot;clientBuilderFactory&quot;</span>: <span style="color: #BA2121">&quot;org.apache.solr.client.solrj.impl.Krb5HttpClientBuilder&quot;</span>,
+        <span style="color: #008000; font-weight: bold">&quot;initKerberosZk&quot;</span>: <span style="color: #BA2121">&quot;true&quot;</span>,
+        <span style="color: #008000; font-weight: bold">&quot;authConfigs&quot;</span>: [
             <span style="color: #BA2121">&quot;kerberos.principal&quot;</span>,
             <span style="color: #BA2121">&quot;kerberos.keytab&quot;</span>,
             <span style="color: #BA2121">&quot;kerberos.name.rules&quot;</span>
-        <span style="color: #666666">]</span>,
-        <span style="color: #BA2121">&quot;defaultConfigs&quot;</span>: <span style="color: #666666">{</span>
-        <span style="color: #666666">}</span>
-    <span style="color: #666666">}</span>
-<span style="color: #666666">}</span></code></pre>
+        ],
+        <span style="color: #008000; font-weight: bold">&quot;defaultConfigs&quot;</span>: {
+        }
+    }
+}</code></pre>
 </div>
 </div>
 </div>
 <div class="sect2">
 <h3 id="HadoopAuthenticationPlugin-SimpleAuthenticationwithDelegationTokens">Simple Authentication with Delegation Tokens</h3>
 <div class="paragraph">
-<p>Similar to the previous example, this is an example of setting up Solr cluster that uses delegation tokens. Refer to the parameters in the Hadoop authentication library&#8217;s <a href="https://hadoop.apache.org/docs/stable/hadoop-auth/Configuration.html">documentation</a> or refer to the <a href="kerberos-authentication-plugin.html#kerberos-authentication-plugin">Kerberos Authentication Plugin</a> page for further details. Please note that this example does not use Kerberos and the requests made to Solr must contain valid delegation tokens.</p>
+<p>Similar to the previous example, this is an example of setting up a Solr cluster that uses delegation tokens. Refer to the parameters in the Hadoop authentication library&#8217;s <a href="https://hadoop.apache.org/docs/stable/hadoop-auth/Configuration.html">documentation</a> or refer to the section <a href="kerberos-authentication-plugin.html#kerberos-authentication-plugin">Kerberos Authentication Plugin</a> for further details. Please note that this example does not use Kerberos and the requests made to Solr must contain valid delegation tokens.</p>
 </div>
 <div class="paragraph">
 <p>To setup this plugin, use the following in your <code>security.json</code> file.</p>
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="pygments highlight"><code data-lang="bash"><span style="color: #666666">{</span>
-    <span style="color: #BA2121">&quot;authentication&quot;</span>: <span style="color: #666666">{</span>
-        <span style="color: #BA2121">&quot;class&quot;</span>: <span style="color: #BA2121">&quot;solr.HadoopAuthPlugin&quot;</span>,
-        <span style="color: #BA2121">&quot;sysPropPrefix&quot;</span>: <span style="color: #BA2121">&quot;solr.&quot;</span>,
-        <span style="color: #BA2121">&quot;type&quot;</span>: <span style="color: #BA2121">&quot;simple&quot;</span>,
-        <span style="color: #BA2121">&quot;enableDelegationToken&quot;</span>:<span style="color: #BA2121">&quot;true&quot;</span>,
-        <span style="color: #BA2121">&quot;authConfigs&quot;</span>: <span style="color: #666666">[</span>
+<pre class="pygments highlight"><code data-lang="json">{
+    <span style="color: #008000; font-weight: bold">&quot;authentication&quot;</span>: {
+        <span style="color: #008000; font-weight: bold">&quot;class&quot;</span>: <span style="color: #BA2121">&quot;solr.HadoopAuthPlugin&quot;</span>,
+        <span style="color: #008000; font-weight: bold">&quot;sysPropPrefix&quot;</span>: <span style="color: #BA2121">&quot;solr.&quot;</span>,
+        <span style="color: #008000; font-weight: bold">&quot;type&quot;</span>: <span style="color: #BA2121">&quot;simple&quot;</span>,
+        <span style="color: #008000; font-weight: bold">&quot;enableDelegationToken&quot;</span>:<span style="color: #BA2121">&quot;true&quot;</span>,
+        <span style="color: #008000; font-weight: bold">&quot;authConfigs&quot;</span>: [
             <span style="color: #BA2121">&quot;delegation-token.token-kind&quot;</span>,
             <span style="color: #BA2121">&quot;delegation-token.update-interval.sec&quot;</span>,
             <span style="color: #BA2121">&quot;delegation-token.max-lifetime.sec&quot;</span>,
@@ -1442,18 +1454,18 @@ $('#toc').on('click', 'a', function() {
             <span style="color: #BA2121">&quot;zk-dt-secret-manager.enable&quot;</span>,
             <span style="color: #BA2121">&quot;zk-dt-secret-manager.znodeWorkingPath&quot;</span>,
             <span style="color: #BA2121">&quot;signer.secret.provider.zookeeper.path&quot;</span>
-        <span style="color: #666666">]</span>,
-        <span style="color: #BA2121">&quot;defaultConfigs&quot;</span>: <span style="color: #666666">{</span>
-            <span style="color: #BA2121">&quot;delegation-token.token-kind&quot;</span>: <span style="color: #BA2121">&quot;solr-dt&quot;</span>,
-            <span style="color: #BA2121">&quot;signer.secret.provider&quot;</span>: <span style="color: #BA2121">&quot;zookeeper&quot;</span>,
-            <span style="color: #BA2121">&quot;zk-dt-secret-manager.enable&quot;</span>: <span style="color: #BA2121">&quot;true&quot;</span>,
-            <span style="color: #BA2121">&quot;token.validity&quot;</span>: <span style="color: #BA2121">&quot;36000&quot;</span>,
-            <span style="color: #BA2121">&quot;zk-dt-secret-manager.znodeWorkingPath&quot;</span>: <span style="color: #BA2121">&quot;solr/security/zkdtsm&quot;</span>,
-            <span style="color: #BA2121">&quot;signer.secret.provider.zookeeper.path&quot;</span>: <span style="color: #BA2121">&quot;/token&quot;</span>,
-            <span style="color: #BA2121">&quot;cookie.domain&quot;</span>: <span style="color: #BA2121">&quot;127.0.0.1&quot;</span>
-        <span style="color: #666666">}</span>
-    <span style="color: #666666">}</span>
-<span style="color: #666666">}</span></code></pre>
+        ],
+        <span style="color: #008000; font-weight: bold">&quot;defaultConfigs&quot;</span>: {
+            <span style="color: #008000; font-weight: bold">&quot;delegation-token.token-kind&quot;</span>: <span style="color: #BA2121">&quot;solr-dt&quot;</span>,
+            <span style="color: #008000; font-weight: bold">&quot;signer.secret.provider&quot;</span>: <span style="color: #BA2121">&quot;zookeeper&quot;</span>,
+            <span style="color: #008000; font-weight: bold">&quot;zk-dt-secret-manager.enable&quot;</span>: <span style="color: #BA2121">&quot;true&quot;</span>,
+            <span style="color: #008000; font-weight: bold">&quot;token.validity&quot;</span>: <span style="color: #BA2121">&quot;36000&quot;</span>,
+            <span style="color: #008000; font-weight: bold">&quot;zk-dt-secret-manager.znodeWorkingPath&quot;</span>: <span style="color: #BA2121">&quot;solr/security/zkdtsm&quot;</span>,
+            <span style="color: #008000; font-weight: bold">&quot;signer.secret.provider.zookeeper.path&quot;</span>: <span style="color: #BA2121">&quot;/token&quot;</span>,
+            <span style="color: #008000; font-weight: bold">&quot;cookie.domain&quot;</span>: <span style="color: #BA2121">&quot;127.0.0.1&quot;</span>
+        }
+    }
+}</code></pre>
 </div>
 </div>
 </div>
@@ -1495,7 +1507,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/highlighting.html
==============================================================================
--- websites/production/lucene/content/solr/guide/test-10290/highlighting.html (original)
+++ websites/production/lucene/content/solr/guide/test-10290/highlighting.html Tue May  9 19:22:29 2017
@@ -1280,7 +1280,13 @@ $('#toc').on('click', 'a', function() {
   <div id="preamble">
 <div class="sectionbody">
 <div class="paragraph">
-<p>Highlighting in Solr allows fragments of documents that match the user&#8217;s query to be included with the query response. The fragments are included in a special section of the response (the <code>highlighting</code> section), and the client uses the formatting clues also included to determine how to present the snippets to users. Fragments are a portion of a document field that contains matches from the query and are sometimes also referred to as snippets or passages. Highlighting is extremely configurable, perhaps more than any other part of Solr. There are many parameters each for fragment sizing, formatting, ordering, backup/alternate behavior, and more options that are hard to categorize. Nonetheless, highlighting is very simple to use.</p>
+<p>Highlighting in Solr allows fragments of documents that match the user&#8217;s query to be included with the query response.</p>
+</div>
+<div class="paragraph">
+<p>The fragments are included in a special section of the query response (the <code>highlighting</code> section), and the client uses the formatting clues also included to determine how to present the snippets to users. Fragments are a portion of a document field that contains matches from the query and are sometimes also referred to as "snippets" or "passages".</p>
+</div>
+<div class="paragraph">
+<p>Highlighting is extremely configurable, perhaps more than any other part of Solr. There are many parameters each for fragment sizing, formatting, ordering, backup/alternate behavior, and more options that are hard to categorize. Nonetheless, highlighting is very simple to use.</p>
 </div>
 </div>
 </div>
@@ -1292,9 +1298,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>
@@ -1317,7 +1323,7 @@ $('#toc').on('click', 'a', function() {
 <tr>
 <td class="tableblock halign-left valign-top"><p class="tableblock">hl.fl</p></td>
 <td class="tableblock halign-left valign-top"><p class="tableblock"><em>(df=)</em></p></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock">Specifies a list of fields to highlight. Accepts a comma- or space-delimited list of fields for which Solr should generate highlighted snippets. A wildcard of &#8216;<strong>&#8217; (asterisk) can be used to match field globs, such as 'text_</strong>' or even '<strong>' to highlight on all fields where highlighting is possible. When using '</strong>', consider adding <code>hl.requireFieldMatch=true</code></p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">Specifies a list of fields to highlight. Accepts a comma- or space-delimited list of fields for which Solr should generate highlighted snippets. A wildcard of <code>*</code> (asterisk) can be used to match field globs, such as <code>text_*</code> or even <code>*</code> to highlight on all fields where highlighting is possible. When using <code>\*</code>, consider adding <code>hl.requireFieldMatch=true</code>.</p></td>
 </tr>
 <tr>
 <td class="tableblock halign-left valign-top"><p class="tableblock">hl.q</p></td>
@@ -1336,7 +1342,7 @@ $('#toc').on('click', 'a', function() {
 <p>By default, <strong>false</strong>, all query terms will be highlighted for each field to be highlighted (<code>hl.fl</code>) no matter what fields the parsed query refer to. If set to <strong>true</strong>, only query terms aligning with the field being highlighted will in turn be highlighted.</p>
 </div>
 <div class="paragraph">
-<p>note: if the query references fields different from the field being highlighted and they have different text analysis, the query may not highlight query terms it should have and vice versa. The analysis used is that of the field being highlighted (<code>hl.fl</code>), not the query fields.</p>
+<p>Note: if the query references fields different from the field being highlighted and they have different text analysis, the query may not highlight query terms it should have and vice versa. The analysis used is that of the field being highlighted (<code>hl.fl</code>), not the query fields.</p>
 </div></div></td>
 </tr>
 <tr>
@@ -1372,12 +1378,12 @@ $('#toc').on('click', 'a', function() {
 <tr>
 <td class="tableblock halign-left valign-top"><p class="tableblock">hl.encoder</p></td>
 <td class="tableblock halign-left valign-top"><p class="tableblock"><em>(blank)</em></p></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock">If blank, the default, then the stored text will be returned without any escaping/encoding performed by the highlighter. If set to <strong>html</strong> then special HMTL/XML characters will be encoded (e.g. <code>&amp;</code> becomes <code>&amp;</code>). The pre/post snippet characters are never encoded.</p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">If blank, the default, then the stored text will be returned without any escaping/encoding performed by the highlighter. If set to <strong>html</strong> then special HMTL/XML characters will be encoded (e.g. <code>&amp;</code> becomes <code>&amp;amp;</code>). The pre/post snippet characters are never encoded.</p></td>
 </tr>
 <tr>
 <td class="tableblock halign-left valign-top"><p class="tableblock">hl.maxAnalyzedChars</p></td>
 <td class="tableblock halign-left valign-top"><p class="tableblock">51200</p></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock">The character limit to look for highlights, after which no highlighting will be done. This is mostly only a performance concern for an <em>analysis</em> based offset source since it&#8217;s the slowest. See <a href="#Highlighting-SchemaOptionsandPerformanceConsiderations">Schema Options and Performance Considerations</a></p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">The character limit to look for highlights, after which no highlighting will be done. This is mostly only a performance concern for an <em>analysis</em> based offset source since it&#8217;s the slowest. See <a href="#Highlighting-SchemaOptionsandPerformanceConsiderations">Schema Options and Performance Considerations</a>.</p></td>
 </tr>
 </tbody>
 </table>
@@ -1393,13 +1399,21 @@ $('#toc').on('click', 'a', function() {
 <p>Using the example documents included with Solr, we can see how this might work:</p>
 </div>
 <div class="paragraph">
-<p>In response to a query such as <code><a href="http://localhost:8983/solr/gettingstarted/select?hl=on&amp;q=apple&amp;wt=json&amp;hl.fl=manu&amp;fl=id,name,manu,cat" class="bare">http://localhost:8983/solr/gettingstarted/select?hl=on&amp;q=apple&amp;wt=json&amp;hl.fl=manu&amp;fl=id,name,manu,cat</a></code>, we get a response such as this (truncated slightly for space):</p>
+<p>In response to a query such as:</p>
+</div>
+<div class="listingblock">
+<div class="content">
+<pre class="pygments highlight"><code data-lang="text">http://localhost:8983/solr/gettingstarted/select?hl=on&amp;q=apple&amp;wt=json&amp;hl.fl=manu&amp;fl=id,name,manu,cat</code></pre>
+</div>
+</div>
+<div class="paragraph">
+<p>we get a response such as this (truncated slightly for space):</p>
 </div>
 <div class="listingblock">
 <div class="content">
 <pre class="pygments highlight"><code data-lang="json">{
     <span style="color: #008000; font-weight: bold">&quot;responseHeader&quot;</span>: {
-        <span style="border: 1px solid #FF0000">...</span>
+        <span style="color: #008000; font-weight: bold">&quot;...&quot;</span>
         }
     }<span style="border: 1px solid #FF0000">,</span>
     <span style="color: #BA2121">&quot;response&quot;</span><span style="border: 1px solid #FF0000">:</span> {
@@ -1426,7 +1440,10 @@ $('#toc').on('click', 'a', function() {
 </div>
 </div>
 <div class="paragraph">
-<p>Note the two sections <code>docs</code> and <code>highlighting</code>. The <code>docs</code> section contains the fields of the document requested with the <code>fl</code> parameter of the query (only "id", "name", "manu", and "cat"). The <code>highlighting</code> section includes the ID of each document, and the field that contains the highlighted portion. In this example, we used the <code>hl.fl</code> parameter to say we wanted query terms highlighted in the "manu" field. When there is a match to the query term in that field, it will be included for each document ID in the list.</p>
+<p>Note the two sections <code>docs</code> and <code>highlighting</code>. The <code>docs</code> section contains the fields of the document requested with the <code>fl</code> parameter of the query (only "id", "name", "manu", and "cat").</p>
+</div>
+<div class="paragraph">
+<p>The <code>highlighting</code> section includes the ID of each document, and the field that contains the highlighted portion. In this example, we used the <code>hl.fl</code> parameter to say we wanted query terms highlighted in the "manu" field. When there is a match to the query term in that field, it will be included for each document ID in the list.</p>
 </div>
 </div>
 </div>
@@ -1435,32 +1452,69 @@ $('#toc').on('click', 'a', function() {
 <h2 id="Highlighting-ChoosingaHighlighter">Choosing a Highlighter</h2>
 <div class="sectionbody">
 <div class="paragraph">
-<p>Solr provides a <code>HighlightComponent</code> (a <code>SearchComponent</code>) and it&#8217;s in the default list of components for search handlers. It offers a somewhat unified API over multiple actual highlighting implementations (or simply "highlighters") that do the business of highlighting. There are many parameters supported by more than one highlighter, and sometimes the implementation details and semantics will be a bit different, so don&#8217;t expect identical results when switching highlighters. You should use the <code>hl.method</code> parameter to choose a highlighter but it&#8217;s also possible to explicitly configure an implementation by class name in <code>solrconfig.xml</code>.</p>
+<p>Solr provides a <code>HighlightComponent</code> (a <code>SearchComponent</code>) and it&#8217;s in the default list of components for search handlers. It offers a somewhat unified API over multiple actual highlighting implementations (or simply "highlighters") that do the business of highlighting.</p>
+</div>
+<div class="paragraph">
+<p>There are many parameters supported by more than one highlighter, and sometimes the implementation details and semantics will be a bit different, so don&#8217;t expect identical results when switching highlighters. You should use the <code>hl.method</code> parameter to choose a highlighter but it&#8217;s also possible to explicitly configure an implementation by class name in <code>solrconfig.xml</code>.</p>
 </div>
 <div class="paragraph">
 <p>There are four highlighters available that can be chosen at runtime with the <code>hl.method</code> parameter, in order of general recommendation:</p>
 </div>
-<div class="ulist">
-<ul>
-<li>
-<p><strong><a href="#Highlighting-TheUnifiedHighlighter">Unified Highlighter</a></strong> : (<code>hl.method=unified</code>) The Unified Highlighter is the newest highlighter (as of Solr 6.4), which stands out as the most flexible and performant of the options. We recommend that you try this highlighter even though it isn&#8217;t the default (yet). It supports the most common highlighting parameters and can handle just about any query accurately, even SpanQueries (e.g. as seen from the <code>surround</code> parser). A strong benefit to this highlighter is that you can opt to configure Solr to put more information in the underlying index to speed up highlighting of large documents; multiple configurations are supported, even on a per-field basis. There is little or no such flexibility for the other highlighters. More on this below.</p>
-</li>
-<li>
-<p><strong><a href="#Highlighting-TheOriginalHighlighter">Original Highlighter</a></strong> : (<code>hl.method=original</code>, the default) The Original Highlighter, sometimes called the "Standard Highlighter" or "Default Highlighter", is Lucene&#8217;s original highlighter – a venerable option with a high degree of customization options. Its ability to highlight just about any query accurately is a strength shared with the Unified Highlighter (they share some code for this in fact). The Original Highlighter will normally analyze stored text on the fly in order to highlight. It will use full term vectors if available, however in this mode it isn&#8217;t as fast as the Unified Highlighter or FastVector Highlighter. This highlighter is a good choice for a wide variety of search use-cases. Where it falls short is performance; it&#8217;s often twice as slow as the Unified Highlighter. And despite being the most customizable, it doesn&#8217;t have a BreakIterator based fragmenter (
 all the others do), which could pose a challenge for some languages.</p>
-</li>
-<li>
-<p><strong><a href="#Highlighting-TheFastVectorHighlighter">FastVector Highlighter</a></strong> : (<code>hl.method=fastVector</code>) The FastVector Highlighter <em>requires</em> full term vector options (<code>termVectors</code>, <code>termPositions</code>, and <code>termOffsets</code>) on the field, and is optimized with that in mind. Its nearly as configurable as the Original Highlighter with some variability. It notably supports multi-colored highlighting such that different query words can be denoted in the fragment with different marking, usually expressed as an HTML tag with a unique color. Its query-representation is less advanced than the Original or Unified Highlighters: for example it will not work well with the <code>surround</code> parser, and there are multiple reported bugs pertaining to queries with stop-words. Note that both the FastVector and Original Highlighters can be used in conjunction in a search request to highlight some fields with one and some the other. I
 n contrast, the other highlighters can only be chosen exclusively.</p>
-</li>
-<li>
-<p><strong><a href="#Highlighting-ThePostingsHighlighter">Postings Highlighter</a></strong> : (<code>hl.method=postings</code>) The Postings Highlighter is the ancestor of the Unified Highlighter, supporting a subset of its options and none of its index configuration flexibility - it <em>requires</em> <code>storeOffsetsWithPositions</code> on all fields to highlight. This option is here for backwards compatibility; if you find you need it, please share your experience with the Solr community.</p>
-</li>
-</ul>
+<div class="dlist">
+<dl>
+<dt class="hdlist1"><a href="#Highlighting-TheUnifiedHighlighter">Unified Highlighter</a></dt>
+<dd>
+<p>(<code>hl.method=unified</code>)</p>
+<div class="paragraph">
+<p>The Unified Highlighter is the newest highlighter (as of Solr 6.4), which stands out as the most flexible and performant of the options. We recommend that you try this highlighter even though it isn&#8217;t the default (yet).</p>
+</div>
+<div class="paragraph">
+<p>This highlighter supports the most common highlighting parameters and can handle just about any query accurately, even SpanQueries (e.g. as seen from the <code>surround</code> parser). A strong benefit to this highlighter is that you can opt to configure Solr to put more information in the underlying index to speed up highlighting of large documents; multiple configurations are supported, even on a per-field basis. There is little or no such flexibility for the other highlighters. More on this below.</p>
+</div>
+</dd>
+<dt class="hdlist1"><a href="#Highlighting-TheOriginalHighlighter">Original Highlighter</a></dt>
+<dd>
+<p>(<code>hl.method=original</code>, the default)</p>
+<div class="paragraph">
+<p>The Original Highlighter, sometimes called the "Standard Highlighter" or "Default Highlighter", is Lucene&#8217;s original highlighter – a venerable option with a high degree of customization options. Its ability to highlight just about any query accurately is a strength shared with the Unified Highlighter (they share some code for this in fact).</p>
+</div>
+<div class="paragraph">
+<p>The Original Highlighter will normally analyze stored text on the fly in order to highlight. It will use full term vectors if available, however in this mode it isn&#8217;t as fast as the Unified Highlighter or FastVector Highlighter.</p>
+</div>
+<div class="paragraph">
+<p>This highlighter is a good choice for a wide variety of search use-cases. Where it falls short is performance; it&#8217;s often twice as slow as the Unified Highlighter. And despite being the most customizable, it doesn&#8217;t have a BreakIterator based fragmenter (all the others do), which could pose a challenge for some languages.</p>
+</div>
+</dd>
+<dt class="hdlist1"><a href="#Highlighting-TheFastVectorHighlighter">FastVector Highlighter</a></dt>
+<dd>
+<p>(<code>hl.method=fastVector</code>)</p>
+<div class="paragraph">
+<p>The FastVector Highlighter <em>requires</em> full term vector options (<code>termVectors</code>, <code>termPositions</code>, and <code>termOffsets</code>) on the field, and is optimized with that in mind. It is nearly as configurable as the Original Highlighter with some variability.</p>
+</div>
+<div class="paragraph">
+<p>This highlighter notably supports multi-colored highlighting such that different query words can be denoted in the fragment with different marking, usually expressed as an HTML tag with a unique color.</p>
+</div>
+<div class="paragraph">
+<p>This highlighter&#8217;s query-representation is less advanced than the Original or Unified Highlighters: for example it will not work well with the <code>surround</code> parser, and there are multiple reported bugs pertaining to queries with stop-words.</p>
+</div>
+<div class="paragraph">
+<p>Note that both the FastVector and Original Highlighters can be used in conjunction in a search request to highlight some fields with one and some the other. In contrast, the other highlighters can only be chosen exclusively.</p>
+</div>
+</dd>
+<dt class="hdlist1"><a href="#Highlighting-ThePostingsHighlighter">Postings Highlighter</a></dt>
+<dd>
+<p>(<code>hl.method=postings</code>)</p>
+<div class="paragraph">
+<p>The Postings Highlighter is the ancestor of the Unified Highlighter, supporting a subset of its options and none of its index configuration flexibility - it <em>requires</em> <code>storeOffsetsWithPositions</code> on all fields to highlight. This option is here for backwards compatibility; if you find you need it, please share your experience with the Solr community.</p>
+</div>
+</dd>
+</dl>
 </div>
 <div class="paragraph">
 <p>The Unified Highlighter and Postings Highlighter from which it derives, are exclusively configured via search parameters. In contrast, some settings for the Original and FastVector Highlighters are set in <code>solrconfig.xml</code>. There&#8217;s a robust example of the latter in the &#8220;<code>techproducts</code>&#8221; configset.</p>
 </div>
 <div class="paragraph">
-<p>In addition to further information below, more information can be found in the <a href="https://lucene.apache.org/solr/7_0_0//solr-core/org/apache/solr/highlight/package-summary.html">javadocs</a>.</p>
+<p>In addition to further information below, more information can be found in the <a href="https://lucene.apache.org/solr/7_0_0//solr-core/org/apache/solr/highlight/package-summary.html">Solr javadocs</a>.</p>
 </div>
 <div class="sect2">
 <h3 id="Highlighting-SchemaOptionsandPerformanceConsiderations">Schema Options and Performance Considerations</h3>
@@ -1470,20 +1524,41 @@ $('#toc').on('click', 'a', function() {
 <div class="ulist">
 <ul>
 <li>
-<p><strong>Analysis</strong>: Supported by the Unified and Original Highlighters. If you don&#8217;t go out of your way to configure the other options below, the highlighter will analyze the stored text on the fly (during highlighting) to calculate offsets. The benefit of this approach is that your index won&#8217;t grow larger with any extra data that isn&#8217;t strictly necessary for highlighting. The down side is that highlighting speed is roughly linear with the amount of text to process, with a large factor being the complexity of your analysis chain. For "short" text, this is a good choice. Or maybe it&#8217;s not short but you&#8217;re prioritizing a smaller index and indexing speed over highlighting performance.</p>
+<p><strong>Analysis</strong>: Supported by the Unified and Original Highlighters. If you don&#8217;t go out of your way to configure the other options below, the highlighter will analyze the stored text on the fly (during highlighting) to calculate offsets.</p>
+<div class="paragraph">
+<p>The benefit of this approach is that your index won&#8217;t grow larger with any extra data that isn&#8217;t strictly necessary for highlighting.</p>
+</div>
+<div class="paragraph">
+<p>The down side is that highlighting speed is roughly linear with the amount of text to process, with a large factor being the complexity of your analysis chain.</p>
+</div>
+<div class="paragraph">
+<p>For "short" text, this is a good choice. Or maybe it&#8217;s not short but you&#8217;re prioritizing a smaller index and indexing speed over highlighting performance.</p>
+</div>
 </li>
 <li>
-<p><strong>Postings</strong>: Supported by the Unified and Postings Highlighters. Set <code>storeOffsetsWithPositions</code> to <code>true</code>. This adds a moderate amount of extra data to the index but it speeds up highlighting tremendously, especially compared to analysis with longer text fields. However, wildcard queries will fall back to analysis unless "light" term vectors are added.</p>
+<p><strong>Postings</strong>: Supported by the Unified and Postings Highlighters. Set <code>storeOffsetsWithPositions</code> to <code>true</code>. This adds a moderate amount of extra data to the index but it speeds up highlighting tremendously, especially compared to analysis with longer text fields.</p>
+<div class="paragraph">
+<p>However, wildcard queries will fall back to analysis unless "light" term vectors are added.</p>
+</div>
 <div class="ulist">
 <ul>
 <li>
-<p><strong>with Term Vectors (light)</strong>: Supported only by the Unified Highlighter. To enable this mode set <code>termVectors</code> to <code>true</code> but no other term vector related options on the field being highlighted. This adds even more data to the index than just <code>storeOffsetsWithPositions</code> but not as much as enabling all the extra term vector options. Term Vectors are only accessed by the highlighter when a wildcard query is used and will prevent a fall back to analysis of the stored text. This is definitely the fastest option for highlighting wildcard queries on large text fields.</p>
+<p><strong>with Term Vectors (light)</strong>: Supported only by the Unified Highlighter. To enable this mode set <code>termVectors</code> to <code>true</code> but no other term vector related options on the field being highlighted.</p>
+<div class="paragraph">
+<p>This adds even more data to the index than just <code>storeOffsetsWithPositions</code> but not as much as enabling all the extra term vector options. Term Vectors are only accessed by the highlighter when a wildcard query is used and will prevent a fall back to analysis of the stored text.</p>
+</div>
+<div class="paragraph">
+<p>This is definitely the fastest option for highlighting wildcard queries on large text fields.</p>
+</div>
 </li>
 </ul>
 </div>
 </li>
 <li>
-<p><strong>Term Vectors (full)</strong>: Supported by the Unified, FastVector, and Original Highlighters. Set <code>termVectors</code>, <code>termPositions</code>, and <code>termOffsets</code> to <code>true</code>, and potentially <code>termPayloads</code> for advanced use cases. This adds substantial weight to the index – similar in size to the compressed stored text. If you are using the Unified Highlighter then this is not a recommended configuration since it&#8217;s slower and heavier than postings with light term vectors. However, this could make sense if full term vectors are already needed for another use-case.</p>
+<p><strong>Term Vectors (full)</strong>: Supported by the Unified, FastVector, and Original Highlighters. Set <code>termVectors</code>, <code>termPositions</code>, and <code>termOffsets</code> to <code>true</code>, and potentially <code>termPayloads</code> for advanced use cases.</p>
+<div class="paragraph">
+<p>This adds substantial weight to the index – similar in size to the compressed stored text. If you are using the Unified Highlighter then this is not a recommended configuration since it&#8217;s slower and heavier than postings with light term vectors. However, this could make sense if full term vectors are already needed for another use-case.</p>
+</div>
 </li>
 </ul>
 </div>
@@ -1498,9 +1573,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>
@@ -1513,7 +1588,7 @@ $('#toc').on('click', 'a', function() {
 <tr>
 <td class="tableblock halign-left valign-top"><p class="tableblock">hl.offsetSource</p></td>
 <td class="tableblock halign-left valign-top"><p class="tableblock"><em>(blank)</em></p></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock">By default, the Unified Highlighter will usually pick the right offset source (see above). However it may be ambiguous such as during a migration from one offset source to another that hasn&#8217;t completed. The offset source can be explicitly configured to one of: <strong>ANALYSIS,</strong> <strong>POSTINGS</strong>, <strong>POSTINGS_WITH_TERM_VECTORS, *TERM_VECTORS</strong>*</p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">By default, the Unified Highlighter will usually pick the right offset source (see above). However it may be ambiguous such as during a migration from one offset source to another that hasn&#8217;t completed. The offset source can be explicitly configured to one of: <strong>ANALYSIS,</strong> <strong>POSTINGS</strong>, <strong>POSTINGS_WITH_TERM_VECTORS</strong>, <strong>TERM_VECTORS</strong></p></td>
 </tr>
 <tr>
 <td class="tableblock halign-left valign-top"><p class="tableblock">hl.tag.ellipsis</p></td>
@@ -1570,7 +1645,45 @@ $('#toc').on('click', 'a', function() {
 <div class="sect2">
 <h3 id="Highlighting-ThePostingsHighlighter">The Postings Highlighter</h3>
 <div class="paragraph">
-<p>The Postings Highlighter is the ancestor of the Unified Highlighter, supporting a subset of it&#8217;s options and sometimes with different default settings for some common parameters. Viewed from the perspective of the Unified Highlighter, these settings are effectively non-settings and fixed as-such: <code>hl.offsetSource=POSTINGS</code>, <code>hl.requireFieldMatch=true</code>, <code>hl.usePhraseHighlighter=false</code>, <code>hl.fragsize=-1</code> (none). It has these different default settings: <code>hl.defaultSummary=true</code>, <code>hl.tag.ellipsis="&#8230;&#8203; "</code>. In addition, it has a setting <code>hl.multiValuedSeparatorChar=" "</code> (space). This highlighter never returns separate snippets as separate values; they are always joined by <code>hl.tag.ellipsis</code>.</p>
+<p>The Postings Highlighter is the ancestor of the Unified Highlighter, supporting a subset of it&#8217;s options and sometimes with different default settings for some common parameters.</p>
+</div>
+<div class="paragraph">
+<p>Viewed from the perspective of the Unified Highlighter, these settings are effectively non-settings and fixed as-such:</p>
+</div>
+<div class="ulist">
+<ul>
+<li>
+<p><code>hl.offsetSource=POSTINGS</code></p>
+</li>
+<li>
+<p><code>hl.requireFieldMatch=true</code></p>
+</li>
+<li>
+<p><code>hl.usePhraseHighlighter=false</code></p>
+</li>
+<li>
+<p><code>hl.fragsize=-1</code> (none).</p>
+</li>
+</ul>
+</div>
+<div class="paragraph">
+<p>It has these different default settings:</p>
+</div>
+<div class="ulist">
+<ul>
+<li>
+<p><code>hl.defaultSummary=true</code></p>
+</li>
+<li>
+<p><code>hl.tag.ellipsis="&#8230;&#8203; "</code>.</p>
+</li>
+</ul>
+</div>
+<div class="paragraph">
+<p>In addition, it has a setting <code>hl.multiValuedSeparatorChar=" "</code> (space).</p>
+</div>
+<div class="paragraph">
+<p>This highlighter never returns separate snippets as separate values; they are always joined by <code>hl.tag.ellipsis</code>.</p>
 </div>
 </div>
 </div>
@@ -1583,9 +1696,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: 25%;">
+<col style="width: 15%;">
+<col style="width: 60%;">
 </colgroup>
 <thead>
 <tr>
@@ -1681,17 +1794,27 @@ $('#toc').on('click', 'a', function() {
 <div class="paragraph">
 <p>In addition to the initial listed parameters, the following parameters documented for the Original Highlighter above are also supported by the FVH:</p>
 </div>
-<div class="paragraph">
-<p><code>hl.alternateField</code>, <code>hl.maxAlternateFieldLength</code>, <code>hl.highlightAlternate</code></p>
+<div class="ulist">
+<ul>
+<li>
+<p><code>hl.alternateField</code></p>
+</li>
+<li>
+<p><code>hl.maxAlternateFieldLength</code></p>
+</li>
+<li>
+<p><code>hl.highlightAlternate</code></p>
+</li>
+</ul>
 </div>
 <div class="paragraph">
 <p>And here are additional parameters supported by the FVH:</p>
 </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>
@@ -1714,12 +1837,12 @@ $('#toc').on('click', 'a', function() {
 <tr>
 <td class="tableblock halign-left valign-top"><p class="tableblock">hl.boundaryScanner</p></td>
 <td class="tableblock halign-left valign-top"></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock">see below</p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">See <a href="#Highlighting-UsingBoundaryScannerswiththeFastVectorHighlighter">Using Boundary Scanners with the FastVector Highlighter</a> below.</p></td>
 </tr>
 <tr>
 <td class="tableblock halign-left valign-top"><p class="tableblock">hl.bs.*</p></td>
 <td class="tableblock halign-left valign-top"></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock">see below</p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">See <a href="#Highlighting-UsingBoundaryScannerswiththeFastVectorHighlighter">Using Boundary Scanners with the FastVector Highlighter</a> below.</p></td>
 </tr>
 <tr>
 <td class="tableblock halign-left valign-top"><p class="tableblock">hl.phraseLimit</p></td>
@@ -1816,7 +1939,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/how-solrcloud-works.html
==============================================================================
--- websites/production/lucene/content/solr/guide/test-10290/how-solrcloud-works.html (original)
+++ websites/production/lucene/content/solr/guide/test-10290/how-solrcloud-works.html Tue May  9 19:22:29 2017
@@ -1285,22 +1285,13 @@ $('#toc').on('click', 'a', function() {
 <div class="ulist">
 <ul>
 <li>
-<p><a id="sc32604299"></a></p>
-<div class="paragraph">
-<p><a href="#/confluence/display/solr/Shards+and+Indexing+Data+in+SolrCloud">Shards and Indexing Data in SolrCloud</a></p>
-</div>
+<p><a href="shards-and-indexing-data-in-solrcloud.html#shards-and-indexing-data-in-solrcloud">Shards and Indexing Data in SolrCloud</a></p>
 </li>
 <li>
-<p><a id="sc32604297"></a></p>
-<div class="paragraph">
-<p><a href="#/confluence/display/solr/Distributed+Requests">Distributed Requests</a></p>
-</div>
+<p><a href="distributed-requests.html#distributed-requests">Distributed Requests</a></p>
 </li>
 <li>
-<p><a id="sc32604296"></a></p>
-<div class="paragraph">
-<p><a href="#/confluence/display/solr/Read+and+Write+Side+Fault+Tolerance">Read and Write Side Fault Tolerance</a></p>
-</div>
+<p><a href="read-and-write-side-fault-tolerance.html#read-and-write-side-fault-tolerance">Read and Write Side Fault Tolerance</a></p>
 </li>
 </ul>
 </div>
@@ -1411,7 +1402,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>

Added: websites/production/lucene/content/solr/guide/test-10290/images/a-quick-overview/sample-client-app-arch.svg
==============================================================================
--- websites/production/lucene/content/solr/guide/test-10290/images/a-quick-overview/sample-client-app-arch.svg (added)
+++ websites/production/lucene/content/solr/guide/test-10290/images/a-quick-overview/sample-client-app-arch.svg Tue May  9 19:22:29 2017
@@ -0,0 +1,488 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="951.83209"
+   height="722.24835"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.48.3.1 r9886"
+   sodipodi:docname="arch.svg"
+   inkscape:export-filename="/home/hossman/tmp/arch.png"
+   inkscape:export-xdpi="90"
+   inkscape:export-ydpi="90">
+  <defs
+     id="defs4">
+    <marker
+       inkscape:stockid="TriangleInL"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="TriangleInL"
+       style="overflow:visible">
+      <path
+         id="path4575"
+         d="m 5.77,0 -8.65,5 0,-10 8.65,5 z"
+         style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt"
+         transform="scale(-0.8,-0.8)"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       inkscape:stockid="TriangleOutL"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="TriangleOutL"
+       style="overflow:visible">
+      <path
+         id="path4584"
+         d="m 5.77,0 -8.65,5 0,-10 8.65,5 z"
+         style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt"
+         transform="scale(0.8,0.8)"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow2Lend"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="Arrow2Lend"
+       style="overflow:visible">
+      <path
+         id="path4463"
+         style="fill-rule:evenodd;stroke-width:0.625;stroke-linejoin:round"
+         d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z"
+         transform="matrix(-1.1,0,0,-1.1,-1.1,0)"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <clipPath
+       id="clipPath3037"
+       clipPathUnits="userSpaceOnUse">
+      <path
+         id="path3039"
+         d="m 0,102.654 203.005,0 L 203.005,0 0,0 0,102.654 z"
+         inkscape:connector-curvature="0" />
+    </clipPath>
+    <clipPath
+       id="clipPath3151"
+       clipPathUnits="userSpaceOnUse">
+      <path
+         id="path3153"
+         d="m 0,102.654 203.005,0 L 203.005,0 0,0 0,102.654 z"
+         inkscape:connector-curvature="0" />
+    </clipPath>
+    <clipPath
+       id="clipPath3151-9"
+       clipPathUnits="userSpaceOnUse">
+      <path
+         inkscape:connector-curvature="0"
+         id="path3153-7"
+         d="m 0,102.654 203.005,0 L 203.005,0 0,0 0,102.654 z" />
+    </clipPath>
+    <marker
+       inkscape:stockid="TriangleInL"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="TriangleInL-6"
+       style="overflow:visible">
+      <path
+         inkscape:connector-curvature="0"
+         id="path4575-5"
+         d="m 5.77,0 -8.65,5 0,-10 8.65,5 z"
+         style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt"
+         transform="scale(-0.8,-0.8)" />
+    </marker>
+    <marker
+       inkscape:stockid="TriangleInL"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="marker5640"
+       style="overflow:visible">
+      <path
+         inkscape:connector-curvature="0"
+         id="path5642"
+         d="m 5.77,0 -8.65,5 0,-10 8.65,5 z"
+         style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt"
+         transform="scale(-0.8,-0.8)" />
+    </marker>
+    <marker
+       inkscape:stockid="TriangleInL"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="TriangleInL-2"
+       style="overflow:visible">
+      <path
+         inkscape:connector-curvature="0"
+         id="path4575-9"
+         d="m 5.77,0 -8.65,5 0,-10 8.65,5 z"
+         style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt"
+         transform="scale(-0.8,-0.8)" />
+    </marker>
+    <marker
+       inkscape:stockid="TriangleInL"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="marker5640-2"
+       style="overflow:visible">
+      <path
+         inkscape:connector-curvature="0"
+         id="path5642-6"
+         d="m 5.77,0 -8.65,5 0,-10 8.65,5 z"
+         style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt"
+         transform="scale(-0.8,-0.8)" />
+    </marker>
+    <marker
+       inkscape:stockid="TriangleInL"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="TriangleInL-0"
+       style="overflow:visible">
+      <path
+         inkscape:connector-curvature="0"
+         id="path4575-1"
+         d="m 5.77,0 -8.65,5 0,-10 8.65,5 z"
+         style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt"
+         transform="scale(-0.8,-0.8)" />
+    </marker>
+    <marker
+       inkscape:stockid="TriangleInL"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="marker5640-8"
+       style="overflow:visible">
+      <path
+         inkscape:connector-curvature="0"
+         id="path5642-2"
+         d="m 5.77,0 -8.65,5 0,-10 8.65,5 z"
+         style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt"
+         transform="scale(-0.8,-0.8)" />
+    </marker>
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="0.50362889"
+     inkscape:cx="500.2462"
+     inkscape:cy="305.15545"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     inkscape:object-nodes="true"
+     inkscape:window-width="1025"
+     inkscape:window-height="709"
+     inkscape:window-x="125"
+     inkscape:window-y="99"
+     inkscape:window-maximized="0"
+     fit-margin-top="50"
+     fit-margin-right="50"
+     fit-margin-bottom="50"
+     fit-margin-left="50" />
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(185.02727,-109.08811)">
+    <g
+       id="g3236"
+       transform="translate(-255.1482,174.73183)">
+      <g
+         id="g3145"
+         inkscape:label="Solr_Logo_on_white"
+         transform="matrix(1.25,0,0,-1.25,160.03949,571.47669)">
+        <g
+           id="g3147">
+          <g
+             id="g3149"
+             clip-path="url(#clipPath3151)">
+            <g
+               id="g3155"
+               transform="translate(40.7606,31.7631)">
+              <path
+                 inkscape:connector-curvature="0"
+                 d="m 0,0 c -2.345,1.248 -4.995,2.127 -7.875,2.613 -2.829,0.476 -5.707,0.717 -8.554,0.717 -2.327,0 -4.681,0.201 -6.998,0.597 -2.256,0.384 -4.299,1.092 -6.076,2.104 -1.729,0.984 -3.159,2.361 -4.252,4.095 -1.078,1.706 -1.624,3.968 -1.624,6.697 0.052,2.41 0.612,4.472 1.666,6.129 1.068,1.684 2.464,3.052 4.147,4.067 1.726,1.041 3.718,1.806 5.921,2.274 3.751,0.796 7.713,0.945 11.749,0.382 1.575,-0.222 3.133,-0.615 4.63,-1.168 1.47,-0.545 2.852,-1.292 4.106,-2.217 1.236,-0.915 2.328,-2.063 3.246,-3.411 L 0.6,22.124 4.388,23.718 3.584,24.853 c -1.031,1.456 -2.173,2.767 -3.395,3.899 -1.247,1.151 -2.712,2.13 -4.356,2.906 -1.623,0.765 -3.48,1.354 -5.522,1.751 -2.021,0.392 -4.377,0.59 -7.003,0.59 -2.519,0 -5.12,-0.288 -7.73,-0.858 -2.649,-0.58 -5.106,-1.538 -7.301,-2.849 -2.242,-1.34 -4.09,-3.125 -5.493,-5.306 -1.425,-2.219 -2.149,-4.957 -2.149,-8.139 0,-3.34 0.671,-6.183 1.993,-8.449 1.314,-2.252 3.076,-4.077 5.237,-5.423 2.116,-1.32 4.585,-2.269 7.338,-2.82 2.69,-0.538 5.505,-
 0.811 8.368,-0.811 2.276,0 4.686,-0.172 7.164,-0.515 2.411,-0.333 4.655,-1.005 6.669,-1.997 1.962,-0.969 3.597,-2.316 4.857,-4.005 1.219,-1.635 1.838,-3.843 1.838,-6.562 0,-2.442 -0.596,-4.524 -1.769,-6.193 -1.212,-1.724 -2.786,-3.147 -4.679,-4.229 -1.934,-1.105 -4.123,-1.919 -6.51,-2.418 -2.425,-0.508 -4.825,-0.765 -7.132,-0.765 -3.873,0 -7.7,0.74 -11.374,2.2 -3.658,1.451 -6.902,3.632 -9.64,6.482 l -0.735,0.765 -3.021,-2.618 0.848,-0.848 c 2.703,-2.705 6.06,-5.06 9.975,-7.002 3.963,-1.967 8.656,-2.964 13.947,-2.964 2.516,0 5.186,0.288 7.938,0.855 2.79,0.577 5.408,1.562 7.78,2.931 2.41,1.39 4.415,3.209 5.962,5.406 1.589,2.257 2.395,5.081 2.395,8.398 0,3.361 -0.755,6.207 -2.245,8.459 C 4.368,-3.056 2.404,-1.28 0,0"
+                 style="fill:#241f2b;fill-opacity:1;fill-rule:nonzero;stroke:none"
+                 id="path3157" />
+            </g>
+            <g
+               id="g3159"
+               transform="translate(76.3898,3.9853)">
+              <path
+                 inkscape:connector-curvature="0"
+                 d="m 0,0 c -2.732,0 -5.23,0.564 -7.426,1.676 -2.225,1.125 -4.189,2.657 -5.839,4.556 -1.659,1.907 -2.977,4.137 -3.917,6.629 -0.947,2.503 -1.484,5.127 -1.593,7.754 0,2.429 0.45,4.911 1.336,7.378 0.885,2.459 2.174,4.702 3.833,6.666 1.654,1.957 3.667,3.578 5.984,4.82 2.278,1.22 4.842,1.839 7.622,1.839 2.614,0 5.083,-0.579 7.338,-1.719 2.286,-1.157 4.297,-2.707 5.978,-4.607 1.685,-1.908 3.031,-4.139 4.002,-6.632 0.967,-2.49 1.457,-5.096 1.457,-7.745 0,-2.426 -0.45,-4.909 -1.335,-7.377 C 16.553,10.774 15.264,8.532 13.606,6.57 11.955,4.617 9.945,3.012 7.631,1.8 5.352,0.605 2.785,0 0,0 m 16.577,37.377 c -1.982,2.316 -4.391,4.232 -7.162,5.694 -2.809,1.482 -5.977,2.232 -9.415,2.232 -3.132,0 -6.124,-0.671 -8.893,-1.993 -2.749,-1.314 -5.18,-3.126 -7.225,-5.384 -2.037,-2.249 -3.67,-4.898 -4.854,-7.873 -1.186,-2.979 -1.788,-6.155 -1.788,-9.438 0,-3.103 0.555,-6.14 1.65,-9.027 1.093,-2.885 2.649,-5.503 4.625,-7.784 1.985,-2.291 4.399,-4.164 7.175,-5.566 2.797,-1.414 5.923,-2.162 9
 .29,-2.223 l 0.021,0 0.021,0 c 3.186,0.061 6.203,0.778 8.967,2.128 2.744,1.34 5.172,3.166 7.217,5.424 2.037,2.25 3.656,4.87 4.81,7.787 1.157,2.924 1.744,6.04 1.744,9.261 0,2.917 -0.539,5.89 -1.6,8.835 -1.063,2.945 -2.605,5.612 -4.583,7.927"
+                 style="fill:#241f2b;fill-opacity:1;fill-rule:nonzero;stroke:none"
+                 id="path3161" />
+            </g>
+            <g
+               id="g3163"
+               transform="translate(119.7832,5.0906)">
+              <path
+                 inkscape:connector-curvature="0"
+                 d="m 0,0 c -0.67,-0.167 -1.26,-0.294 -1.752,-0.376 -0.518,-0.086 -1.08,-0.173 -1.685,-0.259 -0.557,-0.079 -1.108,-0.12 -1.638,-0.12 -1.337,0 -2.321,0.443 -3.01,1.355 -0.761,1.004 -1.131,2.001 -1.131,3.049 l 0,58.337 -3.985,0 0,-58.337 c 0,-2.189 0.691,-4.126 2.055,-5.754 1.413,-1.691 3.426,-2.547 5.983,-2.547 0.802,0 1.598,0.047 2.367,0.139 0.742,0.089 1.409,0.178 2.006,0.267 0.61,0.092 1.316,0.23 2.1,0.41 L 2.661,-3.524 0.887,0.222 0,0 z"
+                 style="fill:#241f2b;fill-opacity:1;fill-rule:nonzero;stroke:none"
+                 id="path3165" />
+            </g>
+            <g
+               id="g3167"
+               transform="translate(136.9779,45.2734)">
+              <path
+                 inkscape:connector-curvature="0"
+                 d="m 0,0 c -2.073,-1.457 -3.904,-3.307 -5.471,-5.522 l 0,8.836 -3.985,0 0,-47.711 3.985,0 0,29.704 c 0.552,1.946 1.312,3.771 2.261,5.426 0.957,1.667 2.148,3.135 3.538,4.362 1.39,1.226 3.008,2.221 4.811,2.958 1.798,0.736 3.827,1.166 6.031,1.277 l 1.06,0.053 0,3.931 -1.116,0 C 6.867,3.314 3.128,2.199 0,0"
+                 style="fill:#241f2b;fill-opacity:1;fill-rule:nonzero;stroke:none"
+                 id="path3169" />
+            </g>
+            <g
+               id="g3171"
+               transform="translate(193.9115,92.0414)">
+              <path
+                 inkscape:connector-curvature="0"
+                 d="M 0,0 -33,-35.677 8.473,-16.543 C 7.246,-10.213 4.242,-4.521 0,0"
+                 style="fill:#da3522;fill-opacity:1;fill-rule:nonzero;stroke:none"
+                 id="path3173" />
+            </g>
+            <g
+               id="g3175"
+               transform="translate(169.4268,102.6536)">
+              <path
+                 inkscape:connector-curvature="0"
+                 d="M 0,0 C -4.572,0 -8.928,-0.917 -12.9,-2.572 L -17.328,-39.886 4.799,-0.347 C 3.231,-0.122 1.63,0 0,0"
+                 style="fill:#da3522;fill-opacity:1;fill-rule:nonzero;stroke:none"
+                 id="path3177" />
+            </g>
+            <g
+               id="g3179"
+               transform="translate(202.7133,73.4428)">
+              <path
+                 inkscape:connector-curvature="0"
+                 d="m 0,0 -39.298,-21.992 36.87,4.375 c 1.748,4.065 2.72,8.543 2.72,13.249 C 0.292,-2.886 0.186,-1.431 0,0"
+                 style="fill:#da3522;fill-opacity:1;fill-rule:nonzero;stroke:none"
+                 id="path3181" />
+            </g>
+            <g
+               id="g3183"
+               transform="translate(188.2247,41.2478)">
+              <path
+                 inkscape:connector-curvature="0"
+                 d="M 0,0 C 4.391,2.972 8.037,6.958 10.612,11.619 L -23.947,4.756 0,0 z"
+                 style="fill:#da3522;fill-opacity:1;fill-rule:nonzero;stroke:none"
+                 id="path3185" />
+            </g>
+            <g
+               id="g3187"
+               transform="translate(176.2492,101.9586)">
+              <path
+                 inkscape:connector-curvature="0"
+                 d="M 0,0 -19.237,-41.695 16.448,-8.689 C 11.973,-4.384 6.313,-1.303 0,0"
+                 style="fill:#da3522;fill-opacity:1;fill-rule:nonzero;stroke:none"
+                 id="path3189" />
+            </g>
+            <g
+               id="g3191"
+               transform="translate(172.2334,35.622)">
+              <path
+                 inkscape:connector-curvature="0"
+                 d="M 0,0 C 3.718,0.308 7.264,1.217 10.54,2.638 L -8.818,4.935 0,0 z"
+                 style="fill:#da3522;fill-opacity:1;fill-rule:nonzero;stroke:none"
+                 id="path3193" />
+            </g>
+            <g
+               id="g3195"
+               transform="translate(138.8186,82.8789)">
+              <path
+                 inkscape:connector-curvature="0"
+                 d="M 0,0 C -1.51,-3.343 -2.489,-6.974 -2.829,-10.792 L 2.386,-20.112 0,0 z"
+                 style="fill:#da3522;fill-opacity:1;fill-rule:nonzero;stroke:none"
+                 id="path3197" />
+            </g>
+            <g
+               id="g3199"
+               transform="translate(153.617,98.7011)">
+              <path
+                 inkscape:connector-curvature="0"
+                 d="M 0,0 C -4.738,-2.534 -8.794,-6.17 -11.832,-10.567 L -6.965,-35.071 0,0 z"
+                 style="fill:#da3522;fill-opacity:1;fill-rule:nonzero;stroke:none"
+                 id="path3201" />
+            </g>
+          </g>
+        </g>
+      </g>
+      <rect
+         y="409.03134"
+         x="121.12093"
+         height="196.57332"
+         width="331.59335"
+         id="rect3234"
+         style="opacity:0.79680008;fill:none;stroke:#000000;stroke-width:2;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+    </g>
+    <g
+       id="g4393"
+       transform="translate(-254.1554,71.23301)">
+      <rect
+         y="90.344292"
+         x="120.12814"
+         height="196.57332"
+         width="331.59335"
+         id="rect3234-0"
+         style="fill:#0008de;fill-opacity:0.25531915;stroke:#000000;stroke-width:2;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+      <text
+         sodipodi:linespacing="125%"
+         id="text3402"
+         y="149.31458"
+         x="284.4502"
+         style="font-size:40px;font-style:normal;font-weight:normal;text-align:center;line-height:125%;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans"
+         xml:space="preserve"><tspan
+           y="149.31458"
+           x="284.4502"
+           id="tspan3404"
+           sodipodi:role="line">Content</tspan><tspan
+           id="tspan3406"
+           y="199.31458"
+           x="284.4502"
+           sodipodi:role="line">Management</tspan><tspan
+           id="tspan3408"
+           y="249.31458"
+           x="284.4502"
+           sodipodi:role="line">System</tspan></text>
+    </g>
+    <g
+       id="g4400"
+       transform="translate(301.80953,-76.445144)">
+      <text
+         sodipodi:linespacing="125%"
+         id="text3435"
+         y="744.53015"
+         x="249.76111"
+         style="font-size:40px;font-style:normal;font-weight:normal;text-align:center;line-height:125%;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans"
+         xml:space="preserve"><tspan
+           y="744.53015"
+           x="249.76111"
+           id="tspan3437"
+           sodipodi:role="line">End User</tspan><tspan
+           id="tspan3439"
+           y="794.53015"
+           x="249.76111"
+           sodipodi:role="line">Application</tspan></text>
+      <rect
+         y="660.20831"
+         x="82.401939"
+         height="196.57332"
+         width="331.59335"
+         id="rect3234-0-6-4"
+         style="fill:#0008de;fill-opacity:0.25531915;stroke:#000000;stroke-width:2;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+    </g>
+    <g
+       id="g4425"
+       transform="translate(757.254,-37.477991)">
+      <path
+         inkscape:transform-center-y="194.58772"
+         inkscape:transform-center-x="45.668548"
+         d="m -101.26504,410.02414 c 0,10.4178 -47.56035,18.8631 -106.22901,18.8631 -58.66866,0 -106.22901,-8.4453 -106.22901,-18.8631 0,-10.4178 47.56035,-18.8631 106.22901,-18.8631 58.66866,0 106.22901,8.4453 106.22901,18.8631 z"
+         sodipodi:ry="18.863096"
+         sodipodi:rx="106.22901"
+         sodipodi:cy="410.02414"
+         sodipodi:cx="-207.49405"
+         id="path3502-5"
+         style="opacity:0.79680008;fill:none;stroke:#000000;stroke-width:2;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+         sodipodi:type="arc"
+         transform="translate(0.24819563,-193.59494)" />
+      <path
+         sodipodi:open="true"
+         sodipodi:end="3.1415927"
+         sodipodi:start="0"
+         inkscape:transform-center-y="194.58772"
+         inkscape:transform-center-x="45.668548"
+         d="m -101.26504,410.02414 c 0,10.4178 -47.56035,18.8631 -106.22901,18.8631 -58.66866,0 -106.22901,-8.4453 -106.22901,-18.8631 0,0 0,0 0,0"
+         sodipodi:ry="18.863096"
+         sodipodi:rx="106.22901"
+         sodipodi:cy="410.02414"
+         sodipodi:cx="-207.49405"
+         id="path3502-5-4"
+         style="opacity:0.79680008;fill:none;stroke:#000000;stroke-width:2;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+         sodipodi:type="arc"
+         transform="translate(0.24819563,-31.769434)" />
+      <path
+         inkscape:connector-curvature="0"
+         id="path4371"
+         d="m -313.47486,216.4292 c 0,161.82551 0,161.82551 0,161.82551"
+         style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+      <path
+         inkscape:connector-curvature="0"
+         id="path4373"
+         d="m -101.01684,216.4292 c 0,161.82551 0,161.82551 0,161.82551"
+         style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+      <path
+         inkscape:connector-curvature="0"
+         id="path4377"
+         d="m -243.16769,394.36964 c -34.17364,-2.31715 -64.43561,-9.27295 -66.76621,-15.34641 -0.34116,-0.88903 -0.62029,-36.66066 -0.62029,-79.4925 l 0,-77.87606 2.23379,1.4223 c 6.48455,4.12882 24.60949,8.18861 49.93322,11.1845 21.31886,2.5221 84.81991,2.52073 106.18372,-0.002 24.57791,-2.9026 40.06909,-6.37707 48.98167,-10.98594 l 3.14004,-1.62378 0,77.82597 c 0,76.61463 -0.0313,77.86572 -2.00819,80.37898 -5.00987,6.36901 -31.35126,12.054 -67.48743,14.5651 -16.40633,1.14008 -56.44098,1.11294 -73.59032,-0.0498 l 0,-3e-5 z"
+         style="fill:#00da00;fill-opacity:0.25531915;stroke:none" />
+      <path
+         inkscape:connector-curvature="0"
+         id="path4379"
+         d="m -243.16769,232.54414 c -33.27902,-2.25649 -64.58959,-9.3163 -66.6709,-15.03275 -1.48692,-4.08393 12.30392,-9.90261 31.05383,-13.10232 37.23448,-6.35415 101.85345,-6.78769 140.48042,-0.94251 19.32495,2.92433 35.44716,8.07086 36.86603,11.76837 2.72049,7.08948 -26.13239,14.44003 -68.13906,17.35907 -16.40633,1.14008 -56.44098,1.11295 -73.59032,-0.0499 z"
+         style="fill:#00da00;fill-opacity:0.25531915;stroke:none" />
+      <text
+         sodipodi:linespacing="125%"
+         id="text4381"
+         y="286.60049"
+         x="-205.57187"
+         style="font-size:40px;font-style:normal;font-weight:normal;text-align:center;line-height:125%;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans"
+         xml:space="preserve"><tspan
+           y="286.60049"
+           x="-205.57187"
+           id="tspan4383"
+           sodipodi:role="line">Data</tspan><tspan
+           id="tspan4385"
+           y="336.60049"
+           x="-205.57187"
+           sodipodi:role="line">Source</tspan></text>
+    </g>
+    <path
+       style="fill:none;stroke:#000000;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker-start:url(#TriangleInL);marker-end:url(#TriangleInL)"
+       d="m 31.769415,398.4829 c 0,146.93359 0,144.948 0,144.948"
+       id="path4436"
+       inkscape:connector-curvature="0" />
+    <path
+       style="fill:none;stroke:#000000;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker-start:none;marker-end:url(#TriangleInL)"
+       d="m 550.00815,398.48291 c 0,146.93359 0,144.948 0,144.948"
+       id="path4436-9"
+       inkscape:connector-curvature="0" />
+    <path
+       style="fill:none;stroke:#000000;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker-start:url(#TriangleInL);marker-end:url(#TriangleInL)"
+       d="m 396.12501,259.86396 c -146.93359,0 -144.948,0 -144.948,0"
+       id="path4436-0"
+       inkscape:connector-curvature="0" />
+    <path
+       style="fill:none;stroke:#000000;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker-start:none;marker-end:url(#TriangleInL)"
+       d="m 208.19,682.04983 c 146.93359,0 144.948,0 144.948,0"
+       id="path4436-6"
+       inkscape:connector-curvature="0" />
+  </g>
+</svg>