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 [15/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/installing-solr.html
==============================================================================
--- websites/production/lucene/content/solr/guide/test-10290/installing-solr.html (original)
+++ websites/production/lucene/content/solr/guide/test-10290/installing-solr.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>This section describes how to install Solr. You can install Solr in any system where a suitable Java Runtime Environment (JRE) is available, as detailed below. Currently this includes Linux, OS X, and Microsoft Windows. The instructions in this section should work for any platform, with a few exceptions for Windows as noted.</p>
+<p>This section describes how to install Solr.</p>
+</div>
+<div class="paragraph">
+<p>You can install Solr in any system where a suitable Java Runtime Environment (JRE) is available, as detailed below. Currently this includes Linux, OS X, and Microsoft Windows. The instructions in this section should work for any platform, with a few exceptions for Windows as noted.</p>
 </div>
 </div>
 </div>
 <div class="sect1">
-<h2 id="InstallingSolr-GotJava_">Got Java?</h2>
+<h2 id="got-java">Got Java?</h2>
 <div class="sectionbody">
 <div class="paragraph">
 <p>You will need the Java Runtime Environment (JRE) version 1.8 or higher. At a command line, check your Java version like this:</p>
@@ -1304,13 +1307,19 @@ Java HotSpot(TM) 64-Bit Server VM (build
 </div>
 </div>
 <div class="sect1">
-<h2 id="InstallingSolr-InstallingSolr">Installing Solr</h2>
+<h2 id="installing-solr">Installing Solr</h2>
 <div class="sectionbody">
 <div class="paragraph">
 <p>Solr is available from the Solr website at <a href="http://lucene.apache.org/solr/" class="bare">http://lucene.apache.org/solr/</a>.</p>
 </div>
 <div class="paragraph">
-<p>For Linux/Unix/OSX systems, download the <code>.tgz</code> file. For Microsoft Windows systems, download the <code>.zip</code> file. When getting started, all you need to do is extract the Solr distribution archive to a directory of your choosing. When you&#8217;re ready to setup Solr for a production environment, please refer to the instructions provided on the <a href="taking-solr-to-production.html#taking-solr-to-production">Taking Solr to Production</a> page. To keep things simple for now, extract the Solr distribution archive to your local home directory, for instance on Linux, do:</p>
+<p>For Linux/Unix/OSX systems, download the <code>.tgz</code> file. For Microsoft Windows systems, download the <code>.zip</code> file.</p>
+</div>
+<div class="paragraph">
+<p>When getting started, all you need to do is extract the Solr distribution archive to a directory of your choosing. When you&#8217;re ready to setup Solr for a production environment, please refer to the instructions provided on the <a href="taking-solr-to-production.html#taking-solr-to-production">Taking Solr to Production</a> page.</p>
+</div>
+<div class="paragraph">
+<p>To keep things simple for now, extract the Solr distribution archive to your local home directory, for instance on Linux, do:</p>
 </div>
 <div class="listingblock">
 <div class="content">
@@ -1359,7 +1368,7 @@ $ tar zxf solr-x.y.z.tgz</code></pre>
             <div class="row">
                 <div class="col-lg-12 footer">
                &copy;2017 Apache Software Foundation. All rights reserved. <br />
- Site last generated: 2017-05-03 <br />
+ Site last generated: 2017-05-09 <br />
 <p><img src="solr-sunOnly-small.png" alt="Apache Solr"/></p>
                 </div>
             </div>

Modified: websites/production/lucene/content/solr/guide/test-10290/introduction-to-client-apis.html
==============================================================================
--- websites/production/lucene/content/solr/guide/test-10290/introduction-to-client-apis.html (original)
+++ websites/production/lucene/content/solr/guide/test-10290/introduction-to-client-apis.html Tue May  9 19:22:29 2017
@@ -1331,7 +1331,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/introduction-to-scaling-and-distribution.html
==============================================================================
--- websites/production/lucene/content/solr/guide/test-10290/introduction-to-scaling-and-distribution.html (original)
+++ websites/production/lucene/content/solr/guide/test-10290/introduction-to-scaling-and-distribution.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>Both Lucene and Solr were designed to scale to support large implementations with minimal custom coding. This section covers:</p>
+<p>Both Lucene and Solr were designed to scale to support large implementations with minimal custom coding.</p>
+</div>
+<div class="paragraph">
+<p>This section covers:</p>
 </div>
 <div class="ulist">
 <ul>
@@ -1301,18 +1304,21 @@ $('#toc').on('click', 'a', function() {
 </div>
 </div>
 <div class="sect1">
-<h2 id="IntroductiontoScalingandDistribution-WhatProblemDoesDistributionSolve_">What Problem Does Distribution Solve?</h2>
+<h2 id="what-problem-does-distribution-solve">What Problem Does Distribution Solve?</h2>
 <div class="sectionbody">
 <div class="paragraph">
 <p>If searches are taking too long or the index is approaching the physical limitations of its machine, you should consider distributing the index across two or more Solr servers.</p>
 </div>
 <div class="paragraph">
-<p>To distribute an index, you divide the index into partitions called shards, each of which runs on a separate machine. Solr then partitions searches into sub-searches, which run on the individual shards, reporting results collectively. The architectural details underlying index sharding are invisible to end users, who simply experience faster performance on queries against very large indexes.</p>
+<p>To distribute an index, you divide the index into partitions called shards, each of which runs on a separate machine. Solr then partitions searches into sub-searches, which run on the individual shards, reporting results collectively.</p>
+</div>
+<div class="paragraph">
+<p>The architectural details underlying index sharding are invisible to end users, who simply experience faster performance on queries against very large indexes.</p>
 </div>
 </div>
 </div>
 <div class="sect1">
-<h2 id="IntroductiontoScalingandDistribution-WhatProblemDoesReplicationSolve_">What Problem Does Replication Solve?</h2>
+<h2 id="what-problem-does-replication-solve">What Problem Does Replication Solve?</h2>
 <div class="sectionbody">
 <div class="paragraph">
 <p>Replicating an index is useful when:</p>
@@ -1368,7 +1374,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/introduction-to-solr-indexing.html
==============================================================================
--- websites/production/lucene/content/solr/guide/test-10290/introduction-to-solr-indexing.html (original)
+++ websites/production/lucene/content/solr/guide/test-10290/introduction-to-solr-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>This section describes the process of indexing: adding content to a Solr index and, if necessary, modifying that content or deleting it. By adding content to an index, we make it searchable by Solr.</p>
+<p>This section describes the process of indexing: adding content to a Solr index and, if necessary, modifying that content or deleting it.</p>
+</div>
+<div class="paragraph">
+<p>By adding content to an index, we make it searchable by Solr.</p>
 </div>
 <div class="paragraph">
 <p>A Solr index can accept data from many different sources, including XML files, comma-separated value (CSV) files, data extracted from tables in a database, and files in common file formats such as Microsoft Word or PDF.</p>
@@ -1297,7 +1300,7 @@ $('#toc').on('click', 'a', function() {
 <p>Uploading XML files by sending HTTP requests to the Solr server from any environment where such requests can be generated.</p>
 </li>
 <li>
-<p>Writing a custom Java application to ingest data through Solr&#8217;s Java Client API (which is described in more detail in <a href="client-apis.html#client-apis">Client APIs</a>. Using the Java API may be the best choice if you&#8217;re working with an application, such as a Content Management System (CMS), that offers a Java API.</p>
+<p>Writing a custom Java application to ingest data through Solr&#8217;s Java Client API (which is described in more detail in <a href="client-apis.html#client-apis">Client APIs</a>). Using the Java API may be the best choice if you&#8217;re working with an application, such as a Content Management System (CMS), that offers a Java API.</p>
 </li>
 </ul>
 </div>
@@ -1381,7 +1384,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/java-properties.html
==============================================================================
--- websites/production/lucene/content/solr/guide/test-10290/java-properties.html (original)
+++ websites/production/lucene/content/solr/guide/test-10290/java-properties.html Tue May  9 19:22:29 2017
@@ -1284,6 +1284,7 @@ $('#toc').on('click', 'a', function() {
 <div class="content">
 <img src="images/java-properties/javaproperties.png" alt="image" width="593" height="250">
 </div>
+<div class="title">Figure 1. Java Properties Screen</div>
 </div>
 </div>
 
@@ -1321,7 +1322,7 @@ $('#toc').on('click', 'a', function() {
             <div class="row">
                 <div class="col-lg-12 footer">
                &copy;2017 Apache Software Foundation. All rights reserved. <br />
- Site last generated: 2017-05-03 <br />
+ Site last generated: 2017-05-09 <br />
 <p><img src="solr-sunOnly-small.png" alt="Apache Solr"/></p>
                 </div>
             </div>

Modified: websites/production/lucene/content/solr/guide/test-10290/jvm-settings.html
==============================================================================
--- websites/production/lucene/content/solr/guide/test-10290/jvm-settings.html (original)
+++ websites/production/lucene/content/solr/guide/test-10290/jvm-settings.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>Configuring your JVM can be a complex topic. A full discussion is beyond the scope of this document. Luckily, most modern JVMs are quite good at making the best use of available resources with default settings. The following sections contain a few tips that may be helpful when the defaults are not optimal for your situation.</p>
+<p>Optimizing the JVM can be a key factor in getting the most from your Solr installation.</p>
+</div>
+<div class="paragraph">
+<p>Configuring your JVM can be a complex topic and a full discussion is beyond the scope of this document. Luckily, most modern JVMs are quite good at making the best use of available resources with default settings. The following sections contain a few tips that may be helpful when the defaults are not optimal for your situation.</p>
 </div>
 <div class="paragraph">
 <p>For more general information about improving Solr performance, see <a href="https://wiki.apache.org/solr/SolrPerformanceFactors" class="bare">https://wiki.apache.org/solr/SolrPerformanceFactors</a>.</p>
@@ -1368,7 +1371,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/kerberos-authentication-plugin.html
==============================================================================
--- websites/production/lucene/content/solr/guide/test-10290/kerberos-authentication-plugin.html (original)
+++ websites/production/lucene/content/solr/guide/test-10290/kerberos-authentication-plugin.html Tue May  9 19:22:29 2017
@@ -1280,7 +1280,10 @@ $('#toc').on('click', 'a', function() {
   <div id="preamble">
 <div class="sectionbody">
 <div class="paragraph">
-<p>If you are using Kerberos to secure your network environment, the Kerberos authentication plugin can be used to secure a Solr cluster. This allows Solr to use a Kerberos service principal and keytab file to authenticate with ZooKeeper and between nodes of the Solr cluster (if applicable). Users of the Admin UI and all clients (such as <a href="using-solrj.html#using-solrj">SolrJ</a>) would also need to have a valid ticket before being able to use the UI or send requests to Solr.</p>
+<p>If you are using Kerberos to secure your network environment, the Kerberos authentication plugin can be used to secure a Solr cluster.</p>
+</div>
+<div class="paragraph">
+<p>This allows Solr to use a Kerberos service principal and keytab file to authenticate with ZooKeeper and between nodes of the Solr cluster (if applicable). Users of the Admin UI and all clients (such as <a href="using-solrj.html#using-solrj">SolrJ</a>) would also need to have a valid ticket before being able to use the UI or send requests to Solr.</p>
 </div>
 <div class="paragraph">
 <p>Support for the Kerberos authentication plugin is available in SolrCloud mode or standalone mode.</p>
@@ -1347,7 +1350,13 @@ $('#toc').on('click', 'a', function() {
 <div class="sect2">
 <h3 id="KerberosAuthenticationPlugin-KerberizedZooKeeper">Kerberized ZooKeeper</h3>
 <div class="paragraph">
-<p>When setting up a kerberized SolrCloud cluster, it is recommended to enable Kerberos security for Zookeeper as well. In such a setup, the client principal used to authenticate requests with Zookeeper can be shared for internode communication as well. This has the benefit of not needing to renew the ticket granting tickets (TGTs) separately, since the Zookeeper client used by Solr takes care of this. To achieve this, a single JAAS configuration (with the app name as Client) can be used for the Kerberos plugin as well as for the Zookeeper client. See the configuration section below for an example of starting Zookeeper in Kerberos mode.</p>
+<p>When setting up a kerberized SolrCloud cluster, it is recommended to enable Kerberos security for Zookeeper as well.</p>
+</div>
+<div class="paragraph">
+<p>In such a setup, the client principal used to authenticate requests with Zookeeper can be shared for internode communication as well. This has the benefit of not needing to renew the ticket granting tickets (TGTs) separately, since the Zookeeper client used by Solr takes care of this. To achieve this, a single JAAS configuration (with the app name as Client) can be used for the Kerberos plugin as well as for the Zookeeper client.</p>
+</div>
+<div class="paragraph">
+<p>See the <a href="#KerberosAuthenticationPlugin-ZooKeeperConfiguration">ZooKeeper Configuration</a> section below for an example of starting Zookeeper in Kerberos mode.</p>
 </div>
 </div>
 <div class="sect2">
@@ -1429,20 +1438,20 @@ $('#toc').on('click', 'a', function() {
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="pygments highlight"><code data-lang="bash">root@kdc:/# kadmin.local
+<pre class="pygments highlight"><code data-lang="plain">root@kdc:/# kadmin.local
 Authenticating as principal foo/admin@EXAMPLE.COM with password.
 
 kadmin.local:  addprinc HTTP/192.168.0.107
-WARNING: no policy specified <span style="color: #008000; font-weight: bold">for</span> HTTP/192.168.0.107@EXAMPLE.COM; defaulting to no policy
-Enter password <span style="color: #008000; font-weight: bold">for</span> principal <span style="color: #BA2121">&quot;HTTP/192.168.0.107@EXAMPLE.COM&quot;</span>:
-Re-enter password <span style="color: #008000; font-weight: bold">for</span> principal <span style="color: #BA2121">&quot;HTTP/192.168.0.107@EXAMPLE.COM&quot;</span>:
-Principal <span style="color: #BA2121">&quot;HTTP/192.168.0.107@EXAMPLE.COM&quot;</span> created.
+WARNING: no policy specified for HTTP/192.168.0.107@EXAMPLE.COM; defaulting to no policy
+Enter password for principal &quot;HTTP/192.168.0.107@EXAMPLE.COM&quot;:
+Re-enter password for principal &quot;HTTP/192.168.0.107@EXAMPLE.COM&quot;:
+Principal &quot;HTTP/192.168.0.107@EXAMPLE.COM&quot; created.
 
 kadmin.local:  ktadd -k /tmp/107.keytab HTTP/192.168.0.107
-Entry <span style="color: #008000; font-weight: bold">for</span> principal HTTP/192.168.0.107 with kvno <span style="color: #666666">2</span>, encryption <span style="color: #008000">type</span> aes256-cts-hmac-sha1-96 added to keytab WRFILE:/tmp/107.keytab.
-Entry <span style="color: #008000; font-weight: bold">for</span> principal HTTP/192.168.0.107 with kvno <span style="color: #666666">2</span>, encryption <span style="color: #008000">type</span> arcfour-hmac added to keytab WRFILE:/tmp/107.keytab.
-Entry <span style="color: #008000; font-weight: bold">for</span> principal HTTP/192.168.0.107 with kvno <span style="color: #666666">2</span>, encryption <span style="color: #008000">type</span> des3-cbc-sha1 added to keytab WRFILE:/tmp/108.keytab.
-Entry <span style="color: #008000; font-weight: bold">for</span> principal HTTP/192.168.0.107 with kvno <span style="color: #666666">2</span>, encryption <span style="color: #008000">type</span> des-cbc-crc added to keytab WRFILE:/tmp/107.keytab.
+Entry for principal HTTP/192.168.0.107 with kvno 2, encryption type aes256-cts-hmac-sha1-96 added to keytab WRFILE:/tmp/107.keytab.
+Entry for principal HTTP/192.168.0.107 with kvno 2, encryption type arcfour-hmac added to keytab WRFILE:/tmp/107.keytab.
+Entry for principal HTTP/192.168.0.107 with kvno 2, encryption type des3-cbc-sha1 added to keytab WRFILE:/tmp/108.keytab.
+Entry for principal HTTP/192.168.0.107 with kvno 2, encryption type des-cbc-crc added to keytab WRFILE:/tmp/107.keytab.
 
 kadmin.local:  quit</code></pre>
 </div>
@@ -1475,16 +1484,16 @@ kadmin.local:  quit</code></pre>
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="pygments highlight"><code data-lang="java">Server <span style="color: #666666">{</span>
- com<span style="color: #666666">.</span><span style="color: #7D9029">sun</span><span style="color: #666666">.</span><span style="color: #7D9029">security</span><span style="color: #666666">.</span><span style="color: #7D9029">auth</span><span style="color: #666666">.</span><span style="color: #7D9029">module</span><span style="color: #666666">.</span><span style="color: #7D9029">Krb5LoginModule</span> required
-  useKeyTab<span style="color: #666666">=</span><span style="color: #008000; font-weight: bold">true</span>
-  keyTab<span style="color: #666666">=</span><span style="color: #BA2121">&quot;/keytabs/zkhost1.keytab&quot;</span>
-  storeKey<span style="color: #666666">=</span><span style="color: #008000; font-weight: bold">true</span>
-  doNotPrompt<span style="color: #666666">=</span><span style="color: #008000; font-weight: bold">true</span>
-  useTicketCache<span style="color: #666666">=</span><span style="color: #008000; font-weight: bold">false</span>
-  debug<span style="color: #666666">=</span><span style="color: #008000; font-weight: bold">true</span>
-  principal<span style="color: #666666">=</span><span style="color: #BA2121">&quot;zookeeper/host1@EXAMPLE.COM&quot;</span><span style="color: #666666">;</span>
-<span style="color: #666666">};</span></code></pre>
+<pre class="pygments highlight"><code data-lang="plain">Server {
+ com.sun.security.auth.module.Krb5LoginModule required
+  useKeyTab=true
+  keyTab=&quot;/keytabs/zkhost1.keytab&quot;
+  storeKey=true
+  doNotPrompt=true
+  useTicketCache=false
+  debug=true
+  principal=&quot;zookeeper/host1@EXAMPLE.COM&quot;;
+};</code></pre>
 </div>
 </div>
 <div class="paragraph">
@@ -1492,8 +1501,8 @@ kadmin.local:  quit</code></pre>
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="pygments highlight"><code data-lang="java">authProvider<span style="color: #666666">.1=</span>org<span style="color: #666666">.</span><span style="color: #7D9029">apache</span><span style="color: #666666">.</span><span style="color: #7D9029">zookeeper</span><span style="color: #666666">.</span><span style="color: #7D9029">server</span><span style="color: #666666">.</span><span style="color: #7D9029">auth</span><span style="color: #666666">.</span><span style="color: #7D9029">SASLAuthenticationProvider</span>
-jaasLoginRenew<span style="color: #666666">=3600000</span></code></pre>
+<pre class="pygments highlight"><code data-lang="plain">authProvider.1=org.apache.zookeeper.server.auth.SASLAuthenticationProvider
+jaasLoginRenew=3600000</code></pre>
 </div>
 </div>
 <div class="paragraph">
@@ -1501,7 +1510,7 @@ jaasLoginRenew<span style="color: #66666
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="pygments highlight"><code data-lang="java">bin<span style="color: #666666">/</span>zkServer<span style="color: #666666">.</span><span style="color: #7D9029">sh</span> start <span style="color: #666666">-</span>Djava<span style="color: #666666">.</span><span style="color: #7D9029">security</span><span style="color: #666666">.</span><span style="color: #7D9029">auth</span><span style="color: #666666">.</span><span style="color: #7D9029">login</span><span style="color: #666666">.</span><span style="color: #7D9029">config</span><span style="color: #666666">=/</span>etc<span style="color: #666666">/</span>zookeeper<span style="color: #666666">/</span>conf<span style="color: #666666">/</span>jaas<span style="color: #666666">-</span>client<span style="color: #666666">.</span><span style="color: #7D9029">conf</span></code></pre>
+<pre class="pygments highlight"><code data-lang="bash">bin/zkServer.sh start -Djava.security.auth.login.config<span style="color: #666666">=</span>/etc/zookeeper/conf/jaas-client.conf</code></pre>
 </div>
 </div>
 </div>
@@ -1552,15 +1561,15 @@ jaasLoginRenew<span style="color: #66666
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="pygments highlight"><code data-lang="java">Client <span style="color: #666666">{</span>
-  com<span style="color: #666666">.</span><span style="color: #7D9029">sun</span><span style="color: #666666">.</span><span style="color: #7D9029">security</span><span style="color: #666666">.</span><span style="color: #7D9029">auth</span><span style="color: #666666">.</span><span style="color: #7D9029">module</span><span style="color: #666666">.</span><span style="color: #7D9029">Krb5LoginModule</span> required
-  useKeyTab<span style="color: #666666">=</span><span style="color: #008000; font-weight: bold">true</span>
-  keyTab<span style="color: #666666">=</span><span style="color: #BA2121">&quot;/keytabs/107.keytab&quot;</span>
-  storeKey<span style="color: #666666">=</span><span style="color: #008000; font-weight: bold">true</span>
-  useTicketCache<span style="color: #666666">=</span><span style="color: #008000; font-weight: bold">true</span>
-  debug<span style="color: #666666">=</span><span style="color: #008000; font-weight: bold">true</span>
-  principal<span style="color: #666666">=</span><span style="color: #BA2121">&quot;HTTP/192.168.0.107@EXAMPLE.COM&quot;</span><span style="color: #666666">;</span>
-<span style="color: #666666">};</span></code></pre>
+<pre class="pygments highlight"><code data-lang="plain">Client {
+  com.sun.security.auth.module.Krb5LoginModule required
+  useKeyTab=true
+  keyTab=&quot;/keytabs/107.keytab&quot;
+  storeKey=true
+  useTicketCache=true
+  debug=true
+  principal=&quot;HTTP/192.168.0.107@EXAMPLE.COM&quot;;
+};</code></pre>
 </div>
 </div>
 <div class="paragraph">
@@ -1599,9 +1608,9 @@ jaasLoginRenew<span style="color: #66666
 </div>
 <table class="tableblock frame-all grid-all spread">
 <colgroup>
-<col style="width: 34%;">
-<col style="width: 33%;">
-<col style="width: 33%;">
+<col style="width: 30%;">
+<col style="width: 10%;">
+<col style="width: 60%;">
 </colgroup>
 <thead>
 <tr>
@@ -1612,37 +1621,37 @@ jaasLoginRenew<span style="color: #66666
 </thead>
 <tbody>
 <tr>
-<td class="tableblock halign-left valign-top"><p class="tableblock">solr.kerberos.name.rules</p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock"><code>solr.kerberos.name.rules</code></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">Used to map Kerberos principals to short names. Default value is <code>DEFAULT</code>. Example of a name rule: `RULE:[1:$1@$0](.<strong>EXAMPLE.COM)s/@.</strong>// `</p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">Used to map Kerberos principals to short names. Default value is <code>DEFAULT</code>. Example of a name rule: <code>RULE:[1:$1@$0](.*EXAMPLE.COM)s/@.*//</code></p></td>
 </tr>
 <tr>
-<td class="tableblock halign-left valign-top"><p class="tableblock">solr.kerberos.cookie.domain</p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock"><code>solr.kerberos.cookie.domain</code></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">Used to issue cookies and should have the hostname of the Solr node.</p></td>
 </tr>
 <tr>
-<td class="tableblock halign-left valign-top"><p class="tableblock">solr.kerberos.cookie.portaware</p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock"><code>solr.kerberos.cookie.portaware</code></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">When set to true, cookies are differentiated based on host and port, as opposed to standard cookies which are not port aware. This should be set if more than one Solr node is hosted on the same host. The default is false.</p></td>
 </tr>
 <tr>
-<td class="tableblock halign-left valign-top"><p class="tableblock">solr.kerberos.principal</p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock"><code>solr.kerberos.principal</code></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">The service principal.</p></td>
 </tr>
 <tr>
-<td class="tableblock halign-left valign-top"><p class="tableblock">solr.kerberos.keytab</p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock"><code>solr.kerberos.keytab</code></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">Keytab file path containing service principal credentials.</p></td>
 </tr>
 <tr>
-<td class="tableblock halign-left valign-top"><p class="tableblock">solr.kerberos.jaas.appname</p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock"><code>solr.kerberos.jaas.appname</code></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 app name (section name) within the JAAS configuration file which is required for internode communication. Default is <code>Client</code>, which is used for Zookeeper authentication as well. If different users are used for ZooKeeper and Solr, they will need to have separate sections in the JAAS configuration file.</p></td>
 </tr>
 <tr>
-<td class="tableblock halign-left valign-top"><p class="tableblock">java.security.auth.login.config</p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock"><code>java.security.auth.login.config</code></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">Path to the JAAS configuration file for configuring a Solr client for internode communication.</p></td>
 </tr>
@@ -1708,9 +1717,9 @@ jaasLoginRenew<span style="color: #66666
 </div>
 <table class="tableblock frame-all grid-all spread">
 <colgroup>
-<col style="width: 34%;">
-<col style="width: 33%;">
-<col style="width: 33%;">
+<col style="width: 30%;">
+<col style="width: 10%;">
+<col style="width: 60%;">
 </colgroup>
 <thead>
 <tr>
@@ -1721,34 +1730,34 @@ jaasLoginRenew<span style="color: #66666
 </thead>
 <tbody>
 <tr>
-<td class="tableblock halign-left valign-top"><p class="tableblock">solr.kerberos.delegation.token.enabled</p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock"><code>solr.kerberos.delegation.token.enabled</code></p></td>
 <td class="tableblock halign-left valign-top"><p class="tableblock">Yes, to enable tokens</p></td>
 <td class="tableblock halign-left valign-top"><p class="tableblock">False by default, set to true to enable delegation tokens.</p></td>
 </tr>
 <tr>
-<td class="tableblock halign-left valign-top"><p class="tableblock">solr.kerberos.delegation.token.kind</p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock"><code>solr.kerberos.delegation.token.kind</code></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">Type of delegation tokens. By default this is <code>solr-dt</code>. Likely this does not need to change. No other option is available at this time.</p></td>
 </tr>
 <tr>
-<td class="tableblock halign-left valign-top"><p class="tableblock">solr.kerberos.delegation.token.validity</p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock"><code>solr.kerberos.delegation.token.validity</code></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">Time, in seconds, for which delegation tokens are valid. The default is 36000 seconds.</p></td>
 </tr>
 <tr>
-<td class="tableblock halign-left valign-top"><p class="tableblock">solr.kerberos.delegation.token.signer.secret.provider</p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock"><code>solr.kerberos.delegation.token.signer.secret.provider</code></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">Where delegation token information is stored internally. The default is <code>zookeeper</code> which must be the location for delegation tokens to work across Solr servers (when running in SolrCloud mode). No other option is available at this time.</p></td>
 </tr>
 <tr>
-<td class="tableblock halign-left valign-top"><p class="tableblock">solr.kerberos.delegation.token.signer.secret.provider.zookeper.path</p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock"><code>solr.kerberos.delegation.token.signer.secret.provider.zookeper.path</code></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 ZooKeeper path where the secret provider information is stored. This is in the form of the path + /security/token. The path can include the chroot or the chroot can be omitted if you are not using it. This example includes the chroot: <code>server1:9983,<code>server2:9983,</code>server3:9983`</code>/solr/security/token`.</p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">The ZooKeeper path where the secret provider information is stored. This is in the form of the path + /security/token. The path can include the chroot or the chroot can be omitted if you are not using it. This example includes the chroot: <code>server1:9983,server2:9983,server3:9983/solr/security/token</code>.</p></td>
 </tr>
 <tr>
-<td class="tableblock halign-left valign-top"><p class="tableblock">solr.kerberos.delegation.token.secret.manager.znode.working.path</p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock"><code>solr.kerberos.delegation.token.secret.manager.znode.working.path</code></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 ZooKeeper path where token information is stored. This is in the form of the path + /security/zkdtsm. The path can include the chroot or the chroot can be omitted if you are not using it. This example includes the chroot: <code>server1:9983,<code>server2:9983,</code>server3:9983`</code>/solr/security/zkdtsm`.</p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">The ZooKeeper path where token information is stored. This is in the form of the path + /security/zkdtsm. The path can include the chroot or the chroot can be omitted if you are not using it. This example includes the chroot: <code>server1:9983,server2:9983,server3:9983/solr/security/zkdtsm</code>.</p></td>
 </tr>
 </tbody>
 </table>
@@ -1769,7 +1778,7 @@ jaasLoginRenew<span style="color: #66666
 <div class="olist arabic">
 <ol class="arabic">
 <li>
-<p>Do a <code>kinit</code> with your username. For example, &#8220;kinit <a href="mailto:user@EXAMPLE.COM">user@EXAMPLE.COM</a>&#8221;.</p>
+<p>Do a <code>kinit</code> with your username. For example, <code>kinit user@EXAMPLE.COM</code>.</p>
 </li>
 <li>
 <p>Try to access Solr using <code>curl</code>. You should get a successful response.</p>
@@ -1797,7 +1806,7 @@ HttpClientUtil<span style="color: #66666
 </div>
 </div>
 <div class="paragraph">
-<p>You need to specify a Kerberos service principal for the client and a corresponding keytab in the JAAS client configuration file above. This principal should be different from the service principal we created for Solr .</p>
+<p>You need to specify a Kerberos service principal for the client and a corresponding keytab in the JAAS client configuration file above. This principal should be different from the service principal we created for Solr.</p>
 </div>
 <div class="paragraph">
 <p>Here’s an example:</p>
@@ -1926,7 +1935,7 @@ HttpClientUtil<span style="color: #66666
             <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/language-analysis.html
==============================================================================
--- websites/production/lucene/content/solr/guide/test-10290/language-analysis.html (original)
+++ websites/production/lucene/content/solr/guide/test-10290/language-analysis.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>This section contains information about tokenizers and filters related to character set conversion or for use with specific languages. For the European languages, tokenization is fairly straightforward. Tokens are delimited by white space and/or a relatively small set of punctuation characters. In other languages the tokenization rules are often not so simple. Some European languages may require special tokenization rules as well, such as rules for decompounding German words.</p>
+<p>This section contains information about tokenizers and filters related to character set conversion or for use with specific languages.</p>
+</div>
+<div class="paragraph">
+<p>For the European languages, tokenization is fairly straightforward. Tokens are delimited by white space and/or a relatively small set of punctuation characters.</p>
+</div>
+<div class="paragraph">
+<p>In other languages the tokenization rules are often not so simple. Some European languages may also require special tokenization rules, such as rules for decompounding German words.</p>
 </div>
 <div class="paragraph">
 <p>For information about language detection at index time, see <a href="detecting-languages-during-indexing.html#detecting-languages-during-indexing">Detecting Languages During Indexing</a>.</p>
@@ -1307,16 +1313,16 @@ $('#toc').on('click', 'a', function() {
 <span style="color: #008000; font-weight: bold">&lt;/fieldtype&gt;</span></code></pre>
 </div>
 </div>
-<div class="paragraph">
-<p><a href="#main">Back to Top</a></p>
-</div>
 </div>
 </div>
 <div class="sect1">
 <h2 id="LanguageAnalysis-KeywordRepeatFilterFactory">KeywordRepeatFilterFactory</h2>
 <div class="sectionbody">
 <div class="paragraph">
-<p>Emits each token twice, one with the <code>KEYWORD</code> attribute and once without. If placed before a stemmer, the result will be that you will get the unstemmed token preserved on the same position as the stemmed one. Queries matching the original exact term will get a better score while still maintaining the recall benefit of stemming. Another advantage of keeping the original token is that wildcard truncation will work as expected.</p>
+<p>Emits each token twice, one with the <code>KEYWORD</code> attribute and once without.</p>
+</div>
+<div class="paragraph">
+<p>If placed before a stemmer, the result will be that you will get the unstemmed token preserved on the same position as the stemmed one. Queries matching the original exact term will get a better score while still maintaining the recall benefit of stemming. Another advantage of keeping the original token is that wildcard truncation will work as expected.</p>
 </div>
 <div class="paragraph">
 <p>To configure, add the <code>KeywordRepeatFilterFactory</code> early in the analysis chain. It is recommended to also include <code>RemoveDuplicatesTokenFilterFactory</code> to avoid duplicates when tokens are not stemmed.</p>
@@ -1343,16 +1349,11 @@ $('#toc').on('click', 'a', function() {
 <i class="fa icon-important" title="Important"></i>
 </td>
 <td class="content">
-<div class="paragraph">
-<p>When adding the same token twice, it will also score twice (double), so you may have to re-tune your ranking rules.</p>
-</div>
+When adding the same token twice, it will also score twice (double), so you may have to re-tune your ranking rules.
 </td>
 </tr>
 </table>
 </div>
-<div class="paragraph">
-<p><a href="#main">Back to Top</a></p>
-</div>
 </div>
 </div>
 <div class="sect1">
@@ -1378,9 +1379,6 @@ $('#toc').on('click', 'a', function() {
 <span style="color: #008000; font-weight: bold">&lt;/fieldtype&gt;</span></code></pre>
 </div>
 </div>
-<div class="paragraph">
-<p><a href="#main">Back to Top</a></p>
-</div>
 </div>
 </div>
 <div class="sect1">
@@ -1398,20 +1396,29 @@ $('#toc').on('click', 'a', function() {
 <div class="paragraph">
 <p><strong>Arguments:</strong></p>
 </div>
-<div class="paragraph">
-<p><code>dictionary</code>: (required) The path of a file that contains a list of simple words, one per line. Blank lines and lines that begin with "#" are ignored. This path may be an absolute path, or path relative to the Solr config directory.</p>
-</div>
-<div class="paragraph">
-<p><code>minWordSize</code>: (integer, default 5) Any token shorter than this is not decompounded.</p>
-</div>
-<div class="paragraph">
-<p><code>minSubwordSize</code>: (integer, default 2) Subwords shorter than this are not emitted as tokens.</p>
-</div>
-<div class="paragraph">
-<p><code>maxSubwordSize</code>: (integer, default 15) Subwords longer than this are not emitted as tokens.</p>
-</div>
-<div class="paragraph">
-<p><code>onlyLongestMatch</code>: (true/false) If true (the default), only the longest matching subwords will generate new tokens.</p>
+<div class="dlist">
+<dl>
+<dt class="hdlist1"><code>dictionary</code></dt>
+<dd>
+<p>(required) The path of a file that contains a list of simple words, one per line. Blank lines and lines that begin with "#" are ignored. This path may be an absolute path, or path relative to the Solr config directory.</p>
+</dd>
+<dt class="hdlist1"><code>minWordSize</code></dt>
+<dd>
+<p>(integer, default 5) Any token shorter than this is not decompounded.</p>
+</dd>
+<dt class="hdlist1"><code>minSubwordSize</code></dt>
+<dd>
+<p>(integer, default 2) Subwords shorter than this are not emitted as tokens.</p>
+</dd>
+<dt class="hdlist1"><code>maxSubwordSize</code></dt>
+<dd>
+<p>(integer, default 15) Subwords longer than this are not emitted as tokens.</p>
+</dd>
+<dt class="hdlist1"><code>onlyLongestMatch</code></dt>
+<dd>
+<p>(true/false) If true (the default), only the longest matching subwords will generate new tokens.</p>
+</dd>
+</dl>
 </div>
 <div class="paragraph">
 <p><strong>Example:</strong></p>
@@ -1436,9 +1443,6 @@ $('#toc').on('click', 'a', function() {
 <div class="paragraph">
 <p><strong>Out:</strong> "Donaudampfschiff"(1), "Donau"(1), "dampf"(1), "schiff"(1), "dummkopf"(2), "dumm"(2), "kopf"(2)</p>
 </div>
-<div class="paragraph">
-<p><a href="#main">Back to Top</a></p>
-</div>
 </div>
 </div>
 <div class="sect1">
@@ -1475,44 +1479,67 @@ $('#toc').on('click', 'a', function() {
 <div class="paragraph">
 <p>Using a System collator:</p>
 </div>
-<div class="paragraph">
-<p><code>locale</code>: (required) <a href="http://www.rfc-editor.org/rfc/rfc3066.txt">RFC 3066</a> locale ID. See <a href="http://demo.icu-project.org/icu-bin/locexp">the ICU locale explorer</a> for a list of supported locales.</p>
-</div>
-<div class="paragraph">
-<p><code>strength</code>: Valid values are <code>primary</code>, <code>secondary</code>, <code>tertiary</code>, <code>quaternary</code>, or <code>identical</code>. See <a href="http://userguide.icu-project.org/collation/concepts#TOC-Comparison-Levels">Comparison Levels in ICU Collation Concepts</a> for more information.</p>
-</div>
-<div class="paragraph">
-<p><code>decomposition</code>: Valid values are <code>no</code> or <code>canonical</code>. See <a href="http://userguide.icu-project.org/collation/concepts#TOC-Normalization">Normalization in ICU Collation Concepts</a> for more information.</p>
+<div class="dlist">
+<dl>
+<dt class="hdlist1"><code>locale</code></dt>
+<dd>
+<p>(required) <a href="http://www.rfc-editor.org/rfc/rfc3066.txt">RFC 3066</a> locale ID. See <a href="http://demo.icu-project.org/icu-bin/locexp">the ICU locale explorer</a> for a list of supported locales.</p>
+</dd>
+<dt class="hdlist1"><code>strength</code></dt>
+<dd>
+<p>Valid values are <code>primary</code>, <code>secondary</code>, <code>tertiary</code>, <code>quaternary</code>, or <code>identical</code>. See <a href="http://userguide.icu-project.org/collation/concepts#TOC-Comparison-Levels">Comparison Levels in ICU Collation Concepts</a> for more information.</p>
+</dd>
+<dt class="hdlist1"><code>decomposition</code></dt>
+<dd>
+<p>Valid values are <code>no</code> or <code>canonical</code>. See <a href="http://userguide.icu-project.org/collation/concepts#TOC-Normalization">Normalization in ICU Collation Concepts</a> for more information.</p>
+</dd>
+</dl>
 </div>
 <div class="paragraph">
 <p>Using a Tailored ruleset:</p>
 </div>
-<div class="paragraph">
-<p><code>custom</code>: (required) Path to a UTF-8 text file containing rules supported by the ICU <a href="http://icu-project.org/apiref/icu4j/com/ibm/icu/text/RuleBasedCollator.html"><code>RuleBasedCollator</code></a></p>
-</div>
-<div class="paragraph">
-<p><code>strength</code>: Valid values are <code>primary</code>, <code>secondary</code>, <code>tertiary</code>, <code>quaternary</code>, or <code>identical</code>. See <a href="http://userguide.icu-project.org/collation/concepts#TOC-Comparison-Levels">Comparison Levels in ICU Collation Concepts</a> for more information.</p>
-</div>
-<div class="paragraph">
-<p><code>decomposition</code>: Valid values are <code>no</code> or <code>canonical</code>. See <a href="http://userguide.icu-project.org/collation/concepts#TOC-Normalization">Normalization in ICU Collation Concepts</a> for more information.</p>
+<div class="dlist">
+<dl>
+<dt class="hdlist1"><code>custom</code></dt>
+<dd>
+<p>(required) Path to a UTF-8 text file containing rules supported by the ICU <a href="http://icu-project.org/apiref/icu4j/com/ibm/icu/text/RuleBasedCollator.html"><code>RuleBasedCollator</code></a></p>
+</dd>
+<dt class="hdlist1"><code>strength</code></dt>
+<dd>
+<p>Valid values are <code>primary</code>, <code>secondary</code>, <code>tertiary</code>, <code>quaternary</code>, or <code>identical</code>. See <a href="http://userguide.icu-project.org/collation/concepts#TOC-Comparison-Levels">Comparison Levels in ICU Collation Concepts</a> for more information.</p>
+</dd>
+<dt class="hdlist1"><code>decomposition</code></dt>
+<dd>
+<p>Valid values are <code>no</code> or <code>canonical</code>. See <a href="http://userguide.icu-project.org/collation/concepts#TOC-Normalization">Normalization in ICU Collation Concepts</a> for more information.</p>
+</dd>
+</dl>
 </div>
 <div class="paragraph">
 <p>Expert options:</p>
 </div>
-<div class="paragraph">
-<p><code>alternate</code>: Valid values are <code>shifted</code> or <code>non-ignorable</code>. Can be used to ignore punctuation/whitespace.</p>
-</div>
-<div class="paragraph">
-<p><code>caseLevel</code>: (true/false) If true, in combination with <code>strength="primary"</code>, accents are ignored but case is taken into account. The default is false. See <a href="http://userguide.icu-project.org/collation/concepts#TOC-CaseLevel">CaseLevel in ICU Collation Concepts</a> for more information.</p>
-</div>
-<div class="paragraph">
-<p><code>caseFirst</code>: Valid values are <code>lower</code> or <code>upper</code>. Useful to control which is sorted first when case is not ignored.</p>
-</div>
-<div class="paragraph">
-<p><code>numeric</code>: (true/false) If true, digits are sorted according to numeric value, e.g. foobar-9 sorts before foobar-10. The default is false.</p>
-</div>
-<div class="paragraph">
-<p><code>variableTop</code>: Single character or contraction. Controls what is variable for <code>alternate</code></p>
+<div class="dlist">
+<dl>
+<dt class="hdlist1"><code>alternate</code></dt>
+<dd>
+<p>Valid values are <code>shifted</code> or <code>non-ignorable</code>. Can be used to ignore punctuation/whitespace.</p>
+</dd>
+<dt class="hdlist1"><code>caseLevel</code></dt>
+<dd>
+<p>(true/false) If true, in combination with <code>strength="primary"</code>, accents are ignored but case is taken into account. The default is false. See <a href="http://userguide.icu-project.org/collation/concepts#TOC-CaseLevel">CaseLevel in ICU Collation Concepts</a> for more information.</p>
+</dd>
+<dt class="hdlist1"><code>caseFirst</code></dt>
+<dd>
+<p>Valid values are <code>lower</code> or <code>upper</code>. Useful to control which is sorted first when case is not ignored.</p>
+</dd>
+<dt class="hdlist1"><code>numeric</code></dt>
+<dd>
+<p>(true/false) If true, digits are sorted according to numeric value, e.g. foobar-9 sorts before foobar-10. The default is false.</p>
+</dd>
+<dt class="hdlist1"><code>variableTop</code></dt>
+<dd>
+<p>Single character or contraction. Controls what is variable for <code>alternate</code>.</p>
+</dd>
+</dl>
 </div>
 <div class="sect2">
 <h3 id="LanguageAnalysis-SortingTextforaSpecificLanguage">Sorting Text for a Specific Language</h3>
@@ -1642,37 +1669,51 @@ IOUtils<span style="color: #666666">.</s
 <div class="paragraph">
 <p>Using a System collator (see <a href="http://www.oracle.com/technetwork/java/javase/java8locales-2095355.html">Oracle&#8217;s list of locales supported in Java 8</a>):</p>
 </div>
-<div class="paragraph">
-<p><code>language</code>: (required) <a href="http://www.loc.gov/standards/iso639-2/php/code_list.php">ISO-639</a> language code</p>
-</div>
-<div class="paragraph">
-<p><code>country</code>: <a href="http://www.iso.org/iso/country_codes/iso_3166_code_lists/country_names_and_code_elements.htm">ISO-3166</a> country code</p>
-</div>
-<div class="paragraph">
-<p><code>variant</code>: Vendor or browser-specific code</p>
-</div>
-<div class="paragraph">
-<p><code>strength</code>: Valid values are <code>primary</code>, <code>secondary</code>, <code>tertiary</code> or <code>identical</code>. See <a href="http://docs.oracle.com/javase/8/docs/api/java/text/Collator.html">Oracle Java 8 Collator javadocs</a> for more information.</p>
-</div>
-<div class="paragraph">
-<p><code>decomposition</code>: Valid values are <code>no</code>, <code>canonical</code>, or <code>full</code>. See <a href="http://docs.oracle.com/javase/8/docs/api/java/text/Collator.html">Oracle Java 8 Collator javadocs</a> for more information.</p>
+<div class="dlist">
+<dl>
+<dt class="hdlist1"><code>language</code></dt>
+<dd>
+<p>(required) <a href="http://www.loc.gov/standards/iso639-2/php/code_list.php">ISO-639</a> language code</p>
+</dd>
+<dt class="hdlist1"><code>country</code></dt>
+<dd>
+<p><a href="http://www.iso.org/iso/country_codes/iso_3166_code_lists/country_names_and_code_elements.htm">ISO-3166</a> country code</p>
+</dd>
+<dt class="hdlist1"><code>variant</code></dt>
+<dd>
+<p>Vendor or browser-specific code</p>
+</dd>
+<dt class="hdlist1"><code>strength</code></dt>
+<dd>
+<p>Valid values are <code>primary</code>, <code>secondary</code>, <code>tertiary</code> or <code>identical</code>. See <a href="http://docs.oracle.com/javase/8/docs/api/java/text/Collator.html">Oracle Java 8 Collator javadocs</a> for more information.</p>
+</dd>
+<dt class="hdlist1"><code>decomposition</code></dt>
+<dd>
+<p>Valid values are <code>no</code>, <code>canonical</code>, or <code>full</code>. See <a href="http://docs.oracle.com/javase/8/docs/api/java/text/Collator.html">Oracle Java 8 Collator javadocs</a> for more information.</p>
+</dd>
+</dl>
 </div>
 <div class="paragraph">
 <p>Using a Tailored ruleset:</p>
 </div>
-<div class="paragraph">
-<p><code>custom</code>: (required) Path to a UTF-8 text file containing rules supported by the <a href="http://docs.oracle.com/javase/8/docs/api/java/text/RuleBasedCollator.html"><code>JDK RuleBasedCollator</code></a></p>
-</div>
-<div class="paragraph">
-<p><code>strength</code>: Valid values are <code>primary</code>, <code>secondary</code>, <code>tertiary</code> or <code>identical</code>. See <a href="http://docs.oracle.com/javase/8/docs/api/java/text/Collator.html">Oracle Java 8 Collator javadocs</a> for more information.</p>
-</div>
-<div class="paragraph">
-<p><code>decomposition</code>: Valid values are <code>no</code>, <code>canonical</code>, or <code>full</code>. See <a href="http://docs.oracle.com/javase/8/docs/api/java/text/Collator.html">Oracle Java 8 Collator javadocs</a> for more information.</p>
-</div>
-<div class="paragraph">
-<p><strong>A <code>solr.CollationField</code> example:</strong></p>
+<div class="dlist">
+<dl>
+<dt class="hdlist1"><code>custom</code></dt>
+<dd>
+<p>(required) Path to a UTF-8 text file containing rules supported by the <a href="http://docs.oracle.com/javase/8/docs/api/java/text/RuleBasedCollator.html"><code>JDK RuleBasedCollator</code></a></p>
+</dd>
+<dt class="hdlist1"><code>strength</code></dt>
+<dd>
+<p>Valid values are <code>primary</code>, <code>secondary</code>, <code>tertiary</code> or <code>identical</code>. See <a href="http://docs.oracle.com/javase/8/docs/api/java/text/Collator.html">Oracle Java 8 Collator javadocs</a> for more information.</p>
+</dd>
+<dt class="hdlist1"><code>decomposition</code></dt>
+<dd>
+<p>Valid values are <code>no</code>, <code>canonical</code>, or <code>full</code>. See <a href="http://docs.oracle.com/javase/8/docs/api/java/text/Collator.html">Oracle Java 8 Collator javadocs</a> for more information.</p>
+</dd>
+</dl>
 </div>
 <div class="listingblock">
+<div class="title">A <code>solr.CollationField</code> example:</div>
 <div class="content">
 <pre class="pygments highlight"><code data-lang="xml"><span style="color: #008000; font-weight: bold">&lt;fieldType</span> <span style="color: #7D9029">name=</span><span style="color: #BA2121">&quot;collatedGERMAN&quot;</span> <span style="color: #7D9029">class=</span><span style="color: #BA2121">&quot;solr.CollationField&quot;</span>
            <span style="color: #7D9029">language=</span><span style="color: #BA2121">&quot;de&quot;</span>
@@ -1684,17 +1725,14 @@ IOUtils<span style="color: #666666">.</s
 <span style="color: #008000; font-weight: bold">&lt;copyField</span> <span style="color: #7D9029">source=</span><span style="color: #BA2121">&quot;manu&quot;</span> <span style="color: #7D9029">dest=</span><span style="color: #BA2121">&quot;manuGERMAN&quot;</span><span style="color: #008000; font-weight: bold">/&gt;</span></code></pre>
 </div>
 </div>
-<div class="paragraph">
-<p><a href="#main">Back to Top</a></p>
-</div>
 </div>
 </div>
 </div>
 <div class="sect1">
-<h2 id="LanguageAnalysis-ASCII_DecimalFoldingFilters">ASCII &amp; Decimal Folding Filters</h2>
+<h2 id="ascii-decimal-folding-filters">ASCII &amp; Decimal Folding Filters</h2>
 <div class="sectionbody">
 <div class="sect2">
-<h3 id="LanguageAnalysis-AsciiFolding">Ascii Folding</h3>
+<h3 id="LanguageAnalysis-AsciiFolding">ASCII Folding</h3>
 <div class="paragraph">
 <p>This filter converts alphabetic, numeric, and symbolic Unicode characters which are not in the first 127 ASCII characters (the "Basic Latin" Unicode block) into their ASCII equivalents, if one exists. Only those characters with reasonable ASCII alternatives are converted.</p>
 </div>
@@ -1731,7 +1769,7 @@ IOUtils<span style="color: #666666">.</s
 <div class="sect2">
 <h3 id="LanguageAnalysis-DecimalDigitFolding">Decimal Digit Folding</h3>
 <div class="paragraph">
-<p>This filter converts any character in the Unicode "Decimal Number" general category (<code>"Nd"</code>) into their equivalent Basic Latin digits (0-9).</p>
+<p>This filter converts any character in the Unicode "Decimal Number" general category (<code>Nd</code>) into their equivalent Basic Latin digits (0-9).</p>
 </div>
 <div class="paragraph">
 <p>This can increase recall by causing more matches. On the other hand, it can reduce precision because language-specific character differences may be lost.</p>
@@ -1753,9 +1791,6 @@ IOUtils<span style="color: #666666">.</s
 <span style="color: #008000; font-weight: bold">&lt;/analyzer&gt;</span></code></pre>
 </div>
 </div>
-<div class="paragraph">
-<p><a href="#main">Back to Top</a></p>
-</div>
 </div>
 </div>
 </div>
@@ -1900,9 +1935,6 @@ IOUtils<span style="color: #666666">.</s
 <span style="color: #008000; font-weight: bold">&lt;/analyzer&gt;</span></code></pre>
 </div>
 </div>
-<div class="paragraph">
-<p><a href="#main">Back to Top</a></p>
-</div>
 </div>
 <div class="sect2">
 <h3 id="LanguageAnalysis-BrazilianPortuguese">Brazilian Portuguese</h3>
@@ -1935,9 +1967,6 @@ IOUtils<span style="color: #666666">.</s
 <div class="paragraph">
 <p><strong>Out:</strong> "pra", "pra"</p>
 </div>
-<div class="paragraph">
-<p><a href="#main">Back to Top</a></p>
-</div>
 </div>
 <div class="sect2">
 <h3 id="LanguageAnalysis-Bulgarian">Bulgarian</h3>
@@ -1962,9 +1991,6 @@ IOUtils<span style="color: #666666">.</s
 <span style="color: #008000; font-weight: bold">&lt;/analyzer&gt;</span></code></pre>
 </div>
 </div>
-<div class="paragraph">
-<p><a href="#main">Back to Top</a></p>
-</div>
 </div>
 <div class="sect2">
 <h3 id="LanguageAnalysis-Catalan">Catalan</h3>
@@ -1977,8 +2003,13 @@ IOUtils<span style="color: #666666">.</s
 <div class="paragraph">
 <p><strong>Arguments:</strong></p>
 </div>
-<div class="paragraph">
-<p><code>language</code>: (required) stemmer language, "Catalan" in this case</p>
+<div class="dlist">
+<dl>
+<dt class="hdlist1"><code>language</code></dt>
+<dd>
+<p>(required) stemmer language, "Catalan" in this case</p>
+</dd>
+</dl>
 </div>
 <div class="paragraph">
 <p><strong>Example:</strong></p>
@@ -2003,9 +2034,6 @@ IOUtils<span style="color: #666666">.</s
 <div class="paragraph">
 <p><strong>Out:</strong> "llengu"(1), "llengu"(2)</p>
 </div>
-<div class="paragraph">
-<p><a href="#main">Back to Top</a></p>
-</div>
 </div>
 <div class="sect2">
 <h3 id="LanguageAnalysis-Chinese">Chinese</h3>
@@ -2053,9 +2081,6 @@ IOUtils<span style="color: #666666">.</s
 <span style="color: #008000; font-weight: bold">&lt;/analyzer&gt;</span></code></pre>
 </div>
 </div>
-<div class="paragraph">
-<p><a href="#main">Back to Top</a></p>
-</div>
 </div>
 </div>
 <div class="sect2">
@@ -2091,9 +2116,6 @@ IOUtils<span style="color: #666666">.</s
 <span style="color: #008000; font-weight: bold">&lt;/analyzer&gt;</span></code></pre>
 </div>
 </div>
-<div class="paragraph">
-<p><a href="#main">Back to Top</a></p>
-</div>
 </div>
 <div class="sect2">
 <h3 id="LanguageAnalysis-CJK">CJK</h3>
@@ -2116,9 +2138,6 @@ IOUtils<span style="color: #666666">.</s
 <span style="color: #008000; font-weight: bold">&lt;/analyzer&gt;</span></code></pre>
 </div>
 </div>
-<div class="paragraph">
-<p><a href="#main">Back to Top</a></p>
-</div>
 </div>
 <div class="sect2">
 <h3 id="LanguageAnalysis-Czech">Czech</h3>
@@ -2152,9 +2171,6 @@ IOUtils<span style="color: #666666">.</s
 <div class="paragraph">
 <p><strong>Out:</strong> "preziden", "preziden", "preziden"</p>
 </div>
-<div class="paragraph">
-<p><a href="#main">Back to Top</a></p>
-</div>
 </div>
 <div class="sect2">
 <h3 id="LanguageAnalysis-Danish">Danish</h3>
@@ -2170,8 +2186,13 @@ IOUtils<span style="color: #666666">.</s
 <div class="paragraph">
 <p><strong>Arguments:</strong></p>
 </div>
-<div class="paragraph">
-<p><code>language</code>: (required) stemmer language, "Danish" in this case</p>
+<div class="dlist">
+<dl>
+<dt class="hdlist1"><code>language</code></dt>
+<dd>
+<p>(required) stemmer language, "Danish" in this case</p>
+</dd>
+</dl>
 </div>
 <div class="paragraph">
 <p><strong>Example:</strong></p>
@@ -2194,9 +2215,6 @@ IOUtils<span style="color: #666666">.</s
 <div class="paragraph">
 <p><strong>Out:</strong> "undersøg"(1), "undersøg"(2)</p>
 </div>
-<div class="paragraph">
-<p><a href="#main">Back to Top</a></p>
-</div>
 </div>
 <div class="sect2">
 <h3 id="LanguageAnalysis-Dutch">Dutch</h3>
@@ -2209,8 +2227,13 @@ IOUtils<span style="color: #666666">.</s
 <div class="paragraph">
 <p><strong>Arguments:</strong></p>
 </div>
-<div class="paragraph">
-<p><code>language</code>: (required) stemmer language, "Dutch" in this case</p>
+<div class="dlist">
+<dl>
+<dt class="hdlist1"><code>language</code></dt>
+<dd>
+<p>(required) stemmer language, "Dutch" in this case</p>
+</dd>
+</dl>
 </div>
 <div class="paragraph">
 <p><strong>Example:</strong></p>
@@ -2233,9 +2256,6 @@ IOUtils<span style="color: #666666">.</s
 <div class="paragraph">
 <p><strong>Out:</strong> "kanal", "kanal"</p>
 </div>
-<div class="paragraph">
-<p><a href="#main">Back to Top</a></p>
-</div>
 </div>
 <div class="sect2">
 <h3 id="LanguageAnalysis-Finnish">Finnish</h3>
@@ -2268,9 +2288,6 @@ IOUtils<span style="color: #666666">.</s
 <div class="paragraph">
 <p><strong>Out:</strong> "kala", "kala"</p>
 </div>
-<div class="paragraph">
-<p><a href="#main">Back to Top</a></p>
-</div>
 </div>
 <div class="sect2">
 <h3 id="LanguageAnalysis-French">French</h3>
@@ -2285,11 +2302,17 @@ IOUtils<span style="color: #666666">.</s
 <div class="paragraph">
 <p><strong>Arguments:</strong></p>
 </div>
-<div class="paragraph">
-<p><code>articles</code>: The pathname of a file that contains a list of articles, one per line, to be stripped. Articles are words such as "le", which are commonly abbreviated, such as in <em>l&#8217;avion</em> (the plane). This file should include the abbreviated form, which precedes the apostrophe. In this case, simply "<em>l</em>". If no <code>articles</code> attribute is specified, a default set of French articles is used.</p>
-</div>
-<div class="paragraph">
-<p><code>ignoreCase</code>: (boolean) If true, the filter ignores the case of words when comparing them to the common word file. Defaults to <code>false</code></p>
+<div class="dlist">
+<dl>
+<dt class="hdlist1"><code>articles</code></dt>
+<dd>
+<p>The pathname of a file that contains a list of articles, one per line, to be stripped. Articles are words such as "le", which are commonly abbreviated, such as in <em>l&#8217;avion</em> (the plane). This file should include the abbreviated form, which precedes the apostrophe. In this case, simply "<em>l</em>". If no <code>articles</code> attribute is specified, a default set of French articles is used.</p>
+</dd>
+<dt class="hdlist1"><code>ignoreCase</code></dt>
+<dd>
+<p>(boolean) If true, the filter ignores the case of words when comparing them to the common word file. Defaults to <code>false</code></p>
+</dd>
+</dl>
 </div>
 <div class="paragraph">
 <p><strong>Example:</strong></p>
@@ -2359,9 +2382,6 @@ IOUtils<span style="color: #666666">.</s
 <div class="paragraph">
 <p><strong>Out:</strong> "le", "chat", "le", "chat"</p>
 </div>
-<div class="paragraph">
-<p><a href="#main">Back to Top</a></p>
-</div>
 </div>
 </div>
 <div class="sect2">
@@ -2396,9 +2416,6 @@ IOUtils<span style="color: #666666">.</s
 <div class="paragraph">
 <p><strong>Out:</strong> "feliz", "luz"</p>
 </div>
-<div class="paragraph">
-<p><a href="#main">Back to Top</a></p>
-</div>
 </div>
 <div class="sect2">
 <h3 id="LanguageAnalysis-German">German</h3>
@@ -2447,9 +2464,6 @@ IOUtils<span style="color: #666666">.</s
 <div class="paragraph">
 <p><strong>Out:</strong> "haus", "haus"</p>
 </div>
-<div class="paragraph">
-<p><a href="#main">Back to Top</a></p>
-</div>
 </div>
 <div class="sect2">
 <h3 id="LanguageAnalysis-Greek">Greek</h3>
@@ -2470,7 +2484,7 @@ IOUtils<span style="color: #666666">.</s
 </td>
 <td class="content">
 <div class="paragraph">
-<p>Use of custom charsets is not longer supported as of Solr 3.1. If you need to index text in these encodings, please use Java&#8217;s character set conversion facilities (InputStreamReader, and so on.) during I/O, so that Lucene can analyze this text as Unicode instead.</p>
+<p>Use of custom charsets is no longer supported as of Solr 3.1. If you need to index text in these encodings, please use Java&#8217;s character set conversion facilities (InputStreamReader, etc.) during I/O, so that Lucene can analyze this text as Unicode instead.</p>
 </div>
 </td>
 </tr>
@@ -2487,9 +2501,6 @@ IOUtils<span style="color: #666666">.</s
 <span style="color: #008000; font-weight: bold">&lt;/analyzer&gt;</span></code></pre>
 </div>
 </div>
-<div class="paragraph">
-<p><a href="#main">Back to Top</a></p>
-</div>
 </div>
 <div class="sect2">
 <h3 id="LanguageAnalysis-Hindi">Hindi</h3>
@@ -2515,9 +2526,6 @@ IOUtils<span style="color: #666666">.</s
 <span style="color: #008000; font-weight: bold">&lt;/analyzer&gt;</span></code></pre>
 </div>
 </div>
-<div class="paragraph">
-<p><a href="#main">Back to Top</a></p>
-</div>
 </div>
 <div class="sect2">
 <h3 id="LanguageAnalysis-Indonesian">Indonesian</h3>
@@ -2551,9 +2559,6 @@ IOUtils<span style="color: #666666">.</s
 <div class="paragraph">
 <p><strong>Out:</strong> "bagai", "bagai"</p>
 </div>
-<div class="paragraph">
-<p><a href="#main">Back to Top</a></p>
-</div>
 </div>
 <div class="sect2">
 <h3 id="LanguageAnalysis-Italian">Italian</h3>
@@ -2589,9 +2594,6 @@ IOUtils<span style="color: #666666">.</s
 <div class="paragraph">
 <p><strong>Out:</strong> "propag", "propag", "propag"</p>
 </div>
-<div class="paragraph">
-<p><a href="#main">Back to Top</a></p>
-</div>
 </div>
 <div class="sect2">
 <h3 id="LanguageAnalysis-Irish">Irish</h3>
@@ -2604,8 +2606,13 @@ IOUtils<span style="color: #666666">.</s
 <div class="paragraph">
 <p><strong>Arguments:</strong></p>
 </div>
-<div class="paragraph">
-<p><code>language</code>: (required) stemmer language, "Irish" in this case</p>
+<div class="dlist">
+<dl>
+<dt class="hdlist1"><code>language</code></dt>
+<dd>
+<p>(required) stemmer language, "Irish" in this case</p>
+</dd>
+</dl>
 </div>
 <div class="paragraph">
 <p><strong>Example:</strong></p>
@@ -2630,9 +2637,6 @@ IOUtils<span style="color: #666666">.</s
 <div class="paragraph">
 <p><strong>Out:</strong> "siopadóir", "síceapaite", "fearr", "athair"</p>
 </div>
-<div class="paragraph">
-<p><a href="#main">Back to Top</a></p>
-</div>
 </div>
 <div class="sect2">
 <h3 id="LanguageAnalysis-Japanese">Japanese</h3>
@@ -2679,11 +2683,17 @@ IOUtils<span style="color: #666666">.</s
 <div class="paragraph">
 <p><strong>Arguments:</strong></p>
 </div>
-<div class="paragraph">
-<p><code>normalizeKanji</code>: set to <code>false</code> to not normalize kanji iteration marks (default is <code>true</code>)</p>
-</div>
-<div class="paragraph">
-<p>` normalizeKana`: set to <code>false</code> to not normalize kana iteration marks (default is <code>true</code>)</p>
+<div class="dlist">
+<dl>
+<dt class="hdlist1"><code>normalizeKanji</code></dt>
+<dd>
+<p>set to <code>false</code> to not normalize kanji iteration marks (default is <code>true</code>)</p>
+</dd>
+<dt class="hdlist1"><code>normalizeKana</code></dt>
+<dd>
+<p>set to <code>false</code> to not normalize kana iteration marks (default is <code>true</code>)</p>
+</dd>
+</dl>
 </div>
 </div>
 <div class="sect3">
@@ -2700,9 +2710,11 @@ IOUtils<span style="color: #666666">.</s
 <div class="paragraph">
 <p><strong>Arguments:</strong></p>
 </div>
-<div class="paragraph">
-<p><code>mode</code>: Use <code>search</code> mode to get a noun-decompounding effect useful for search. <code>search</code> mode improves segmentation for search at the expense of part-of-speech accuracy. Valid values for <code>mode</code> are:</p>
-</div>
+<div class="dlist">
+<dl>
+<dt class="hdlist1"><code>mode</code></dt>
+<dd>
+<p>Use <code>search</code> mode to get a noun-decompounding effect useful for search. <code>search</code> mode improves segmentation for search at the expense of part-of-speech accuracy. Valid values for <code>mode</code> are:</p>
 <div class="ulist">
 <ul>
 <li>
@@ -2713,20 +2725,26 @@ IOUtils<span style="color: #666666">.</s
 </li>
 <li>
 <p><code>extended</code>: search mode plus unigramming of unknown words (experimental)</p>
-</li>
-</ul>
-</div>
 <div class="paragraph">
 <p>For some applications it might be good to use <code>search</code> mode for indexing and <code>normal</code> mode for queries to increase precision and prevent parts of compounds from being matched and highlighted.</p>
 </div>
-<div class="paragraph">
-<p><code>userDictionary</code>: filename for a user dictionary, which allows overriding the statistical model with your own entries for segmentation, part-of-speech tags and readings without a need to specify weights. See <code>lang/userdict_ja.txt</code> for a sample user dictionary file.</p>
-</div>
-<div class="paragraph">
-<p><code>userDictionaryEncoding</code>: user dictionary encoding (default is UTF-8)</p>
+</li>
+</ul>
 </div>
-<div class="paragraph">
-<p><code>discardPunctuation</code>: set to <code>false</code> to keep punctuation, <code>true</code> to discard (the default)</p>
+</dd>
+<dt class="hdlist1"><code>userDictionary</code></dt>
+<dd>
+<p>filename for a user dictionary, which allows overriding the statistical model with your own entries for segmentation, part-of-speech tags and readings without a need to specify weights. See <code>lang/userdict_ja.txt</code> for a sample user dictionary file.</p>
+</dd>
+<dt class="hdlist1"><code>userDictionaryEncoding</code></dt>
+<dd>
+<p>user dictionary encoding (default is UTF-8)</p>
+</dd>
+<dt class="hdlist1"><code>discardPunctuation</code></dt>
+<dd>
+<p>set to <code>false</code> to keep punctuation, <code>true</code> to discard (the default)</p>
+</dd>
+</dl>
 </div>
 </div>
 <div class="sect3">
@@ -2752,11 +2770,17 @@ IOUtils<span style="color: #666666">.</s
 <div class="paragraph">
 <p><strong>Arguments:</strong></p>
 </div>
-<div class="paragraph">
-<p><code>tags</code>: filename for a list of parts-of-speech for which to remove terms; see <code>conf/lang/stoptags_ja.txt</code> in the <code>sample_techproducts_config</code> <a href="config-sets.html#config-sets">config set</a> for an example.</p>
-</div>
-<div class="paragraph">
-<p><code>enablePositionIncrements</code>: if <code>luceneMatchVersion</code> is <code>4.3</code> or earlier and <code>enablePositionIncrements="false"</code>, no position holes will be left by this filter when it removes tokens. <strong>This argument is invalid if <code>luceneMatchVersion</code> is <code>5.0</code> or later.</strong></p>
+<div class="dlist">
+<dl>
+<dt class="hdlist1"><code>tags</code></dt>
+<dd>
+<p>filename for a list of parts-of-speech for which to remove terms; see <code>conf/lang/stoptags_ja.txt</code> in the <code>sample_techproducts_config</code> <a href="config-sets.html#config-sets">config set</a> for an example.</p>
+</dd>
+<dt class="hdlist1"><code>enablePositionIncrements</code></dt>
+<dd>
+<p>if <code>luceneMatchVersion</code> is <code>4.3</code> or earlier and <code>enablePositionIncrements="false"</code>, no position holes will be left by this filter when it removes tokens. <strong>This argument is invalid if <code>luceneMatchVersion</code> is <code>5.0</code> or later.</strong></p>
+</dd>
+</dl>
 </div>
 </div>
 <div class="sect3">
@@ -2773,8 +2797,13 @@ IOUtils<span style="color: #666666">.</s
 <div class="paragraph">
 <p><strong>Arguments:</strong></p>
 </div>
-<div class="paragraph">
-<p><code>minimumLength</code>: terms below this length will not be stemmed. Default is 4, value must be 2 or more.</p>
+<div class="dlist">
+<dl>
+<dt class="hdlist1"><code>minimumLength</code></dt>
+<dd>
+<p>terms below this length will not be stemmed. Default is 4, value must be 2 or more.</p>
+</dd>
+</dl>
 </div>
 </div>
 <div class="sect3">
@@ -2808,9 +2837,6 @@ IOUtils<span style="color: #666666">.</s
 <span style="color: #008000; font-weight: bold">&lt;/fieldType&gt;</span></code></pre>
 </div>
 </div>
-<div class="paragraph">
-<p><a href="#main">Back to Top</a></p>
-</div>
 </div>
 </div>
 <div class="sect2">
@@ -2821,9 +2847,6 @@ IOUtils<span style="color: #666666">.</s
 <div class="paragraph">
 <p>See <a href="tokenizers.html#Tokenizers-ICUTokenizer">the ICUTokenizer</a> for more information.</p>
 </div>
-<div class="paragraph">
-<p><a href="#main">Back to Top</a></p>
-</div>
 </div>
 <div class="sect2">
 <h3 id="LanguageAnalysis-Latvian">Latvian</h3>
@@ -2859,9 +2882,6 @@ IOUtils<span style="color: #666666">.</s
 <div class="paragraph">
 <p><strong>Out:</strong> "tirg", "tirg"</p>
 </div>
-<div class="paragraph">
-<p><a href="#main">Back to Top</a></p>
-</div>
 </div>
 <div class="sect2">
 <h3 id="LanguageAnalysis-Norwegian">Norwegian</h3>
@@ -2891,10 +2911,8 @@ IOUtils<span style="color: #666666">.</s
 </colgroup>
 <thead>
 <tr>
-<th class="tableblock halign-left valign-top"><strong>One pass</strong></th>
-<th class="tableblock halign-left valign-top"></th>
-<th class="tableblock halign-left valign-top"><strong>Two passes</strong></th>
-<th class="tableblock halign-left valign-top"></th>
+<th class="tableblock halign-center valign-top" colspan="2"><strong>One pass</strong></th>
+<th class="tableblock halign-center valign-top" colspan="2"><strong>Two passes</strong></th>
 </tr>
 </thead>
 <tbody>
@@ -2952,8 +2970,13 @@ IOUtils<span style="color: #666666">.</s
 <p><strong>Factory class:</strong> <code>solr.NorwegianLightStemFilterFactory</code></p>
 </div>
 <div class="paragraph">
-<p><strong>Arguments:</strong> <code>variant:</code> Choose the Norwegian language variant to use. Valid values are:</p>
+<p><strong>Arguments:</strong></p>
 </div>
+<div class="dlist">
+<dl>
+<dt class="hdlist1"><code>variant</code></dt>
+<dd>
+<p>Choose the Norwegian language variant to use. Valid values are:</p>
 <div class="ulist">
 <ul>
 <li>
@@ -2967,6 +2990,9 @@ IOUtils<span style="color: #666666">.</s
 </li>
 </ul>
 </div>
+</dd>
+</dl>
+</div>
 <div class="paragraph">
 <p><strong>Example:</strong></p>
 </div>
@@ -3001,8 +3027,13 @@ IOUtils<span style="color: #666666">.</s
 <p><strong>Factory class:</strong> <code>solr.NorwegianMinimalStemFilterFactory</code></p>
 </div>
 <div class="paragraph">
-<p><strong>Arguments:</strong> <code>variant:</code> Choose the Norwegian language variant to use. Valid values are:</p>
+<p><strong>Arguments:</strong></p>
 </div>
+<div class="dlist">
+<dl>
+<dt class="hdlist1"><code>variant</code></dt>
+<dd>
+<p>Choose the Norwegian language variant to use. Valid values are:</p>
 <div class="ulist">
 <ul>
 <li>
@@ -3016,6 +3047,9 @@ IOUtils<span style="color: #666666">.</s
 </li>
 </ul>
 </div>
+</dd>
+</dl>
+</div>
 <div class="paragraph">
 <p><strong>Example:</strong></p>
 </div>
@@ -3040,9 +3074,6 @@ IOUtils<span style="color: #666666">.</s
 <div class="paragraph">
 <p><strong>Out:</strong> "bil"</p>
 </div>
-<div class="paragraph">
-<p><a href="#main">Back to Top</a></p>
-</div>
 </div>
 </div>
 <div class="sect2">
@@ -3070,9 +3101,6 @@ IOUtils<span style="color: #666666">.</s
 <span style="color: #008000; font-weight: bold">&lt;/analyzer&gt;</span></code></pre>
 </div>
 </div>
-<div class="paragraph">
-<p><a href="#main">Back to Top</a></p>
-</div>
 </div>
 </div>
 <div class="sect2">
@@ -3123,10 +3151,7 @@ IOUtils<span style="color: #666666">.</s
 <p>Note the lower case filter is applied <em>after</em> the Morfologik stemmer; this is because the Polish dictionary contains proper names and then proper term case may be important to resolve disambiguities (or even lookup the correct lemma at all).</p>
 </div>
 <div class="paragraph">
-<p>The Morfologik dictionary param value is a constant specifying which dictionary to choose. The dictionary resource must be named <code>path/to/<em>language</em>.dict</code> and have an associated <code>.info</code> metadata file. See <a href="http://morfologik.blogspot.com/">the Morfologik project</a> for details. If the dictionary attribute is not provided, the Polish dictionary is loaded and used by default.</p>
-</div>
-<div class="paragraph">
-<p><a href="#main">Back to Top</a></p>
+<p>The Morfologik dictionary parameter value is a constant specifying which dictionary to choose. The dictionary resource must be named <code>path/to/<em>language</em>.dict</code> and have an associated <code>.info</code> metadata file. See <a href="http://morfologik.blogspot.com/">the Morfologik project</a> for details. If the dictionary attribute is not provided, the Polish dictionary is loaded and used by default.</p>
 </div>
 </div>
 <div class="sect2">
@@ -3179,9 +3204,6 @@ IOUtils<span style="color: #666666">.</s
 <div class="paragraph">
 <p><strong>Out:</strong> "pra", "pra"</p>
 </div>
-<div class="paragraph">
-<p><a href="#main">Back to Top</a></p>
-</div>
 </div>
 <div class="sect2">
 <h3 id="LanguageAnalysis-Romanian">Romanian</h3>
@@ -3194,8 +3216,13 @@ IOUtils<span style="color: #666666">.</s
 <div class="paragraph">
 <p><strong>Arguments:</strong></p>
 </div>
-<div class="paragraph">
-<p><code>language</code>: (required) stemmer language, "Romanian" in this case</p>
+<div class="dlist">
+<dl>
+<dt class="hdlist1"><code>language</code></dt>
+<dd>
+<p>(required) stemmer language, "Romanian" in this case</p>
+</dd>
+</dl>
 </div>
 <div class="paragraph">
 <p><strong>Example:</strong></p>
@@ -3209,9 +3236,6 @@ IOUtils<span style="color: #666666">.</s
 <span style="color: #008000; font-weight: bold">&lt;/analyzer&gt;</span></code></pre>
 </div>
 </div>
-<div class="paragraph">
-<p><a href="#main">Back to Top</a></p>
-</div>
 </div>
 <div class="sect2">
 <h3 id="LanguageAnalysis-Russian">Russian</h3>
@@ -3238,18 +3262,15 @@ IOUtils<span style="color: #666666">.</s
 <span style="color: #008000; font-weight: bold">&lt;/analyzer&gt;</span></code></pre>
 </div>
 </div>
-<div class="paragraph">
-<p><a href="#main">Back to Top</a></p>
-</div>
 </div>
 </div>
 <div class="sect2">
 <h3 id="LanguageAnalysis-Scandinavian">Scandinavian</h3>
 <div class="paragraph">
-<p>Scandinavian is a language group spanning three languages <a href="#LanguageAnalysis-Norwegian">Norwegian</a>, <a href="#LanguageAnalysis-Swed">Swedish</a> and <a href="#LanguageAnalysis-Danish">Danish</a> which are very similar.</p>
+<p>Scandinavian is a language group spanning three languages <a href="#LanguageAnalysis-Norwegian">Norwegian</a>, <a href="#LanguageAnalysis-Swedish">Swedish</a> and <a href="#LanguageAnalysis-Danish">Danish</a> which are very similar.</p>
 </div>
 <div class="paragraph">
-<p>Swedish å,ä,ö are in fact the same letters as Norwegian and Danish å,æ,ø and thus interchangeable when used between these languages. They are however folded differently when people type them on a keyboard lacking these characters.</p>
+<p>Swedish å, ä, ö are in fact the same letters as Norwegian and Danish å, æ, ø and thus interchangeable when used between these languages. They are however folded differently when people type them on a keyboard lacking these characters.</p>
 </div>
 <div class="paragraph">
 <p>In that situation almost all Swedish people use a, a, o instead of å, ä, ö. Norwegians and Danes on the other hand usually type aa, ae and oe instead of å, æ and ø. Some do however use a, a, o, oo, ao and sometimes permutations of everything above.</p>
@@ -3331,9 +3352,6 @@ IOUtils<span style="color: #666666">.</s
 <div class="paragraph">
 <p><strong>Out:</strong> "blabarsyltetoj", "blabarsyltetoj", "blabarsyltetoj", "blabarsyltetoj"</p>
 </div>
-<div class="paragraph">
-<p><a href="#main">Back to Top</a></p>
-</div>
 </div>
 </div>
 <div class="sect2">
@@ -3350,18 +3368,26 @@ IOUtils<span style="color: #666666">.</s
 <p><strong>Factory class:</strong> <code>solr.SerbianNormalizationFilterFactory</code></p>
 </div>
 <div class="paragraph">
-<p><strong>Arguments:</strong> <code>haircut</code> : Select the extend of normalization. Valid values are:</p>
+<p><strong>Arguments:</strong></p>
 </div>
+<div class="dlist">
+<dl>
+<dt class="hdlist1"><code>haircut</code> </dt>
+<dd>
+<p>Select the extend of normalization. Valid values are:</p>
 <div class="ulist">
 <ul>
 <li>
-<p>bald: (Default behavior) Cyrillic characters are first converted to Latin; then, Latin characters have their diacritics removed, with the exception of "https://en.wikipedia.org/wiki/D_with_stroke[LATIN SMALL LETTER D WITH STROKE]" (U+0111) which is converted to &#8220;<code>dj</code>&#8221;</p>
+<p><code>bald</code>: (Default behavior) Cyrillic characters are first converted to Latin; then, Latin characters have their diacritics removed, with the exception of <a href="https://en.wikipedia.org/wiki/D_with_stroke">LATIN SMALL LETTER D WITH STROKE</a> (U+0111) which is converted to &#8220;<code>dj</code>&#8221;</p>
 </li>
 <li>
 <p><code>regular</code>: Only Cyrillic to Latin normalization will be applied, preserving the Latin diatrics</p>
 </li>
 </ul>
 </div>
+</dd>
+</dl>
+</div>
 <div class="paragraph">
 <p><strong>Example:</strong></p>
 </div>
@@ -3374,9 +3400,6 @@ IOUtils<span style="color: #666666">.</s
 <span style="color: #008000; font-weight: bold">&lt;/analyzer&gt;</span></code></pre>
 </div>
 </div>
-<div class="paragraph">
-<p><a href="#main">Back to Top</a></p>
-</div>
 </div>
 </div>
 <div class="sect2">
@@ -3411,9 +3434,6 @@ IOUtils<span style="color: #666666">.</s
 <div class="paragraph">
 <p><strong>Out:</strong> "tor", "tor", "tor"</p>
 </div>
-<div class="paragraph">
-<p><a href="#main">Back to Top</a></p>
-</div>
 </div>
 <div class="sect2">
 <h3 id="LanguageAnalysis-Swedish">Swedish</h3>
@@ -3452,9 +3472,6 @@ IOUtils<span style="color: #666666">.</s
 <div class="paragraph">
 <p><strong>Out:</strong> "klok", "klok", "klok"</p>
 </div>
-<div class="paragraph">
-<p><a href="#main">Back to Top</a></p>
-</div>
 </div>
 </div>
 <div class="sect2">
@@ -3479,9 +3496,6 @@ IOUtils<span style="color: #666666">.</s
 <span style="color: #008000; font-weight: bold">&lt;/analyzer&gt;</span></code></pre>
 </div>
 </div>
-<div class="paragraph">
-<p><a href="#main">Back to Top</a></p>
-</div>
 </div>
 <div class="sect2">
 <h3 id="LanguageAnalysis-Turkish">Turkish</h3>
@@ -3527,9 +3541,6 @@ IOUtils<span style="color: #666666">.</s
 <p>[[LanguageAnalysis-BacktoTop#main]]
 ===</p>
 </div>
-<div class="paragraph">
-<p><a href="#main">Back to Top</a></p>
-</div>
 </div>
 <div class="sect2">
 <h3 id="LanguageAnalysis-Ukrainian">Ukrainian</h3>
@@ -3545,8 +3556,13 @@ IOUtils<span style="color: #666666">.</s
 <div class="paragraph">
 <p><strong>Arguments:</strong></p>
 </div>
-<div class="paragraph">
-<p><code>dictionary</code>: (required) lemmatizer dictionary - the <code>lucene-analyzers-morfologik</code> jar contains a Ukrainian dictionary at <code>org/apache/lucene/analysis/uk/ukrainian.dict</code>.</p>
+<div class="dlist">
+<dl>
+<dt class="hdlist1"><code>dictionary</code></dt>
+<dd>
+<p>(required) lemmatizer dictionary - the <code>lucene-analyzers-morfologik</code> jar contains a Ukrainian dictionary at <code>org/apache/lucene/analysis/uk/ukrainian.dict</code>.</p>
+</dd>
+</dl>
 </div>
 <div class="paragraph">
 <p><strong>Example:</strong></p>
@@ -3606,7 +3622,7 @@ IOUtils<span style="color: #666666">.</s
             <div class="row">
                 <div class="col-lg-12 footer">
                &copy;2017 Apache Software Foundation. All rights reserved. <br />
- Site last generated: 2017-05-03 <br />
+ Site last generated: 2017-05-09 <br />
 <p><img src="solr-sunOnly-small.png" alt="Apache Solr"/></p>
                 </div>
             </div>