From ea90142739e9c549fd5c35ae31a7723c0f74f882 Mon Sep 17 00:00:00 2001
From: Patrick Allaert <pa@ez.no>
Date: Mon, 16 May 2011 16:38:52 +0200
Subject: [PATCH] CS: removing trailing whitespaces

---
 CREDITS.txt                                   |   2 +-
 bin/scripts/debian/solr                       |   2 +-
 bin/scripts/rhel/solr                         |   4 +-
 design/admin2/templates/page_search.tpl       |   4 +-
 .../override/templates/block/search.tpl       |   2 +-
 design/ezwebin/templates/content/search.tpl   |  70 ++---
 .../templates/page_header_searchbox.tpl       |   2 +-
 .../templates/parts/image/related_content.tpl |   2 +-
 .../javascript/ezajax_autocomplete.js         |  10 +-
 design/standard/javascript/ezajaxsearch.js    |  36 +--
 design/standard/stylesheets/ezfind.css        |   4 +-
 design/standard/templates/ezfind/elevate.tpl  |  60 ++---
 .../templates/ezfind/elevation_detail.tpl     |  22 +-
 .../templates/ezfind/remove_elevation.tpl     |   8 +-
 doc/INSTALL.txt                               |  20 +-
 doc/design/2.0/facets.txt                     |  26 +-
 doc/design/2.0/native_types.txt               |  22 +-
 doc/design/2.0/sorting.txt                    |   8 +-
 doc/design/2.1/elevate_support.rst.txt        |  34 +--
 .../enhanced_multilanguage_support.rst.txt    |   6 +-
 doc/design/2.1/subattribute-filtering.txt     |  12 +-
 ...i-lingual-improvements-with-multi-core.txt |   4 +-
 doc/multicore-HOWTO.txt                       |   6 +-
 ...rade-ezfind-2.0.0-final-to-2.1.0-final.txt |  12 +-
 .../upgrade-ezfind-2.0alpha1-to-2.0-beta1.txt |   2 +-
 java/README.txt                               |   4 +-
 java/etc/jetty.xml                            |   4 +-
 java/etc/webdefault.xml                       |   8 +-
 .../eng-GB/conf/mapping-FoldToASCII.txt       |   6 +-
 java/solr.multicore/eng-GB/conf/schema.xml    |  34 +--
 .../solr.multicore/eng-GB/conf/solrconfig.xml | 254 +++++++++---------
 .../eng-GB/conf/xslt/example.xsl              |  14 +-
 .../eng-GB/conf/xslt/example_atom.xsl         |   8 +-
 .../eng-GB/conf/xslt/example_rss.xsl          |   6 +-
 java/solr.multicore/eng-GB/conf/xslt/luke.xsl |   8 +-
 .../fre-FR/conf/mapping-FoldToASCII.txt       |   6 +-
 java/solr.multicore/fre-FR/conf/schema.xml    |  36 +--
 .../solr.multicore/fre-FR/conf/solrconfig.xml | 254 +++++++++---------
 .../fre-FR/conf/xslt/example.xsl              |  14 +-
 .../fre-FR/conf/xslt/example_atom.xsl         |   8 +-
 .../fre-FR/conf/xslt/example_rss.xsl          |   6 +-
 java/solr.multicore/fre-FR/conf/xslt/luke.xsl |   8 +-
 .../nor-NO/conf/mapping-FoldToASCII.txt       |   6 +-
 java/solr.multicore/nor-NO/conf/schema.xml    |  36 +--
 .../solr.multicore/nor-NO/conf/solrconfig.xml | 254 +++++++++---------
 .../nor-NO/conf/xslt/example.xsl              |  14 +-
 .../nor-NO/conf/xslt/example_atom.xsl         |   8 +-
 .../nor-NO/conf/xslt/example_rss.xsl          |   6 +-
 java/solr.multicore/nor-NO/conf/xslt/luke.xsl |   8 +-
 java/solr.sh                                  |   2 +-
 java/solr/README.txt                          |   2 +-
 java/solr/bin/backupcleaner                   |   2 +-
 java/solr/bin/rsyncd-start                    |   2 +-
 java/solr/conf/mapping-FoldToASCII.txt        |   6 +-
 java/solr/conf/schema.xml                     |  22 +-
 java/solr/conf/solrconfig.xml                 | 252 ++++++++---------
 java/solr/conf/xslt/example.xsl               |  14 +-
 java/solr/conf/xslt/example_atom.xsl          |   8 +-
 java/solr/conf/xslt/example_rss.xsl           |   6 +-
 java/solr/conf/xslt/luke.xsl                  |   8 +-
 java/solr/solr.xml                            |   4 +-
 .../handler/ezfind/eZFindRequestHandler.java  | 106 ++++----
 settings/ezfind.ini                           |   2 +-
 share/db_schema.dba                           |  26 +-
 share/ezfind_elevate_configuration.dba        |  26 +-
 65 files changed, 939 insertions(+), 939 deletions(-)

diff --git a/CREDITS.txt b/CREDITS.txt
index 6b57995c..bf8a7ef6 100644
--- a/CREDITS.txt
+++ b/CREDITS.txt
@@ -1,4 +1,4 @@
-eZ Systems would like to thank the following active contributors, 
+eZ Systems would like to thank the following active contributors,
 whose work inspired early versions of eZ Find :
 
 * Kristof Coomans <kristof[dot]coomans[at]telenet[dot]be> on http://projects.ez.no/ezsolr
diff --git a/bin/scripts/debian/solr b/bin/scripts/debian/solr
index 856cfd2f..b2e086aa 100755
--- a/bin/scripts/debian/solr
+++ b/bin/scripts/debian/solr
@@ -37,7 +37,7 @@ test -x $DAEMON || exit 0
 #
 d_start() {
 	start-stop-daemon --start --pidfile $PIDFILE --chdir $SOLR_HOME --background --make-pidfile --exec $DAEMON -- $PARAMETERS
-} 
+}
 #
 #	Function that stops the daemon/service.
 #
diff --git a/bin/scripts/rhel/solr b/bin/scripts/rhel/solr
index aede81f7..8db05af3 100644
--- a/bin/scripts/rhel/solr
+++ b/bin/scripts/rhel/solr
@@ -1,9 +1,9 @@
 #!/bin/bash
 #
 # eZ Find init script for RHEL and CENTOS.
-# 
+#
 # Usage:
-# 
+#
 # Set the correct SOLR_HOME value, and copy this file to /etc/init.d
 # Symlink to /etc/init.d/solr to /etc/rc3.d/S70solr and /etc/rc5.d/S70solr
 #
diff --git a/design/admin2/templates/page_search.tpl b/design/admin2/templates/page_search.tpl
index ad8f5592..359d5976 100644
--- a/design/admin2/templates/page_search.tpl
+++ b/design/admin2/templates/page_search.tpl
@@ -49,9 +49,9 @@ ezAutoHeader.init({ldelim}
 	if ( document.getElementById('searchbuttonfield') ) {
 
 		jQuery('#searchbuttonfield').click(function() {
-            if ( jQuery('#searchtext').val() === jQuery('#searchtext').attr('title') ) 
+            if ( jQuery('#searchtext').val() === jQuery('#searchtext').attr('title') )
                 return;
-            
+
         	jQuery('#searchbutton').click();
         });
     }
diff --git a/design/ezflow/override/templates/block/search.tpl b/design/ezflow/override/templates/block/search.tpl
index 7c7fb723..ed0d6d92 100644
--- a/design/ezflow/override/templates/block/search.tpl
+++ b/design/ezflow/override/templates/block/search.tpl
@@ -7,7 +7,7 @@
     {def $customAttributesString='['}
     {foreach $block.custom_attributes as $name => $value}
         <input id="search-custom-attribute-{$name}-{$block.id}" type="hidden" name="{$name}" value="{$value}" />
-        {set $customAttributesString = concat( $customAttributesString, '"#search-custom-attribute-', $name, '-', $block.id, '", ' )}    
+        {set $customAttributesString = concat( $customAttributesString, '"#search-custom-attribute-', $name, '-', $block.id, '", ' )}
     {/foreach}
     {set $customAttributesString=concat( $customAttributesString|trim( ' ,' ), ']' )}
 </div>
diff --git a/design/ezwebin/templates/content/search.tpl b/design/ezwebin/templates/content/search.tpl
index d50d5b0a..b69c9325 100644
--- a/design/ezwebin/templates/content/search.tpl
+++ b/design/ezwebin/templates/content/search.tpl
@@ -1,12 +1,12 @@
 {def $search=false()}
 {if $use_template_search}
     {set $page_limit=10}
-    
+
     {def $activeFacetParameters = array()}
     {if ezhttp_hasvariable( 'activeFacets', 'get' )}
         {set $activeFacetParameters = ezhttp( 'activeFacets', 'get' )}
     {/if}
-    
+
     {def $dateFilter=0}
     {if ezhttp_hasvariable( 'dateFilter', 'get' )}
         {set $dateFilter = ezhttp( 'dateFilter', 'get' )}
@@ -19,20 +19,20 @@
            {/case}
            {case match=3}
               {def $dateFilterLabel="Last month"|i18n("design/standard/content/search")}
-           {/case}      
+           {/case}
            {case match=4}
               {def $dateFilterLabel="Last three months"|i18n("design/standard/content/search")}
-           {/case}      
+           {/case}
            {case match=5}
               {def $dateFilterLabel="Last year"|i18n("design/standard/content/search")}
-           {/case}                 
-		{/switch}        
-    {/if}    
-    
+           {/case}
+		{/switch}
+    {/if}
+
     {def $filterParameters = fetch( 'ezfind', 'filterParameters' )
          $defaultSearchFacets = fetch( 'ezfind', 'getDefaultSearchFacets' )}
     {* def $facetParameters=$defaultSearchFacets|array_merge_recursive( $activeFacetParameters ) *}
-    
+
     {set $search=fetch( ezfind,search,
                         hash( 'query', $search_text,
                               'offset', $view_parameters.offset,
@@ -41,7 +41,7 @@
                               'facet', $defaultSearchFacets,
                               'filter', $filterParameters,
                               'publish_date', $dateFilter,
-                              'spell_check', array( true() ) 
+                              'spell_check', array( true() )
                              ))}
     {set $search_result=$search['SearchResult']}
     {set $search_count=$search['SearchCount']}
@@ -65,7 +65,7 @@
 {if gt( $dateFilter, 0 )}
     {set $uriSuffix = concat( $uriSuffix, '&dateFilter=', $dateFilter )}
 {/if}
-    
+
 <script language="JavaScript" type="text/javascript">
 <!--{literal}
     // toggle block
@@ -193,45 +193,45 @@
           </div>
       </fieldset>
   </div>
-    
+
   <div {*class="feedback"*} id="search_controls">
       <fieldset>
           <legend>{'Refine your search'|i18n( 'design/ezwebin/content/search' )}</legend>
-         
+
           {def $activeFacetsCount=0}
           <ul id="active-facets-list">
           {foreach $defaultSearchFacets as $key => $defaultFacet}
               {if array_keys( $activeFacetParameters )|contains( concat( $defaultFacet['field'], ':', $defaultFacet['name']  ) )}
                   {def $facetData=$search_extras.facet_fields.$key}
-                  
-                  {foreach $facetData.nameList as $key2 => $facetName}                  
+
+                  {foreach $facetData.nameList as $key2 => $facetName}
                       {if eq( $activeFacetParameters[concat( $defaultFacet['field'], ':', $defaultFacet['name'] )], $facetName )}
                           {def $activeFacetsCount=sum( $key, 1 )}
                           {def $suffix=$uriSuffix|explode( concat( '&filter[]=', $facetData.queryLimit[$key2]|wash ) )|implode( '' )|explode( concat( '&activeFacets[', $defaultFacet['field'], ':', $defaultFacet['name'], ']=', $facetName ) )|implode( '' )}
 			              <li>
 			                  <a href={concat( $baseURI, $suffix )|ezurl}>[x]</a> <strong>{$defaultFacet['name']}</strong>: {$facetName}
-			              </li>                        
+			              </li>
                       {/if}
                   {/foreach}
-              {/if}          
+              {/if}
           {/foreach}
-          
+
           {* handle date filter here, manually for now. Should be a facet later on *}
           {if gt( $dateFilter, 0 )}
               <li>
                  {set $activeFacetsCount=$activeFacetsCount|inc}
                  {def $suffix=$uriSuffix|explode( concat( '&dateFilter=', $dateFilter ) )|implode( '' )}
                   <a href={concat( $baseURI, $suffix )|ezurl}>[x]</a> <strong>{'Creation time'|i18n( 'extension/ezfind/facets' )}</strong>: {$dateFilterLabel}
-              </li>          
+              </li>
           {/if}
-          
+
           {if ge( $activeFacetsCount, 2 )}
               <li>
                   <a href={$baseURI|ezurl}>[x]</a> <em>{'Clear all'|i18n( 'extension/ezfind/facets' )}</em>
-              </li>              
+              </li>
           {/if}
           </ul>
-          
+
           <ul id="facet-list">
           {foreach $defaultSearchFacets as $key => $defaultFacet}
 	          {if array_keys( $activeFacetParameters )|contains( concat( $defaultFacet['field'], ':', $defaultFacet['name']  ) )|not}
@@ -242,7 +242,7 @@
 	                {foreach $facetData.nameList as $key2 => $facetName}
 		                {if ne( $key2, '' )}
 		                <li>
-		                    <a href={concat( $baseURI, '&filter[]=', $facetData.queryLimit[$key2]|wash, '&activeFacets[', $defaultFacet['field'], ':', $defaultFacet['name'], ']=', $facetName, $uriSuffix )|ezurl}>                
+		                    <a href={concat( $baseURI, '&filter[]=', $facetData.queryLimit[$key2]|wash, '&activeFacets[', $defaultFacet['field'], ':', $defaultFacet['name'], ']=', $facetName, $uriSuffix )|ezurl}>
 		                    {$facetName}</a> ({$facetData.countList[$key2]})
 		                </li>
 		                {/if}
@@ -251,32 +251,32 @@
 	          </li>
 	          {/if}
           {/foreach}
-          
+
           {* date filtering here. Using a simple filter for now. Should use the date facets later on *}
           {if eq( $dateFilter, 0 )}
               <li>
                   <span {*style="background-color: #F2F1ED"*}><strong>{'Creation time'|i18n( 'extension/ezfind/facets' )}</strong></span>
                   <ul>
                     <li>
-                        <a href={concat( $baseURI, '&dateFilter=1', $uriSuffix )|ezurl}>{"Last day"|i18n("design/standard/content/search")}</a>                    
+                        <a href={concat( $baseURI, '&dateFilter=1', $uriSuffix )|ezurl}>{"Last day"|i18n("design/standard/content/search")}</a>
                     </li>
                     <li>
-                        <a href={concat( $baseURI, '&dateFilter=2', $uriSuffix )|ezurl}>{"Last week"|i18n("design/standard/content/search")}</a>                    
+                        <a href={concat( $baseURI, '&dateFilter=2', $uriSuffix )|ezurl}>{"Last week"|i18n("design/standard/content/search")}</a>
                     </li>
                     <li>
-                        <a href={concat( $baseURI, '&dateFilter=3', $uriSuffix )|ezurl}>{"Last month"|i18n("design/standard/content/search")}</a>                    
-                    </li>                    
+                        <a href={concat( $baseURI, '&dateFilter=3', $uriSuffix )|ezurl}>{"Last month"|i18n("design/standard/content/search")}</a>
+                    </li>
                     <li>
-                        <a href={concat( $baseURI, '&dateFilter=4', $uriSuffix )|ezurl}>{"Last three months"|i18n("design/standard/content/search")}</a>                    
-                    </li>                    
+                        <a href={concat( $baseURI, '&dateFilter=4', $uriSuffix )|ezurl}>{"Last three months"|i18n("design/standard/content/search")}</a>
+                    </li>
                     <li>
-                        <a href={concat( $baseURI, '&dateFilter=5', $uriSuffix )|ezurl}>{"Last year"|i18n("design/standard/content/search")}</a>                    
-                    </li>                    
+                        <a href={concat( $baseURI, '&dateFilter=5', $uriSuffix )|ezurl}>{"Last year"|i18n("design/standard/content/search")}</a>
+                    </li>
                   </ul>
-              </li>          
+              </li>
            {/if}
           </ul>
-          
+
       </fieldset>
   </div>
   {/case}
@@ -290,7 +290,7 @@
              item_count=$search_count
              view_parameters=$view_parameters
              item_limit=$page_limit}
-             
+
 	{foreach $search_result as $result
 	         sequence array(bglight,bgdark) as $bgColor}
 	   {node_view_gui view=ezfind_line sequence=$bgColor use_url_translation=$use_url_translation content_node=$result}
diff --git a/design/ezwebin/templates/page_header_searchbox.tpl b/design/ezwebin/templates/page_header_searchbox.tpl
index f9d1ab32..d26b89dd 100644
--- a/design/ezwebin/templates/page_header_searchbox.tpl
+++ b/design/ezwebin/templates/page_header_searchbox.tpl
@@ -13,7 +13,7 @@
     {if eq( $ui_context, 'browse' )}
      <input name="Mode" type="hidden" value="browse" />
     {/if}
-    
+
     {/if}
   </form>
 </div>
diff --git a/design/ezwebin/templates/parts/image/related_content.tpl b/design/ezwebin/templates/parts/image/related_content.tpl
index feb5e4d8..f025d0da 100644
--- a/design/ezwebin/templates/parts/image/related_content.tpl
+++ b/design/ezwebin/templates/parts/image/related_content.tpl
@@ -1,6 +1,6 @@
 {def $related_content=fetch( 'ezfind', 'moreLikeThis', hash( 'query_type', 'nid',
                                                              'query', $node.node_id,
-                                                             'limit', 7  
+                                                             'limit', 7
                            ))}
 {set $related_content=$related_content['SearchResult']}
 {include uri="design:parts/image/display_related_content.tpl"}
\ No newline at end of file
diff --git a/design/standard/javascript/ezajax_autocomplete.js b/design/standard/javascript/ezajax_autocomplete.js
index 7b360ce1..93f2dc7a 100644
--- a/design/standard/javascript/ezajax_autocomplete.js
+++ b/design/standard/javascript/ezajax_autocomplete.js
@@ -7,7 +7,7 @@ var eZAJAXAutoComplete = function() {
 
     /**
      * Initializes the widget
-     * 
+     *
      * @private
      */
     var initAutosuggest = function() {
@@ -32,11 +32,11 @@ var eZAJAXAutoComplete = function() {
     return {
         /**
          * The initialization of the module
-         * 
+         *
          * @param {Array}
-         *            url, 
-         *            inputid, 
-         *            containerid, 
+         *            url,
+         *            inputid,
+         *            containerid,
          *            minQueryLength,
          *            resultlimit
          */
diff --git a/design/standard/javascript/ezajaxsearch.js b/design/standard/javascript/ezajaxsearch.js
index 35583def..f9d26342 100644
--- a/design/standard/javascript/ezajaxsearch.js
+++ b/design/standard/javascript/ezajaxsearch.js
@@ -19,7 +19,7 @@ var eZAJAXSearch = function()
                     resultsTarget.addClass('loading');
 
                     var spellCheck = response.content.SearchExtras.spellcheck;
-                    // A spellcheck proposal was made, display it : 
+                    // A spellcheck proposal was made, display it :
                     if ( spellCheck && spellCheck.collation )
                     {
                         var scTemplate = ret.cfg.spellchecktemplate;
@@ -30,18 +30,18 @@ var eZAJAXSearch = function()
                     }
 
                     var facets = response.content.SearchExtras.facets;
-                    // Facets were returned, display them : 
+                    // Facets were returned, display them :
                     if ( facets && facets.length != 0 )
                     {
-                        var facetMainList = ret.cfg.facetsmainlisttemplate;                        
+                        var facetMainList = ret.cfg.facetsmainlisttemplate;
                         for( var i = 0; i < facets.length; i++ )
                         {
                             var facet = facets[i];
                             // Name of the facet :
                             var facetName = facet['name'];
-                            var facetInnerList = ret.cfg.facetsinnerlisttemplate;                            
-                            facetInnerList = facetInnerList.replace( /\{+facet_name+\}/g, facetName );                                                        
-                            
+                            var facetInnerList = ret.cfg.facetsinnerlisttemplate;
+                            facetInnerList = facetInnerList.replace( /\{+facet_name+\}/g, facetName );
+
                             if ( facet['list'].length > 0 )
                             {
                                 for( var j = 0; j < facet['list'].length; j++ )
@@ -53,7 +53,7 @@ var eZAJAXSearch = function()
                                     facetElement = facetElement.replace( /\{+link+\}/g, link );
                                     facetElement = facetElement.replace( /\{+value+\}/g, value );
                                     facetElement = facetElement.replace( /\{+count+\}/g, count );
-                                    facetInnerList = facetInnerList.replace( /\{+facet_element+\}/g, facetElement + "{facet_element}" );                                
+                                    facetInnerList = facetInnerList.replace( /\{+facet_element+\}/g, facetElement + "{facet_element}" );
                                 }
                                 facetInnerList = facetInnerList.replace( /\{+facet_element+\}/g, '' );
                                 facetMainList = facetMainList.replace( /\{+inner_facet_list+\}/g, facetInnerList + "{inner_facet_list}" );
@@ -63,29 +63,29 @@ var eZAJAXSearch = function()
                         // Only display the "Refine with facets" block if actual facets were returned.
                         if ( facetMainList != ret.cfg.facetsmainlisttemplate )
                         {
-                            facetMainList = facetMainList.replace( /\{+inner_facet_list+\}/g, "" );                            
+                            facetMainList = facetMainList.replace( /\{+inner_facet_list+\}/g, "" );
                             var facetsDiv = Y.Node.create( facetMainList );
-                            
-                            resultsTarget.appendChild( facetsDiv );                            
+
+                            resultsTarget.appendChild( facetsDiv );
                             var id = facetsDiv.get( 'id' );
                             //var width = facetsDiv.get( 'clientWidth' ) - 10; // removing horizontal padding in order to have the actual element's width
                             //var height = facetsDiv.get( 'clientHeight' ) - 10; // idem.
-                            
+
                             var myAnim = function ( Y )
                             {
                                 var anim = new Y.Anim({
                                     node: '#' + id,
                                     easing: Y.Easing.backIn,
                                     duration: 0.5,
-                                    
-                                    from: 
+
+                                    from:
                                     {
                                         /*height: 0,
                                         width: 0*/
                                         opacity: 0
                                     },
-    
-                                    to: 
+
+                                    to:
                                     {
                                         /*width: width,
                                         height: height*/
@@ -95,7 +95,7 @@ var eZAJAXSearch = function()
                                 anim.run();
                             }
                             YUI().use( 'animation', 'anim', myAnim );
-                            
+
                         }
                     }
 
@@ -205,7 +205,7 @@ var eZAJAXSearch = function()
             {
                 for ( var i = 0, l = ret.cfg.customSearchAttributes.length; i < l; i++ )
                 {
-                    data += '&' + Y.one( ret.cfg.customSearchAttributes[i] ).get('name') + '=' + Y.one( ret.cfg.customSearchAttributes[i] ).get('value'); 
+                    data += '&' + Y.one( ret.cfg.customSearchAttributes[i] ).get('name') + '=' + Y.one( ret.cfg.customSearchAttributes[i] ).get('value');
                 }
             }
 
@@ -249,6 +249,6 @@ var eZAJAXSearch = function()
     {
         var ins = YUI(YUI3_config).use('node', 'event', 'io-ez', yCallback);
     }
-    
+
     return ret;
 }();
\ No newline at end of file
diff --git a/design/standard/stylesheets/ezfind.css b/design/standard/stylesheets/ezfind.css
index fbafb408..c936497b 100644
--- a/design/standard/stylesheets/ezfind.css
+++ b/design/standard/stylesheets/ezfind.css
@@ -14,7 +14,7 @@ div#search_results
 
 ul#facet-list
 {
-	margin-left: 0;  
+	margin-left: 0;
 }
 
 ul#active-facets-list
@@ -48,7 +48,7 @@ div.ajax-search-facets
     margin-bottom: 5px;
     border: 1px solid #F0F0F0;
     font-size: 90%;
-    
+
     /* for IE */
     filter:'alpha(opacity=0)'; /* Will be faded in by the YUI animation */
     /* CSS3 standard */
diff --git a/design/standard/templates/ezfind/elevate.tpl b/design/standard/templates/ezfind/elevate.tpl
index aa2a8caa..72cf53a3 100644
--- a/design/standard/templates/ezfind/elevate.tpl
+++ b/design/standard/templates/ezfind/elevate.tpl
@@ -36,10 +36,10 @@
 {* DESIGN: Mainline *}<div class="header-mainline"></div>
 {* DESIGN: Header END *}</div></div></div></div></div></div>
 {* DESIGN: Content START *}<div class="box-bc"><div class="box-ml"><div class="box-mr"><div class="box-bl"><div class="box-br"><div class="box-content" style="padding-top: 2px;">
-   {* 
-    Feedbacks. 
+   {*
+    Feedbacks.
    *}
-   
+
    {if or( is_set( $feedback.missing_searchquery ), is_set( $feedback.missing_object ) )}
        <div class="message-warning">
        <h2><span class="time">[{currentdate()|l10n( shortdatetime )}]</span>
@@ -52,7 +52,7 @@
        </h2>
        </div>
    {/if}
-   
+
    {if is_set( $feedback.missing_language )}
        <div class="message-warning">
        <h2><span class="time">[{currentdate()|l10n( shortdatetime )}]</span>
@@ -60,7 +60,7 @@
        </h2>
        </div>
    {/if}
-   
+
    {if is_set( $feedback.creation_ok )}
        <div class="message-feedback">
        <h2><span class="time">[{currentdate()|l10n( shortdatetime )}]</span>
@@ -85,7 +85,7 @@
         </h2>
         </div>
     {/if}
-        
+
     {* Synchronise configuration witih Solr *}
     <div class="block">
         {'Synchronise Elevate configuration with Solr'|i18n( 'extension/ezfind/elevate' )}
@@ -118,18 +118,18 @@
            <input type="text" id="ezfind-elevate-searchquery" name="ezfind-elevate-searchquery" size="15" value="" title="{'Search query to elevate the object for.'|i18n( 'extension/ezfind/elevate' )}"/>&nbsp;
            <input class="button" type="submit" name="ezfind-elevate-browseforobject" value="{'Elevate object'|i18n( 'extension/ezfind/elevate' )}" title="{'Browse for the object to associate elevation to.'|i18n( 'extension/ezfind/elevate' )}"/>
        {else}
-           {'Elevate %objectlink with &nbsp;  %searchquery &nbsp;  for language:'|i18n( 'extension/ezfind/elevate', '', 
+           {'Elevate %objectlink with &nbsp;  %searchquery &nbsp;  for language:'|i18n( 'extension/ezfind/elevate', '',
                                                                                         hash( '%objectlink',  concat( '<a href=', $elevatedObject.main_node.url_alias|ezurl, '>', $elevatedObject.main_node.name, '</a>' ),
                                                                                               '%searchquery', concat( '<input type="text" name="ezfind-elevate-searchquery" size="15" value="', $elevateSearchQuery|wash, '" title="', 'Search query to elevate the object for.'|i18n( 'extension/ezfind/elevate' ) , '"/>' ) ))}
-                                                                                                              
+
             <select name="ezfind-elevate-language">
                    <option value="{$language_wildcard}">{'All'|i18n( 'extension/ezfind/elevate' )}</option>
                    {foreach $elevatedObject.languages as $lang}
                        <option value="{$lang.locale}">{$lang.name}</option>
                    {/foreach}
-            </select>     
-            
-            <input type="hidden" name="elevateObjectID" value="{$elevatedObject.id}">            
+            </select>
+
+            <input type="hidden" name="elevateObjectID" value="{$elevatedObject.id}">
             <input class="button" type="submit" name="ezfind-elevate-do" value="{'Elevate'|i18n( 'extension/ezfind/elevate' )}" title="{'Store elevation'|i18n( 'extension/ezfind/elevate' )}"/>
             <input class="button" type="submit" name="ezfind-elevate-cancel" value="{'Cancel'|i18n( 'extension/ezfind/elevate' )}" title="{'Cancel elevation'|i18n( 'extension/ezfind/elevate' )}"/>
        {/if}
@@ -161,9 +161,9 @@
         <input type="text" id="ezfind-searchelevateconfigurations-searchquery" name="ezfind-searchelevateconfigurations-searchquery" size="15" value="{if is_set( $view_parameters.search_query )}{$view_parameters.search_query}{/if}" title="{'Search query to elevate the object for.'|i18n( 'extension/ezfind/elevate' )}" />
         </label>
     </div>
-    
+
     <div class="button-left">
-        <label style="display: inline; font-weight:normal;">{'Language'|i18n( 'extension/ezfind/elevate' )}:        
+        <label style="display: inline; font-weight:normal;">{'Language'|i18n( 'extension/ezfind/elevate' )}:
         <select name="ezfind-searchelevateconfigurations-language" title="{'Select a translation to narrow down the search.'|i18n( 'extension/ezfind/elevate' )}">
            <option value="{$language_wildcard}" {if is_set( $view_parameters.language )|not}selected="selected"{/if} >{'All'|i18n( 'extension/ezfind/elevate' )}</option>
            {foreach $available_translations as $translation}
@@ -172,13 +172,13 @@
         </select>
         </label>
     </div>
-    
+
     <div class="button-left">
         <label for="ezfind-searchelevateconfigurations-fuzzy" style="display: inline; font-weight:normal;">{'Fuzzy match'|i18n( 'extension/ezfind/elevate' )}:
         <input type="checkbox" id="ezfind-searchelevateconfigurations-fuzzy" name="ezfind-searchelevateconfigurations-fuzzy" {if is_set( $view_parameters.fuzzy_filter )}checked="checked"{/if} title="{'Fuzzy match on the search query.'|i18n( 'extension/ezfind/elevate' )}"/>
         </label>
     </div>
-    
+
     <div class="button-left">
        <input class="button" type="submit" name="ezfind-searchelevateconfigurations-do" value="{'Filter'|i18n( 'extension/ezfind/elevate' )}" title="{'Find elevate configurations matching the search query entered.'|i18n( 'extension/ezfind/elevate' )}"/>
     </div>
@@ -188,7 +188,7 @@
 </div>
 <div class="block">
     <fieldset>
-       <legend>{'By object'|i18n( 'extension/ezfind/elevate' )}</legend>       
+       <legend>{'By object'|i18n( 'extension/ezfind/elevate' )}</legend>
        <input class="button" type="submit" name="ezfind-searchelevateconfigurations-browse" value="{'Browse'|i18n( 'extension/ezfind/elevate' )}" title="{'Find elevate configurations matching the search query entered.'|i18n( 'extension/ezfind/elevate' )}"/>
    </fieldset>
 </div>
@@ -202,7 +202,7 @@
      $params = hash( 'offset', $view_parameters.offset,
                      'limit',  $limit )
      $paramsForCount = hash( 'countOnly', true() )}
-     
+
 {* Searching for elevate configurations for a given search query, alter the fetch parameters *}
 {if is_set( $view_parameters.search_query )}
 
@@ -210,7 +210,7 @@
     {if is_set( $view_parameters.fuzzy_filter )}
         {set $searchQueryHash = $searchQueryHash|merge( hash( 'fuzzy', true() ) )}
     {/if}
-    
+
     {set $params = $params|merge( hash( 'searchQuery', $searchQueryHash ) )}
     {set $paramsForCount = $paramsForCount|merge( hash( 'searchQuery', $searchQueryHash ) )}
 {/if}
@@ -233,11 +233,11 @@
         <span style="color: orange;">
         {'Objects elevated by "%search_query"'|i18n( 'extension/ezfind/elevate', '', hash( '%search_query', $view_parameters.search_query ) )}
         {if is_set( $view_parameters.fuzzy_filter )}
-            ({'fuzzy match'|i18n( 'extension/ezfind/elevate' )})        
+            ({'fuzzy match'|i18n( 'extension/ezfind/elevate' )})
         {/if}
         </span>
     {else}
-        {'Existing configurations'|i18n( 'extension/ezfind/elevate' )}    
+        {'Existing configurations'|i18n( 'extension/ezfind/elevate' )}
     {/if}
 </h2>
 
@@ -286,7 +286,7 @@
         <tr class="bgdark">
             <th>{'Content object'|i18n( 'extension/ezfind/elevate' )}</th>
             <th>{'Actions'|i18n( 'extension/ezfind/elevate' )}</th>
-        </tr>  
+        </tr>
         {foreach $configurations as $object sequence array( 'bglight', 'bgdark' ) as $tdClass }
            <tr class="{$tdClass}">
            <td>
@@ -295,14 +295,14 @@
            <td width="10%">
               {if is_set( $view_parameters.fuzzy_filter )}
                    <a href={concat( '/ezfind/elevation_detail/', $object.id, '/(search_query)/', $view_parameters.search_query, '/(fuzzy_filter)/', $view_parameters.fuzzy_filter )|ezurl} title="{'See elevate configuration details for \'%objectName\''|i18n( 'extension/ezfind/elevate', '', hash( '%objectName', $object.name ) )}"><img src={'edit.gif'|ezimage} /></a>
-                   <a href={concat( '/ezfind/elevation_detail/', $object.id, '/(search_query)/', $view_parameters.search_query, '/(fuzzy_filter)/', $view_parameters.fuzzy_filter )|ezurl} title="{'Remove elevation by \'%searchQuery\' for \'%objectName\'.'|i18n( 'extension/ezfind/elevate', '', hash( '%objectName', $object.name, '%searchQuery', $view_parameters.search_query ) )}"><img src={'trash-icon-16x16.gif'|ezimage} /></a>                   
+                   <a href={concat( '/ezfind/elevation_detail/', $object.id, '/(search_query)/', $view_parameters.search_query, '/(fuzzy_filter)/', $view_parameters.fuzzy_filter )|ezurl} title="{'Remove elevation by \'%searchQuery\' for \'%objectName\'.'|i18n( 'extension/ezfind/elevate', '', hash( '%objectName', $object.name, '%searchQuery', $view_parameters.search_query ) )}"><img src={'trash-icon-16x16.gif'|ezimage} /></a>
                {else}
                   <a href={concat( '/ezfind/elevation_detail/', $object.id, '/(search_query)/', $view_parameters.search_query )|ezurl} title="{'See elevate configuration details for \'%objectName\''|i18n( 'extension/ezfind/elevate', '', hash( '%objectName', $object.name ) )}"><img src={'edit.gif'|ezimage} /></a>
-                  <a href={concat( '/ezfind/remove_elevation/', $object.id, '/', $view_parameters.search_query )|ezurl} title="{'Remove elevation by \'%searchQuery\' for \'%objectName\'.'|i18n( 'extension/ezfind/elevate', '', hash( '%objectName', $object.name, '%searchQuery', $view_parameters.search_query ) )}"><img src={'trash-icon-16x16.gif'|ezimage} /></a>               
-               {/if}              
-           </td>           
+                  <a href={concat( '/ezfind/remove_elevation/', $object.id, '/', $view_parameters.search_query )|ezurl} title="{'Remove elevation by \'%searchQuery\' for \'%objectName\'.'|i18n( 'extension/ezfind/elevate', '', hash( '%objectName', $object.name, '%searchQuery', $view_parameters.search_query ) )}"><img src={'trash-icon-16x16.gif'|ezimage} /></a>
+               {/if}
+           </td>
            </tr>
-        {/foreach} 
+        {/foreach}
    {else}
        <tr class="bgdark">
            <th>{'Search query'|i18n( 'extension/ezfind/elevate' )}</th>
@@ -310,7 +310,7 @@
            <th>{'Language'|i18n( 'extension/ezfind/elevate' )}</th>
            <th>{'Actions'|i18n( 'extension/ezfind/elevate' )}</th>
        </tr>
-       
+
        {def $tmp_obj=false()}
        {foreach $configurations as $conf sequence array( 'bglight', 'bgdark' ) as $tdClass }
           {set $tmp_obj=fetch( 'content', 'object', hash( 'object_id', $conf.contentobject_id ) )}
@@ -328,12 +328,12 @@
                  <a href={concat( '/ezfind/elevation_detail/', $tmp_obj.id )|ezurl} title="{'See elevate configuration details for \'%objectName\''|i18n( 'extension/ezfind/elevate', '', hash( '%objectName', $tmp_obj.name ) )}"><img alt="{'Edit'|i18n( 'extension/ezfind/elevate' )}" src={'edit.gif'|ezimage} /></a>
                   <a href={concat( '/ezfind/remove_elevation/', $tmp_obj.id, '/', $conf.search_query, '/', $conf.language_code )|ezurl} title="{'Remove elevation by \'%searchQuery\' for \'%objectName\'.'|i18n( 'extension/ezfind/elevate', '', hash( '%objectName', $tmp_obj.name, '%searchQuery', $conf.search_query ) )}"><img alt="{'Trash'|i18n( 'extension/ezfind/elevate' )}" src={'trash-icon-16x16.gif'|ezimage} /></a>
               </td>
-          </tr>        
+          </tr>
        {/foreach}
    {/if}
     </table>
-        
-    
+
+
    <div class="context-toolbar">
    {include name=navigator
             uri='design:navigator/alphabetical.tpl'
diff --git a/design/standard/templates/ezfind/elevation_detail.tpl b/design/standard/templates/ezfind/elevation_detail.tpl
index adcbffa0..a6784664 100644
--- a/design/standard/templates/ezfind/elevation_detail.tpl
+++ b/design/standard/templates/ezfind/elevation_detail.tpl
@@ -7,8 +7,8 @@
 {* DESIGN: Mainline *}<div class="header-mainline"></div>
 {* DESIGN: Header END *}</div></div></div></div></div></div>
 {* DESIGN: Content START *}<div class="box-bc"><div class="box-ml"><div class="box-mr"><div class="box-bl"><div class="box-br"><div class="box-content" style="padding-top: 2px;">
-   {* 
-    Feedbacks. 
+   {*
+    Feedbacks.
    *}
     {if is_set( $feedback.missing_object )}
        <div class="message-warning">
@@ -53,7 +53,7 @@
                    {foreach $elevatedObject.languages as $lang}
                        <option value="{$lang.locale}">{$lang.name}</option>
                    {/foreach}
-            </select>     
+            </select>
             </label>
         </div>
         <div class="button-left">
@@ -76,8 +76,8 @@
     {if is_set( $view_parameters.language )}{'in %selectedLanguage'|i18n( 'extension/ezfind/elevate', '', hash( '%selectedLanguage', $selectedLocale.name ))}{/if}
     {if is_set( $view_parameters.search_query )}{'containing \'%searchQuery\''|i18n( 'extension/ezfind/elevate', '', hash( '%searchQuery', $view_parameters.search_query ))}{/if}
     {if is_set( $view_parameters.fuzzy_filter )}
-        ({'fuzzy match'|i18n( 'extension/ezfind/elevate' )})        
-    {/if}        
+        ({'fuzzy match'|i18n( 'extension/ezfind/elevate' )})
+    {/if}
 </h2>
 
 {* DESIGN: Mainline *}<div class="header-subline"></div>
@@ -126,7 +126,7 @@
        <th>{'Language'|i18n( 'extension/ezfind/elevate' )}</th>
        <th>{'Actions'|i18n( 'extension/ezfind/elevate' )}</th>
    </tr>
-   
+
    {foreach $configurations as $conf sequence array( 'bglight', 'bgdark' ) as $tdClass }
       <tr class="{$tdClass}">
            <td><a href={concat( $baseurl, '/(search_query)/', $conf.search_query )|ezurl} title="{'See all objects elevated by \'%searchQuery\''|i18n( 'extension/ezfind/elevate', '', hash( '%searchQuery', $conf.search_query ) )}">{$conf.search_query}</a></td>
@@ -139,11 +139,11 @@
           </td>
            <td width="10%">
               <a href={concat( '/ezfind/remove_elevation/', $elevatedObject.id, '/', $conf.search_query, '/', $conf.language_code )|ezurl} title="{'Remove elevation by \'%searchQuery\' for \'%objectName\'.'|i18n( 'extension/ezfind/elevate', '', hash( '%objectName', $elevatedObject.name, '%searchQuery', $conf.search_query ) )}"><img alt="{'Trash'|i18n( 'extension/ezfind/elevate' )}" src={'trash-icon-16x16.gif'|ezimage} /></a>
-           </td>          
-      </tr>        
+           </td>
+      </tr>
    {/foreach}
     </table>
-    
+
    <div class="context-toolbar">
    {include name=navigator
             uri='design:navigator/alphabetical.tpl'
@@ -180,11 +180,11 @@
 
     <div class="button-left">
     <label for="ezfind-elevationdetail-filter-fuzzy" style="display: inline;">{'Fuzzy match'|i18n( 'extension/ezfind/elevate' )}:
-    <input type="checkbox" id="ezfind-elevationdetail-filter-fuzzy" name="ezfind-elevationdetail-filter-fuzzy" {if is_set( $view_parameters.fuzzy_filter )}checked="checked"{/if} title="{'Fuzzy match on the search query.'|i18n( 'extension/ezfind/elevate' )}"/>&nbsp;    
+    <input type="checkbox" id="ezfind-elevationdetail-filter-fuzzy" name="ezfind-elevationdetail-filter-fuzzy" {if is_set( $view_parameters.fuzzy_filter )}checked="checked"{/if} title="{'Fuzzy match on the search query.'|i18n( 'extension/ezfind/elevate' )}"/>&nbsp;
     </label>
     <input class="button" type="submit" name="ezfind-elevationdetail-filter-do" value="{'Filter'|i18n( 'extension/ezfind/elevate' )}" title="{'Filter configurations by language'|i18n( 'extension/ezfind/elevate' )}"/>
     </div>
-    
+
     <div class="break"></div>
 </div>
 
diff --git a/design/standard/templates/ezfind/remove_elevation.tpl b/design/standard/templates/ezfind/remove_elevation.tpl
index 49d24e34..df0e2831 100644
--- a/design/standard/templates/ezfind/remove_elevation.tpl
+++ b/design/standard/templates/ezfind/remove_elevation.tpl
@@ -5,9 +5,9 @@
 {if is_set( $feedback.removal_back_link )}
     {"Removal confirmed ( for %objectName ) :"|i18n( 'extension/ezfind/elevate', '', hash( '%objectName', concat( '<a href=', $elevatedObject.main_node.url_alias|ezurl, '>', $elevatedObject.name, '</a>' ) ) )}
 {else}
-   {"Confirm removal of the following Elevate configuration ( for %objectName ) :"|i18n( 'extension/ezfind/elevate', '', 
+   {"Confirm removal of the following Elevate configuration ( for %objectName ) :"|i18n( 'extension/ezfind/elevate', '',
                                                                                          hash( '%objectName', concat( '<a href=', $elevatedObject.main_node.url_alias|ezurl, '>', $elevatedObject.name, '</a>' ) ) )}
-{/if}                                                                                      
+{/if}
 </h1>
 {* DESIGN: Mainline *}<div class="header-mainline"></div>
 {* DESIGN: Header END *}</div></div></div></div></div></div>
@@ -32,7 +32,7 @@
                {$feedback.confirm_remove.language_code}
             {/if}
         </td>
-    </tr> 
+    </tr>
 </table>
 
 {* DESIGN: Content END *}</div></div></div>{* </div></div> *}</div>
@@ -44,7 +44,7 @@
     {else}
        <input class="button" type="submit" name="ezfind-removeelevation-do" value="{'Remove'|i18n( 'extension/ezfind/elevate' )}" title="{'Confirm removal of the elevate configuration'|i18n( 'extension/ezfind/elevate' )}"/>
        <input class="button" type="submit" name="ezfind-removeelevation-cancel" value="{'Cancel'|i18n( 'extension/ezfind/elevate' )}" title="{'Cancel removal of the elevate configuration'|i18n( 'extension/ezfind/elevate' )}"/>
-    {/if}    
+    {/if}
 </div>
 
 </form>
diff --git a/doc/INSTALL.txt b/doc/INSTALL.txt
index 2f568948..df537a06 100755
--- a/doc/INSTALL.txt
+++ b/doc/INSTALL.txt
@@ -8,7 +8,7 @@ Requirements:
 
 
 Installing:
-1. Extract the ezfind extension, and place it in the extensions folder. 
+1. Extract the ezfind extension, and place it in the extensions folder.
 
 2a. For small sites: use a regular java 1.5 JRE from Sun
    Start the Java based search engine ( based on Solr ).
@@ -23,16 +23,16 @@ Installing:
    you need to use some extra parameters for java too, the following is recommended for typical sites:
    java -server -d64 -Xmx1500m -Xms1500m -XX:+UseParallelGC -XX:+AggressiveOpts -XX:NewRatio=5 -jar start.jar
 
-   This will: make sure the Java VM is started with 64 bit mode, 
+   This will: make sure the Java VM is started with 64 bit mode,
    allocate a heap space of 1500MB which is used for Solr caches and objects,
    the rest of the options are related to garbage collection
 
 3. Enable the extension in eZ Publish. Do this by opening settings/override/site.ini.append.php ,
    and add in the [ExtensionSettings] block:
    ActiveExtensions[]=ezfind
-   To get the correct templates for ezwebin, and for all ezfind features to be available, 
-   ezfind must be enabled before the ezwebin and ezflow extensions. The final result must follow the following principle : 
-   
+   To get the correct templates for ezwebin, and for all ezfind features to be available,
+   ezfind must be enabled before the ezwebin and ezflow extensions. The final result must follow the following principle :
+
      [ExtensionSettings]
      ActiveExtensions[]=ezfind
      ActiveExtensions[]=ezwebin
@@ -40,12 +40,12 @@ Installing:
 
 4. Update the class autoloads by running the script: php bin/php/ezpgenerateautoloads.php
 
-5. Add a table in the database used by your eZ Publish instance. You can do so as follows 
+5. Add a table in the database used by your eZ Publish instance. You can do so as follows
    ( from eZ Publish's root directory ), in the case you are using MySQL:
-   
+
    $> mysql -u <user> -p <database_name> < extension/ezfind/sql/mysql/schema.sql
-   
-   The procedure is very similar in case you are using another RDMS. You may want to have a look at the 
+
+   The procedure is very similar in case you are using another RDMS. You may want to have a look at the
    sql/oracle and sql/postgresql for Oracle and PostgreSQL databases respectively.
    Please refer to the documentation reference for your DBMS if you are experiencing issues.
 
@@ -75,7 +75,7 @@ Configuration:
 
 
 Running as service:
-It is possible to run eZ Find as a service in Linux. The scripts to do this are located in 
+It is possible to run eZ Find as a service in Linux. The scripts to do this are located in
 extension/ezfind/bin/scripts/<dist>. The supported distributions are Debian and RHEL ( including CentOS, Fedora,
 Mandriva and other RedHat based distributions )
 Open the script for your distribution to see installations instructions.
diff --git a/doc/design/2.0/facets.txt b/doc/design/2.0/facets.txt
index 84378b85..b1510c90 100644
--- a/doc/design/2.0/facets.txt
+++ b/doc/design/2.0/facets.txt
@@ -1,8 +1,8 @@
 eZ Find - Facets, Design
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 :Author:   Kåre Køhler Høvik
-:Revision: 
-:Date:     
+:Revision:
+:Date:
 
 
 Introduction
@@ -11,11 +11,11 @@ Introduction
 Description
 -----------
 
-The primary use for faceting is drilldown into a subset of hits resulting from 
-a query. The chosen facet value is used to construct a filter query which 
+The primary use for faceting is drilldown into a subset of hits resulting from
+a query. The chosen facet value is used to construct a filter query which
 literally matches that value in the index.
 
-This must be as easy as possible to set up for developers, meaning it should 
+This must be as easy as possible to set up for developers, meaning it should
 be controlled from the design templates. If no facets are defined, class will
 be used.
 
@@ -23,8 +23,8 @@ be used.
 Design
 ======
 
-An eZ Publish specific query builder should be buildt as part of this feature. 
-The query builder should be based on the code in 
+An eZ Publish specific query builder should be buildt as part of this feature.
+The query builder should be based on the code in
 extension/ezfind/search/plugins/ezsolr/ezsolr.php , but include a more general
 interface.
 
@@ -44,18 +44,18 @@ facet.field - Specifies a specific field which should work as a facet. This is
               - translation - Translation.
 facet.prefix - Limits the facet fields to only list facets where the field value
                starts with <facet.prefix>
-facet.sort - Sort by 'count' or 'alpha'. 'alpha' will sort the facet results by 
+facet.sort - Sort by 'count' or 'alpha'. 'alpha' will sort the facet results by
              field value, alpha-numerical.
 facet.limit - Maximum number of facets. Default value is 20.
 facet.offset - Offset, default value 0.
 facet.mincount - Return only facets with more results than <facet.mincount>.
                  Default value 0.
-facet.missing - If set to true, the facet count will include empty results. 
+facet.missing - If set to true, the facet count will include empty results.
                 Default value false.
-facet.date.start - Start date for facet.  
-facet.date.end - End date for facet.  
-facet.date.gap - Size of date range.  
-facet.date.hardend - See [1].  
+facet.date.start - Start date for facet.
+facet.date.end - End date for facet.
+facet.date.gap - Size of date range.
+facet.date.hardend - See [1].
 facet.date.other - See [1].
 
 One query may include multiple facets. This is supported by using nested arrays.
diff --git a/doc/design/2.0/native_types.txt b/doc/design/2.0/native_types.txt
index 9fcda2bb..4111dace 100644
--- a/doc/design/2.0/native_types.txt
+++ b/doc/design/2.0/native_types.txt
@@ -1,8 +1,8 @@
 eZ Find - Authentication, Design
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 :Author:   Kåre Køhler Høvik
-:Revision: 
-:Date:     
+:Revision:
+:Date:
 
 
 Introduction
@@ -11,8 +11,8 @@ Introduction
 Description
 -----------
 
-All content indexed in eZ Find today is index as strings. This limits both the 
-quality of the search result, and possibilities of the search. To enhance the 
+All content indexed in eZ Find today is index as strings. This limits both the
+quality of the search result, and possibilities of the search. To enhance the
 search functionality, native datatypes should be used where possible.
 
 
@@ -24,7 +24,7 @@ Classes
 
 ezfSolrDocumentFieldBase
 ^^^^^^^^^^^^^^^^^^^^^^^^
-Default class  defining functions needed to extract data needed for the 
+Default class  defining functions needed to extract data needed for the
 indexing process.
 
 
@@ -34,14 +34,14 @@ Implementation
 ezfSolrDocumentFieldBase
 ------------------------
 
-Default Document field class containing the required functions for accessing the 
-data to index a document field. 
+Default Document field class containing the required functions for accessing the
+data to index a document field.
 Functions:
 
 getData()
 Returns the data to index. Return type is a hash , format <field_name> =>
 <value>. The solr document might specify a prefix which should be used for the
-field name. 
+field name.
 
 getCollectionData()
 Return collection list. Returns empty array if isCollection() is false.
@@ -70,9 +70,9 @@ Defining the field types are done 2 ways.
   Map[ezinteger]=sint
   etc..
 * Custom data types may extend the ezfSolrDocumentFieldBase class. This may be
-done to achive propper mapping of data to the Solr index. Loading 
-ezfSolrDocumentFieldBase sub-classes should be ini based. An ini file will 
-define custom eZContentObjectAttribute->attribute( 'data_type_string' ) to 
+done to achive propper mapping of data to the Solr index. Loading
+ezfSolrDocumentFieldBase sub-classes should be ini based. An ini file will
+define custom eZContentObjectAttribute->attribute( 'data_type_string' ) to
 ezfSolrDocumentFieldBase sub-class mapping. ezfSolrDocumentFieldBase
 sub- classes will be loaded using the eZExtension::findExtensionType() function
 to load the requested plugin.
diff --git a/doc/design/2.0/sorting.txt b/doc/design/2.0/sorting.txt
index fec69618..9b4d75ee 100644
--- a/doc/design/2.0/sorting.txt
+++ b/doc/design/2.0/sorting.txt
@@ -1,8 +1,8 @@
 eZ Find - Search, Design
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 :Author:   Kåre Køhler Høvik
-:Revision: 
-:Date:     
+:Revision:
+:Date:
 
 
 Introduction
@@ -34,7 +34,7 @@ Sort order are:
 - asc
 - desc
 
-Examples: 
+Examples:
 - fetch( ezfind, search, hash( 'query', 'eZ Publish',
                                'sort_by', array( 'modified', 'asc' ) ) )
 - fetch( ezfind, search, hash( 'query', 'eZ Publish',
@@ -46,7 +46,7 @@ Examples:
                                'sort_by', array( 'class_name', 'asc',
                                                  'created', 'desc' ) ) )
 
-The implementation will be done by extending the functionality in 
+The implementation will be done by extending the functionality in
 ezfeZPSolrQueryBuilder.
 
 
diff --git a/doc/design/2.1/elevate_support.rst.txt b/doc/design/2.1/elevate_support.rst.txt
index c7e573b5..bda2bb69 100644
--- a/doc/design/2.1/elevate_support.rst.txt
+++ b/doc/design/2.1/elevate_support.rst.txt
@@ -19,8 +19,8 @@ Add elevate support to eZ Find. Read this for low-level info about how it is
 supported in Solr : [1_].
 
 Excerpt :
- "The QueryElevationComponent enables you to configure the top results for a 
- given query regardless of the normal lucene scoring. This component matches 
+ "The QueryElevationComponent enables you to configure the top results for a
+ given query regardless of the normal lucene scoring. This component matches
  the user query text to a configured Map of top results."
 
 
@@ -84,7 +84,7 @@ Syncing
 '''''''
 
 Solr uses an XML configuration file ( elevate.xml ). A few constraints increase
-the difficulty-level of this task : 
+the difficulty-level of this task :
 
 1. Solr can be running on a different machine than the one running eZ Publish
 2. Solr needs to be relaunched for the new configuration to be loaded.
@@ -99,8 +99,8 @@ A direct update of the local configuration file. Constraints :
 
 **Phase 2**
 
-A solution satisfying point 1. above shall be implemented : pushing the configuration in Solr through ReST. 
-This implies developing a custom requestHandler in Solr, taking as input the updated elevate.xml file ( POST ), 
+A solution satisfying point 1. above shall be implemented : pushing the configuration in Solr through ReST.
+This implies developing a custom requestHandler in Solr, taking as input the updated elevate.xml file ( POST ),
 replacing it, and reloading the configuration. Possible security issue here. Low impact.
 
 Another solution based on rsync was envisaged at some point. Due to the utility
@@ -133,11 +133,11 @@ Datatypes :
 * language_code : VARCHAR(20) ( like in ezcontentobject_attribute )
 
 
-Primary key : 
+Primary key :
 
 * search_query + contentobject_id + language_code
 
-Indices : 
+Indices :
 
 * search_query
 * more indeces shall be added if the performances are not satisfactory.
@@ -169,13 +169,13 @@ reload the elevate configuration will be implemented.
 
 **Phase 2**
 
-If elevate.xml is stored in the configuration directory, a manual relaunch of Solr is required. 
+If elevate.xml is stored in the configuration directory, a manual relaunch of Solr is required.
 An existing core admin request handler seems to be existing ( [3_] ). It would
 allow for an automatic config reload without interrupting the service at all.
 The folowing modifications would be required in order to be able to use the
-core administration : 
+core administration :
 
-1. Add a multicore configuration file ``ezfind/java/solr/solr.xml``, containing for instance 
+1. Add a multicore configuration file ``ezfind/java/solr/solr.xml``, containing for instance
 
 ::
 
@@ -190,17 +190,17 @@ core administration :
 2. Append the name of the solr core to ``solr.ini[SolrBase].SearchServerURI``
    as well as in the default parameter value in ``eZSolrBase::eZSolrBase(..)`` :
 
-:: 
- 
+::
+
  http://localhost:8983/solr/ezfind/
 
-3. Here is a code snippet which actually reloads a Solr core : 
+3. Here is a code snippet which actually reloads a Solr core :
 
 ::
 
    $solr = new eZSolrBase( 'http://localhost:8983/solr/' );
    $params = array( 'fake' => 'param' );
-   $solr->rawSolrRequest( 'admin/cores?action=RELOAD&core=ezfind', $params ); 
+   $solr->rawSolrRequest( 'admin/cores?action=RELOAD&core=ezfind', $params );
 
 
 Possible security here ( DOS / relatively low impact ).
@@ -236,7 +236,7 @@ The following functions should be accessible through the GUI :
 
 **Ideas**
 
-* Smoothen the ergonomy with ajax-based actions : 
+* Smoothen the ergonomy with ajax-based actions :
 
   - search field to retrieve an object. Re-use the one used in eZFlow ?
   - autocomplete on the Search query field
@@ -263,14 +263,14 @@ Known issues
 ============
 
 * If an object has been elevated for 'all' languages, and one adds a translation to it, the configuration must be synchonized.
-  Possible workarounds :  
+  Possible workarounds :
   - post publish workflow, doing the job.
   - have a cronjob synchronize the configuration regularly
 
 
 References
 ==========
-.. _1: 
+.. _1:
 
 [1]: http://wiki.apache.org/solr/QueryElevationComponent
 
diff --git a/doc/design/2.1/enhanced_multilanguage_support.rst.txt b/doc/design/2.1/enhanced_multilanguage_support.rst.txt
index 0364f621..ce989c29 100644
--- a/doc/design/2.1/enhanced_multilanguage_support.rst.txt
+++ b/doc/design/2.1/enhanced_multilanguage_support.rst.txt
@@ -31,11 +31,11 @@ Solr's configuration is centralized in the two main files :
 containing, among other, the <fieldType> definitions, with, for each of them,
 the list of <analyzer>s and <filter>s. These 2 elements may contain semantic
 processing, which are currently not applied per-language, by design.
-Having the possibility to have per-language processing would let us : 
+Having the possibility to have per-language processing would let us :
 
 * increase the built-in Spellcheck's relevancy
 * use synonyms list per language
-* use stopwords list per language 
+* use stopwords list per language
 
 Any per-language customization shall increase the global relevancy of Solr as
 search engine for eZ Publish. This is made possible through having several
@@ -69,7 +69,7 @@ through one single, dedicated core.
 
 Updating and querying through language-cores
 ''''''''''''''''''''''''''''''''''''''''''''
-**Issue** : 
+**Issue** :
 
 How to search several cores simultaneously? This would happen when search results
 localization must match the site.ini[RegionalSettings].SiteLanguageList[] ( when
diff --git a/doc/design/2.1/subattribute-filtering.txt b/doc/design/2.1/subattribute-filtering.txt
index 718ed957..b940f054 100644
--- a/doc/design/2.1/subattribute-filtering.txt
+++ b/doc/design/2.1/subattribute-filtering.txt
@@ -45,16 +45,16 @@ ISSUES
 Depth level
 -----------
 This issue typically arises for object relation attributes. An attribute may have subattributes, which in turn have subattributes.
-Should the depth level be configurable ? 
+Should the depth level be configurable ?
 Should it be set to 1, period ?
-Having it higher than 1 may decrease search relevancy at all, except if boosting is correctly handled. 
+Having it higher than 1 may decrease search relevancy at all, except if boosting is correctly handled.
 Example :
-A -- ( is related to ) --> B -- ( is related to ) --> C -- ( is related to ) --> D 
+A -- ( is related to ) --> B -- ( is related to ) --> C -- ( is related to ) --> D
 Only D out of the 4 objects contains the text 'eZ Systems'. Searching for 'eZ Systems' in full text mode will return A too
 while A is semantically far away from D. It could be possible to not copy the
 subattributes in the default search field, making them *not* available in full
 text search, but making them available in filtered searches (
-objectA/attributeB/attributeC:blah ) 
+objectA/attributeB/attributeC:blah )
 
 
 Languages
@@ -93,7 +93,7 @@ issue in this specific case. In other cases ( 'ezobjectrelation' or
 subattribute field names must be created. Its volume is the sum of all field
 sets, a field set being all attributes of a content class.
 
-An optimization of this calculation could be to infer from the 'ezcontentobject_link' table 
+An optimization of this calculation could be to infer from the 'ezcontentobject_link' table
 which content classes are actually "related" to another one.
 
 
@@ -101,7 +101,7 @@ DESIGN NOTES
 ============
 Ideas
 -----
-* Fields are currently prefixed by : 
+* Fields are currently prefixed by :
   - attr_
   - meta_
   Adding a new prefix for subattributes ( 'subattr_' ) could allow
diff --git a/doc/design/2.2/multi-lingual-improvements-with-multi-core.txt b/doc/design/2.2/multi-lingual-improvements-with-multi-core.txt
index 84fca431..bff1544c 100644
--- a/doc/design/2.2/multi-lingual-improvements-with-multi-core.txt
+++ b/doc/design/2.2/multi-lingual-improvements-with-multi-core.txt
@@ -85,7 +85,7 @@ In order to make it possible to direct indexings to the appropriate language
 core, a new property is added to eZSolrDoc::
 
     eZSolrDoc::languageCode
-    
+
 This property is filled when a new eZSolrDoc is created, so that when indexing,
 we can easily determine what language the doc is in.
 
@@ -101,7 +101,7 @@ eZSolrBase
 Added: pushElevateConfiguration
 '''''''''''''''''''''''''''''''
 Since elevate isn't supported in a multi-core environnement, this method has
-been added so that it can be overriden in eZSolrBaseMultiCore. It is just an 
+been added so that it can be overriden in eZSolrBaseMultiCore. It is just an
 abstract version of the previous raw code from elevate.
 
 Searching over multiple cores
diff --git a/doc/multicore-HOWTO.txt b/doc/multicore-HOWTO.txt
index 40cb7bbe..3dab21c2 100644
--- a/doc/multicore-HOWTO.txt
+++ b/doc/multicore-HOWTO.txt
@@ -39,7 +39,7 @@ the target locale name::
 
     $ezroot: cd extension/ezfind/java/solr.multicore
     $solr.multicore: cp -rp eng-GB nor-NO
-    
+
 2) edit solr.multicore/solr.xml and add the newly created core here::
 
     <core name="eng-GB" instanceDir="eng-GB" />
@@ -50,7 +50,7 @@ it will handle, and will perform language specific analysis. To do so, edit
 the conf/schema.xml file located in this particular core::
 
     extension/ezfind/java/solr.multicore/nor-NO/conf/schema.xml
-    
+
 In this file, you will find multiple occurences of 'English' (if you've used
 eng-GB as the source). All of these will be attributes of a 'filter' XML element.
 Edit these, and replace 'English' with your language. The list of supported
@@ -63,6 +63,6 @@ Tips
 ====
 To access the solr backoffice, you must use the URI specified in solr.xml::
     http://localhost:8983/solr/admin/cores
-    
+
 This will give you an overview of the solr configuration, as well as a direct
 access to each core's admin.
\ No newline at end of file
diff --git a/doc/upgrading/upgrade-ezfind-2.0.0-final-to-2.1.0-final.txt b/doc/upgrading/upgrade-ezfind-2.0.0-final-to-2.1.0-final.txt
index b327f689..a22dc332 100644
--- a/doc/upgrading/upgrade-ezfind-2.0.0-final-to-2.1.0-final.txt
+++ b/doc/upgrading/upgrade-ezfind-2.0.0-final-to-2.1.0-final.txt
@@ -4,17 +4,17 @@ Upgrade instructions
 1) Adding a table to the database
 ---------------------------------
 The new Elevation feature ( sponsored results ) requires a new table in the database.
-Add it in the database used by your eZ Publish instance. 
+Add it in the database used by your eZ Publish instance.
 You can do so as follows ( from eZ Publish's root directory ), in the case you are using MySQL:
-   
+
    $> mysql -u <user> -p <database_name> < extension/ezfind/sql/ezfind_elevate_configuration.mysql.sql
- 
-The procedure is very similar in case you are using another RDMS. Please refer to the 
-documentation reference for your DBMS if you are experiencing issues. 
+
+The procedure is very similar in case you are using another RDMS. Please refer to the
+documentation reference for your DBMS if you are experiencing issues.
 
 
 2) Re-indexing is needed as schema.xml has changed
 --------------------------------------------------
 New fields were declared for a better multilanguage
-behaviour. Because of the schema change, 
+behaviour. Because of the schema change,
 re-indexing your site is required.
\ No newline at end of file
diff --git a/doc/upgrading/upgrade-ezfind-2.0alpha1-to-2.0-beta1.txt b/doc/upgrading/upgrade-ezfind-2.0alpha1-to-2.0-beta1.txt
index f0e0dd22..a105aae0 100644
--- a/doc/upgrading/upgrade-ezfind-2.0alpha1-to-2.0-beta1.txt
+++ b/doc/upgrading/upgrade-ezfind-2.0alpha1-to-2.0-beta1.txt
@@ -7,7 +7,7 @@ Upgrade instructions
 Because "integer" types was declared in schema.xml until alpha1,
 but "int" used in the code, the schema has been adapted to reflect this.
 
-Because of the schema change, re-indexing your site is required if you declared 
+Because of the schema change, re-indexing your site is required if you declared
 some datatypes as being "integer", it should be "int" instead
 
 
diff --git a/java/README.txt b/java/README.txt
index 5dd2df22..2ca4fa59 100644
--- a/java/README.txt
+++ b/java/README.txt
@@ -16,10 +16,10 @@
 Solr example configuration
 --------------------------
 
-To run this example configuration, use 
+To run this example configuration, use
 
   java -jar start.jar
 
-in this directory, and when Solr is started connect to 
+in this directory, and when Solr is started connect to
 
   http://localhost:8983/solr/admin/
diff --git a/java/etc/jetty.xml b/java/etc/jetty.xml
index 00334f46..5fe72d8f 100755
--- a/java/etc/jetty.xml
+++ b/java/etc/jetty.xml
@@ -47,7 +47,7 @@
 
     <!-- Use this connector for many frequently idle connections
          and for threadless continuations.
-    -->    
+    -->
   <!--
     <Call name="addConnector">
       <Arg>
@@ -93,7 +93,7 @@
     <!--                                                                 -->
     <!-- See jetty-xinetd.xml for further instructions.                  -->
     <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
-    
+
     <!-- =========================================================== -->
     <!-- Set up global session ID manager                            -->
     <!-- =========================================================== -->
diff --git a/java/etc/webdefault.xml b/java/etc/webdefault.xml
index 36fc3573..899e91a4 100644
--- a/java/etc/webdefault.xml
+++ b/java/etc/webdefault.xml
@@ -70,7 +70,7 @@
   <!--                    welcome file is found. Else 403 Forbidden.        -->
   <!--                                                                      -->
   <!--   welcomeServlets  If true, attempt to dispatch to welcome files     -->
-  <!--                    that are servlets, if no matching static          --> 
+  <!--                    that are servlets, if no matching static          -->
   <!--                    resources can be found.                           -->
   <!--                                                                      -->
   <!--   redirectWelcome  If true, redirect welcome file requests           -->
@@ -152,7 +152,7 @@
     <init-param>
       <param-name>useFileMappedBuffer</param-name>
       <param-value>false</param-value>
-    </init-param>  
+    </init-param>
     <!--
     <init-param>
       <param-name>cacheControl</param-name>
@@ -396,7 +396,7 @@
     <locale-encoding-mapping><locale>zh</locale><encoding>GB2312</encoding></locale-encoding-mapping>
     <locale-encoding-mapping><locale>zh_TW</locale><encoding>Big5</encoding></locale-encoding-mapping>
   </locale-encoding-mapping-list>
-  
+
   <security-constraint>
     <web-resource-collection>
       <web-resource-name>Disable TRACE</web-resource-name>
@@ -405,6 +405,6 @@
     </web-resource-collection>
     <auth-constraint/>
   </security-constraint>
-  
+
 </web-app>
 
diff --git a/java/solr.multicore/eng-GB/conf/mapping-FoldToASCII.txt b/java/solr.multicore/eng-GB/conf/mapping-FoldToASCII.txt
index 9a84b6ea..e59baf7d 100644
--- a/java/solr.multicore/eng-GB/conf/mapping-FoldToASCII.txt
+++ b/java/solr.multicore/eng-GB/conf/mapping-FoldToASCII.txt
@@ -34,7 +34,7 @@
 # - Supplemental Punctuation: http://www.unicode.org/charts/PDF/U2E00.pdf
 # - Alphabetic Presentation Forms: http://www.unicode.org/charts/PDF/UFB00.pdf
 # - Halfwidth and Fullwidth Forms: http://www.unicode.org/charts/PDF/UFF00.pdf
-#  
+#
 # See: http://en.wikipedia.org/wiki/Latin_characters_in_Unicode
 #
 # The set of character conversions supported by this map is a superset of
@@ -3785,11 +3785,11 @@
 #
 # use warnings;
 # use strict;
-# 
+#
 # my @source_chars = ();
 # my @source_char_descriptions = ();
 # my $target = '';
-# 
+#
 # while (<>) {
 #   if (/case\s+'(\\u[A-F0-9]+)':\s*\/\/\s*(.*)/i) {
 #     push @source_chars, $1;
diff --git a/java/solr.multicore/eng-GB/conf/schema.xml b/java/solr.multicore/eng-GB/conf/schema.xml
index c7ebdb25..723ee1e8 100755
--- a/java/solr.multicore/eng-GB/conf/schema.xml
+++ b/java/solr.multicore/eng-GB/conf/schema.xml
@@ -304,7 +304,7 @@
 
 
     <!-- A general unstemmed text field that indexes tokens normally and also
-         reversed (via ReversedWildcardFilterFactory), to enable more efficient 
+         reversed (via ReversedWildcardFilterFactory), to enable more efficient
      leading wildcard queries. -->
     <fieldType name="text_rev" class="solr.TextField" positionIncrementGap="100">
       <analyzer type="index">
@@ -344,7 +344,7 @@
         <tokenizer class="solr.StandardTokenizerFactory"/>
         <filter class="solr.StopFilterFactory" ignoreCase="true" words="stopwords.txt"/>
         <filter class="solr.StandardFilterFactory"/>
-        <filter class="solr.LowerCaseFilterFactory"/> 
+        <filter class="solr.LowerCaseFilterFactory"/>
         <filter class="solr.WordDelimiterFilterFactory" generateWordParts="0" splitOnNumerics="0" generateNumberParts="0" catenateWords="0" catenateNumbers="0" catenateAll="0" splitOnCaseChange="1"/>
         <filter class="solr.RemoveDuplicatesTokenFilterFactory"/>
        </analyzer>
@@ -361,11 +361,11 @@
  <!-- eZ Find: This field type is dedicated to Elevate.  -->
     <fieldType name="elevate_string" stored="false" indexed="false" class="solr.TextField">
           <analyzer>
-              <tokenizer class="solr.WhitespaceTokenizerFactory"/>        
+              <tokenizer class="solr.WhitespaceTokenizerFactory"/>
               <filter class="solr.LowerCaseFilterFactory"/>
           </analyzer>
     </fieldType>
-    
+
 <!-- eZ Find: This field type is dedicated to ez publish keywords.  -->
     <fieldtype name="keyword" class="solr.TextField" positionIncrementGap="100">
          <analyzer type="index">
@@ -483,7 +483,7 @@
 
     <!-- This point type indexes the coordinates as separate fields (subFields)
       If subFieldType is defined, it references a type, and a dynamic field
-      definition is created matching *___<typename>.  Alternately, if 
+      definition is created matching *___<typename>.  Alternately, if
       subFieldSuffix is defined, that is used to create the subFields.
       Example: if subFieldType="double", then the coordinates would be
         indexed in fields myloc_0___double,myloc_1___double.
@@ -544,8 +544,8 @@
    <field name="meta_name_t" type="text" indexed="true" stored="true" termVectors="true"/>  <!-- Object name -->
    <field name="meta_sort_name_ms" type="mtext" indexed="true" stored="true"/>  <!-- Object name for sorting (not tokenized) -->
    <field name="meta_main_node_id_si" type="sint" indexed="true" stored="true"/>           <!-- Main node ID -->
-   <field name="meta_language_code_ms" type="mstring" indexed="true" stored="true"/>          <!-- Language code --> 
-   <field name="meta_available_language_codes_ms" type="mstring" indexed="true" stored="true" multiValued="true"/>          <!-- List of available language codes in the corresponding content object -->    
+   <field name="meta_language_code_ms" type="mstring" indexed="true" stored="true"/>          <!-- Language code -->
+   <field name="meta_available_language_codes_ms" type="mstring" indexed="true" stored="true" multiValued="true"/>          <!-- List of available language codes in the corresponding content object -->
    <field name="meta_anon_access_b" type="boolean" indexed="true" stored="false" />         <!-- Anonymous user access to object -->
    <field name="meta_object_states_si" type="sint" indexed="true" stored="true" multiValued="true"/>                     <!-- Object states -->
 
@@ -676,12 +676,12 @@
 
       <field name="ezf_df_text" type="text"    indexed="true"  stored="true" multiValued="true" termVectors="true"/>
 
-   <!-- uncomment the following to ignore any fields that don't already match an existing 
-        field name or dynamic field, rather than reporting them as an error. 
-        alternately, change the type="ignored" to some other type e.g. "text" if you want 
-        unknown fields indexed and/or stored by default --> 
+   <!-- uncomment the following to ignore any fields that don't already match an existing
+        field name or dynamic field, rather than reporting them as an error.
+        alternately, change the type="ignored" to some other type e.g. "text" if you want
+        unknown fields indexed and/or stored by default -->
    <!--dynamicField name="*" type="ignored" multiValued="true" /-->
-   
+
  </fields>
 
  <!-- Field to use to determine and enforce document uniqueness.
@@ -708,12 +708,12 @@
     <copyField source="*_t" dest="ezf_sp_words"/>
     <copyField source="*_s" dest="ezf_sp_words"/>
 
-    
-   <!-- Above, multiple source fields are copied to the [text] field. 
-      Another way to map multiple source fields to the same 
-      destination field is to use the dynamic field syntax. 
+
+   <!-- Above, multiple source fields are copied to the [text] field.
+      Another way to map multiple source fields to the same
+      destination field is to use the dynamic field syntax.
       copyField also supports a maxChars to copy setting.  -->
-       
+
    <!-- <copyField source="*_t" dest="text" maxChars="3000"/> -->
 
    <!-- copy name to alphaNameSort, a field designed for sorting by name -->
diff --git a/java/solr.multicore/eng-GB/conf/solrconfig.xml b/java/solr.multicore/eng-GB/conf/solrconfig.xml
index 002b63cf..cdb24b22 100755
--- a/java/solr.multicore/eng-GB/conf/solrconfig.xml
+++ b/java/solr.multicore/eng-GB/conf/solrconfig.xml
@@ -16,9 +16,9 @@
  limitations under the License.
 -->
 
-<!-- 
+<!--
      For more details about configurations options that may appear in
-     this file, see http://wiki.apache.org/solr/SolrConfigXml. 
+     this file, see http://wiki.apache.org/solr/SolrConfigXml.
 -->
 <config>
   <!-- In all configuration below, a prefix of "solr." for class names
@@ -40,7 +40,7 @@
          -Dsolr.abortOnConfigurationError=false
     -->
   <abortOnConfigurationError>${solr.abortOnConfigurationError:true}</abortOnConfigurationError>
-  
+
   <!-- Controls what version of Lucene various components of Solr
        adhere to.  Generally, you want to use the latest version to
        get all bug fixes and improvements. It is highly recommended
@@ -60,7 +60,7 @@
        If a "./lib" directory exists in your instanceDir, all files
        found in it are included as if you had used the following
        syntax...
-       
+
               <lib dir="./lib" />
     -->
   <!-- A dir option by itself adds any files found in the directory to
@@ -85,9 +85,9 @@
        will cause a serious error to be logged if it can't be loaded.
     -->
   <!--
-  <lib path="../a-jar-that-does-not-exist.jar" /> 
+  <lib path="../a-jar-that-does-not-exist.jar" />
   -->
-  
+
   <!-- Data Directory
 
        Used to specify an alternate directory to hold all index data
@@ -100,12 +100,12 @@
 
 
   <!-- The DirectoryFactory to use for indexes.
-       
+
        solr.StandardDirectoryFactory, the default, is filesystem
        based.  solr.RAMDirectoryFactory is memory based, not
        persistent, and doesn't work with replication.
     -->
-  <directoryFactory name="DirectoryFactory" 
+  <directoryFactory name="DirectoryFactory"
                     class="${solr.directoryFactory:solr.StandardDirectoryFactory}"/>
 
 
@@ -127,7 +127,7 @@
          flushed to the Directory.  -->
     <ramBufferSizeMB>32</ramBufferSizeMB>
     <!-- If both ramBufferSizeMB and maxBufferedDocs is set, then
-         Lucene will flush based on whichever limit is hit first.  
+         Lucene will flush based on whichever limit is hit first.
       -->
     <!-- <maxBufferedDocs>1000</maxBufferedDocs> -->
 
@@ -135,16 +135,16 @@
     <writeLockTimeout>1000</writeLockTimeout>
     <commitLockTimeout>10000</commitLockTimeout>
 
-    <!-- Expert: Merge Policy 
+    <!-- Expert: Merge Policy
 
          The Merge Policy in Lucene controls how merging is handled by
          Lucene.  The default in 2.3 is the LogByteSizeMergePolicy,
          previous versions used LogDocMergePolicy.
-         
+
          LogByteSizeMergePolicy chooses segments to merge based on
          their size.  The Lucene 2.2 default, LogDocMergePolicy chose
          when to merge based on number of documents
-         
+
          Other implementations of MergePolicy must have a no-argument
          constructor
       -->
@@ -159,15 +159,15 @@
          can perform merges in the background using separate threads.
          The SerialMergeScheduler (Lucene 2.2 default) does not.
      -->
-    <!-- 
+    <!--
        <mergeScheduler class="org.apache.lucene.index.ConcurrentMergeScheduler"/>
        -->
-      
-    <!-- LockFactory 
+
+    <!-- LockFactory
 
          This option specifies which Lucene LockFactory implementation
          to use.
-      
+
          single = SingleInstanceLockFactory - suggested for a
                   read-only index or when there is no possibility of
                   another process trying to modify the index.
@@ -211,7 +211,7 @@
          This is not needed if lock type is 'none' or 'single'
      -->
     <unlockOnStartup>false</unlockOnStartup>
-    
+
     <!-- If true, IndexReaders will be reopened (often more efficient)
          instead of closed and then opened.
       -->
@@ -227,7 +227,7 @@
          The standard Solr IndexDeletionPolicy implementation supports
          deleting index commit points on number of commits, age of
          commit point and optimized status.
-         
+
          The latest commit point should always be preserved regardless
          of the criteria.
     -->
@@ -247,19 +247,19 @@
     </deletionPolicy>
 
     <!-- Lucene Infostream
-       
+
          To aid in advanced debugging, Lucene provides an "InfoStream"
          of detailed information when indexing.
 
          Setting The value to true will instruct the underlying Lucene
          IndexWriter to write it's debugging info the specified file
       -->
-     <infoStream file="INFOSTREAM.txt">false</infoStream> 
+     <infoStream file="INFOSTREAM.txt">false</infoStream>
 
   </mainIndex>
 
   <!-- JMX
-       
+
        This example enables JMX if and only if an existing MBeanServer
        is found, use this if you want to configure JMX through JVM
        parameters. Remove this to disable exposing Solr configuration
@@ -269,7 +269,7 @@
     -->
   <jmx />
   <!-- If you want to connect to a particular server, specify the
-       agentId 
+       agentId
     -->
   <!-- <jmx agentId="myAgent" /> -->
   <!-- If you want to start a new MBeanServer, specify the serviceUrl -->
@@ -283,7 +283,7 @@
 
          Perform a <commit/> automatically under certain conditions.
          Instead of enabling autoCommit, consider using "commitWithin"
-         when adding documents. 
+         when adding documents.
 
          http://wiki.apache.org/solr/UpdateXmlMessages
 
@@ -292,17 +292,17 @@
 
          maxTime - Maximum amount of time that is allowed to pass
                    since a document was added before automaticly
-                   triggering a new commit. 
+                   triggering a new commit.
       -->
     <!--
-       <autoCommit> 
+       <autoCommit>
          <maxDocs>10000</maxDocs>
-         <maxTime>1000</maxTime> 
+         <maxTime>1000</maxTime>
        </autoCommit>
       -->
 
     <!-- Update Related Event Listeners
-         
+
          Various IndexWriter realted events can trigger Listeners to
          take actions.
 
@@ -311,10 +311,10 @@
       -->
     <!-- The RunExecutableListener executes an external command from a
          hook such as postCommit or postOptimize.
-         
+
          exe - the name of the executable to run
          dir - dir to use as the current working directory. (default=".")
-         wait - the calling thread waits until the executable returns. 
+         wait - the calling thread waits until the executable returns.
                 (default="true")
          args - the arguments to pass to the program.  (default is none)
          env - environment variables to set.  (default is none)
@@ -333,7 +333,7 @@
        </listener>
       -->
   </updateHandler>
-  
+
   <!-- IndexReaderFactory
 
        Use the following format to specify a custom IndexReaderFactory,
@@ -365,7 +365,7 @@
        be specified.
     -->
   <!--
-     <indexReaderFactory name="IndexReaderFactory" 
+     <indexReaderFactory name="IndexReaderFactory"
                          class="solr.StandardIndexReaderFactory">
        <int name="setTermIndexDivisor">12</int>
      </indexReaderFactory >
@@ -379,12 +379,12 @@
          is thrown if exceeded.
 
          ** WARNING **
-         
+
          This option actually modifies a global Lucene property that
          will affect all SolrCores.  If multiple solrconfig.xml files
          disagree on this property, the value at any given moment will
          be based on the last SolrCore to be initialized.
-         
+
       -->
     <maxBooleanClauses>10000</maxBooleanClauses>
 
@@ -392,7 +392,7 @@
 
          There are two implementations of cache available for Solr,
          LRUCache, based on a synchronized LinkedHashMap, and
-         FastLRUCache, based on a ConcurrentHashMap.  
+         FastLRUCache, based on a ConcurrentHashMap.
 
          FastLRUCache has faster gets and slower puts in single
          threaded operation and thus is generally faster than LRUCache
@@ -417,7 +417,7 @@
            initialSize - the initial capacity (number of entries) of
                the cache.  (see java.util.HashMap)
            autowarmCount - the number of entries to prepopulate from
-               and old cache.  
+               and old cache.
       -->
     <filterCache class="solr.FastLRUCache"
                  size="512"
@@ -425,28 +425,28 @@
                  autowarmCount="0"/>
 
     <!-- Query Result Cache
-         
+
          Caches results of searches - ordered lists of document ids
-         (DocList) based on a query, a sort, and the range of documents requested.  
+         (DocList) based on a query, a sort, and the range of documents requested.
       -->
     <queryResultCache class="solr.LRUCache"
                      size="512"
                      initialSize="512"
                      autowarmCount="0"/>
-   
+
     <!-- Document Cache
 
          Caches Lucene Document objects (the stored fields for each
          document).  Since Lucene internal document ids are transient,
-         this cache will not be autowarmed.  
+         this cache will not be autowarmed.
       -->
     <documentCache class="solr.LRUCache"
                    size="512"
                    initialSize="512"
                    autowarmCount="0"/>
-    
+
     <!-- Field Value Cache
-         
+
          Cache used to hold field values that are quickly accessible
          by document id.  The fieldValueCache is created by default
          even if not configured here.
@@ -464,8 +464,8 @@
          name through SolrIndexSearcher.getCache(),cacheLookup(), and
          cacheInsert().  The purpose is to enable easy caching of
          user/application level data.  The regenerator argument should
-         be specified as an implementation of solr.CacheRegenerator 
-         if autowarming is desired.  
+         be specified as an implementation of solr.CacheRegenerator
+         if autowarming is desired.
       -->
     <!--
        <cache name="myUserCache"
@@ -512,12 +512,12 @@
         are collected.  For example, if a search for a particular query
         requests matching documents 10 through 19, and queryWindowSize is 50,
         then documents 0 through 49 will be collected and cached.  Any further
-        requests in that range can be satisfied via the cache.  
+        requests in that range can be satisfied via the cache.
      -->
     <queryResultWindowSize>50</queryResultWindowSize>
 
    <!-- Maximum number of documents to cache for any entry in the
-        queryResultCache. 
+        queryResultCache.
      -->
    <queryResultMaxDocsCached>200</queryResultMaxDocsCached>
 
@@ -535,10 +535,10 @@
         prepared but there is no current registered searcher to handle
         requests or to gain autowarming data from.
 
-        
+
      -->
     <!-- QuerySenderListener takes an array of NamedList and executes a
-         local query request for each NamedList in sequence. 
+         local query request for each NamedList in sequence.
       -->
     <listener event="newSearcher" class="solr.QuerySenderListener">
       <arr name="queries">
@@ -566,7 +566,7 @@
     <useColdSearcher>false</useColdSearcher>
 
     <!-- Max Warming Searchers
-         
+
          Maximum number of searchers that may be warming in the
          background concurrently.  An error is returned if this limit
          is exceeded.
@@ -606,14 +606,14 @@
 
          multipartUploadLimitInKB - specifies the max size of
          Multipart File Uploads that Solr will alow in a Request.
-         
+
          *** WARNING ***
          The settings below authorize Solr to fetch remote files, You
          should make sure your system has some authentication before
          using enableRemoteStreaming="true"
 
-      --> 
-    <requestParsers enableRemoteStreaming="true" 
+      -->
+    <requestParsers enableRemoteStreaming="true"
                     multipartUploadLimitInKB="2048000" />
 
     <!-- HTTP Caching
@@ -627,21 +627,21 @@
     <!-- If you include a <cacheControl> directive, it will be used to
          generate a Cache-Control header (as well as an Expires header
          if the value contains "max-age=")
-         
+
          By default, no Cache-Control header is generated.
-         
+
          You can use the <cacheControl> option even if you have set
          never304="true"
       -->
     <!--
        <httpCaching never304="true" >
-         <cacheControl>max-age=30, public</cacheControl> 
+         <cacheControl>max-age=30, public</cacheControl>
        </httpCaching>
       -->
     <!-- To enable Solr to responde with automaticly generated HTTP
          Caching headers, and to response to Cache Validation requests
          correctly, set the value of never304="false"
-         
+
          This will cause Solr to generate Last-Modified and ETag
          headers based on the properties of the Index.
 
@@ -666,12 +666,12 @@
     <!--
        <httpCaching lastModifiedFrom="openTime"
                     etagSeed="Solr">
-         <cacheControl>max-age=30, public</cacheControl> 
+         <cacheControl>max-age=30, public</cacheControl>
        </httpCaching>
       -->
   </requestDispatcher>
 
-  <!-- Request Handlers 
+  <!-- Request Handlers
 
        http://wiki.apache.org/solr/SolrRequestHandler
 
@@ -685,7 +685,7 @@
        If a /select request is processed with out a qt param
        specified, the requestHandler that declares default="true" will
        be used.
-       
+
        If a Request Handler is declared with startup="lazy", then it will
        not be initialized until the first request that uses it.
 
@@ -845,8 +845,8 @@
      -->
   </requestHandler>
 
-  <!-- XML Update Request Handler.  
-       
+  <!-- XML Update Request Handler.
+
        http://wiki.apache.org/solr/UpdateXmlMessages
 
        The canonical Request Handler for Modifying the Index through
@@ -856,10 +856,10 @@
        type header if posted in the body. For example, curl now
        requires: -H 'Content-type:text/xml; charset=utf-8'
     -->
-  <requestHandler name="/update" 
+  <requestHandler name="/update"
                   class="solr.XmlUpdateRequestHandler">
-    <!-- See below for information on defining 
-         updateRequestProcessorChains that can be used by name 
+    <!-- See below for information on defining
+         updateRequestProcessorChains that can be used by name
          on each Update Request
       -->
     <!--
@@ -871,29 +871,29 @@
   <!-- Binary Update Request Handler
        http://wiki.apache.org/solr/javabin
     -->
-  <requestHandler name="/update/javabin" 
+  <requestHandler name="/update/javabin"
                   class="solr.BinaryUpdateRequestHandler" />
 
   <!-- CSV Update Request Handler
        http://wiki.apache.org/solr/UpdateCSV
     -->
-  <requestHandler name="/update/csv" 
-                  class="solr.CSVRequestHandler" 
+  <requestHandler name="/update/csv"
+                  class="solr.CSVRequestHandler"
                   startup="lazy" />
 
   <!-- JSON Update Request Handler
        http://wiki.apache.org/solr/UpdateJSON
     -->
-  <requestHandler name="/update/json" 
-                  class="solr.JsonUpdateRequestHandler" 
+  <requestHandler name="/update/json"
+                  class="solr.JsonUpdateRequestHandler"
                   startup="lazy" />
 
   <!-- Solr Cell Update Request Handler
 
-       http://wiki.apache.org/solr/ExtractingRequestHandler 
+       http://wiki.apache.org/solr/ExtractingRequestHandler
 
     -->
-  <requestHandler name="/update/extract" 
+  <requestHandler name="/update/extract"
                   startup="lazy"
                   class="solr.extraction.ExtractingRequestHandler" >
     <lst name="defaults">
@@ -928,7 +928,7 @@
            field value analysis will be marked as "matched" for every
            token that is produces by the query analysis
    -->
-  <requestHandler name="/analysis/field" 
+  <requestHandler name="/analysis/field"
                   startup="lazy"
                   class="solr.FieldAnalysisRequestHandler" />
 
@@ -1056,18 +1056,18 @@
     request paraemter that holds the query text to be analyized. It
     also supports the "analysis.showmatch" parameter which when set to
     true, all field tokens that match the query tokens will be marked
-    as a "match". 
+    as a "match".
   -->
-  <requestHandler name="/analysis/document" 
-                  class="solr.DocumentAnalysisRequestHandler" 
+  <requestHandler name="/analysis/document"
+                  class="solr.DocumentAnalysisRequestHandler"
                   startup="lazy" />
 
   <!-- Admin Handlers
 
        Admin Handlers - This will register all the standard admin
-       RequestHandlers.  
+       RequestHandlers.
     -->
-  <requestHandler name="/admin/" 
+  <requestHandler name="/admin/"
                   class="solr.admin.AdminHandlers" />
   <!-- This single handler is equivilent to the following... -->
   <!--
@@ -1079,14 +1079,14 @@
      <requestHandler name="/admin/file"       class="solr.admin.ShowFileRequestHandler" >
     -->
   <!-- If you wish to hide files under ${solr.home}/conf, explicitly
-       register the ShowFileRequestHandler using: 
+       register the ShowFileRequestHandler using:
     -->
   <!--
-     <requestHandler name="/admin/file" 
+     <requestHandler name="/admin/file"
                      class="solr.admin.ShowFileRequestHandler" >
        <lst name="invariants">
-         <str name="hidden">synonyms.txt</str> 
-         <str name="hidden">anotherfile.txt</str> 
+         <str name="hidden">synonyms.txt</str>
+         <str name="hidden">anotherfile.txt</str>
        </lst>
      </requestHandler>
     -->
@@ -1103,11 +1103,11 @@
   <!-- Echo the request contents back to the client -->
   <requestHandler name="/debug/dump" class="solr.DumpRequestHandler" >
     <lst name="defaults">
-     <str name="echoParams">explicit</str> 
+     <str name="echoParams">explicit</str>
      <str name="echoHandler">true</str>
     </lst>
   </requestHandler>
-  
+
   <requestHandler name="ezpublish" class="solr.DisMaxRequestHandler" >
     <lst name="defaults">
       <str name="echoParams">explicit</str>
@@ -1148,7 +1148,7 @@
        The SolrReplicationHandler supports replicating indexes from a
        "master" used for indexing and "salves" used for queries.
 
-       http://wiki.apache.org/solr/SolrReplication 
+       http://wiki.apache.org/solr/SolrReplication
 
        In the example below, remove the <lst name="master"> section if
        this is just a slave and remove  the <lst name="slave"> section
@@ -1170,18 +1170,18 @@
 
   <!-- Search Components
 
-       Search components are registered to SolrCore and used by 
+       Search components are registered to SolrCore and used by
        instances of SearchHandler (which can access them by name)
-       
+
        By default, the following components are avaliable:
-       
+
        <searchComponent name="query"     class="solr.QueryComponent" />
        <searchComponent name="facet"     class="solr.FacetComponent" />
        <searchComponent name="mlt"       class="solr.MoreLikeThisComponent" />
        <searchComponent name="highlight" class="solr.HighlightComponent" />
        <searchComponent name="stats"     class="solr.StatsComponent" />
        <searchComponent name="debug"     class="solr.DebugComponent" />
-   
+
        Default configuration in a requestHandler would look like:
 
        <arr name="components">
@@ -1193,28 +1193,28 @@
          <str>debug</str>
        </arr>
 
-       If you register a searchComponent to one of the standard names, 
+       If you register a searchComponent to one of the standard names,
        that will be used instead of the default.
 
        To insert components before or after the 'standard' components, use:
-    
+
        <arr name="first-components">
          <str>myFirstComponentName</str>
        </arr>
-    
+
        <arr name="last-components">
          <str>myLastComponentName</str>
        </arr>
 
        NOTE: The component registered with the name "debug" will
-       always be executed after the "last-components" 
-       
+       always be executed after the "last-components"
+
      -->
 
    <!-- Spell Check
 
         The spell check component can return a list of alternative spelling
-        suggestions.  
+        suggestions.
 
         http://wiki.apache.org/solr/SpellCheckComponent
      -->
@@ -1248,7 +1248,7 @@
        </lst>
      -->
 
-    <!-- a spellchecker that use an alternate comparator 
+    <!-- a spellchecker that use an alternate comparator
 
          comparatorClass be one of:
           1. score (default)
@@ -1276,7 +1276,7 @@
       -->
   </searchComponent>
 
-  <!-- A request handler for demonstrating the spellcheck component.  
+  <!-- A request handler for demonstrating the spellcheck component.
 
        NOTE: This is purely as an example.  The whole purpose of the
        SpellCheckComponent is to hook it into the request handler that
@@ -1285,7 +1285,7 @@
 
        IN OTHER WORDS, THERE IS REALLY GOOD CHANCE THE SETUP BELOW IS
        NOT WHAT YOU WANT FOR YOUR PRODUCTION SYSTEM!
-       
+
        See http://wiki.apache.org/solr/SpellCheckComponent for details
        on the request parameters.
     -->
@@ -1312,8 +1312,8 @@
 
        This is purely as an example.
 
-       In reality you will likely want to add the component to your 
-       already specified request handlers. 
+       In reality you will likely want to add the component to your
+       already specified request handlers.
     -->
   <requestHandler name="tvrh" class="solr.SearchHandler" startup="lazy">
     <lst name="defaults">
@@ -1335,20 +1335,20 @@
 
           java -Dsolr.clustering.enabled=true -jar start.jar
     -->
-  <searchComponent name="clustering" 
+  <searchComponent name="clustering"
                    enable="${solr.clustering.enabled:false}"
                    class="solr.clustering.ClusteringComponent" >
     <!-- Declare an engine -->
     <lst name="engine">
       <!-- The name, only one can be named "default" -->
       <str name="name">default</str>
-      <!-- Class name of Carrot2 clustering algorithm. 
-           
+      <!-- Class name of Carrot2 clustering algorithm.
+
            Currently available algorithms are:
-           
+
            * org.carrot2.clustering.lingo.LingoClusteringAlgorithm
            * org.carrot2.clustering.stc.STCClusteringAlgorithm
-           
+
            See http://project.carrot2.org/algorithms.html for the
            algorithm's characteristics.
         -->
@@ -1363,9 +1363,9 @@
            name and attribute value as parameter value.
         -->
       <str name="LingoClusteringAlgorithm.desiredClusterCountBase">20</str>
-      
+
       <!-- The language to assume for the documents.
-           
+
            For a list of allowed values, see:
            http://download.carrot2.org/stable/manual/#section.attribute.lingo.MultilingualClustering.defaultLanguage
        -->
@@ -1381,8 +1381,8 @@
 
        This is purely as an example.
 
-       In reality you will likely want to add the component to your 
-       already specified request handlers. 
+       In reality you will likely want to add the component to your
+       already specified request handlers.
     -->
   <requestHandler name="/clustering"
                   startup="lazy"
@@ -1403,7 +1403,7 @@
        <!--<int name="carrot.numDescriptions">5</int>-->
        <!-- produce sub clusters -->
        <bool name="carrot.outputSubClusters">false</bool>
-       
+
        <str name="defType">edismax</str>
        <str name="qf">
           text^0.5 features^1.0 name^1.2 sku^1.5 id^10.0 manu^1.1 cat^1.4
@@ -1411,12 +1411,12 @@
        <str name="q.alt">*:*</str>
        <str name="rows">10</str>
        <str name="fl">*,score</str>
-    </lst>     
+    </lst>
     <arr name="last-components">
       <str>clustering</str>
     </arr>
   </requestHandler>
-  
+
   <!-- Terms Component
 
        http://wiki.apache.org/solr/TermsComponent
@@ -1469,7 +1469,7 @@
     <highlighting>
       <!-- Configure the standard fragmenter -->
       <!-- This could most likely be commented out in the "default" case -->
-      <fragmenter name="gap" 
+      <fragmenter name="gap"
                   default="true"
                   class="solr.highlight.GapFragmenter">
         <lst name="defaults">
@@ -1477,8 +1477,8 @@
         </lst>
       </fragmenter>
 
-      <!-- A regular-expression-based fragmenter 
-           (for sentence extraction) 
+      <!-- A regular-expression-based fragmenter
+           (for sentence extraction)
         -->
       <fragmenter name="regex"
                   class="solr.highlight.RegexFragmenter">
@@ -1493,7 +1493,7 @@
       </fragmenter>
 
       <!-- Configure the standard formatter -->
-      <formatter name="html" 
+      <formatter name="html"
                  default="true"
                  class="solr.highlight.HtmlFormatter">
         <lst name="defaults">
@@ -1503,24 +1503,24 @@
       </formatter>
 
       <!-- Configure the standard encoder -->
-      <encoder name="html" 
+      <encoder name="html"
                default="true"
                class="solr.highlight.HtmlEncoder" />
 
       <!-- Configure the standard fragListBuilder -->
-      <fragListBuilder name="simple" 
+      <fragListBuilder name="simple"
                        default="true"
                        class="solr.highlight.SimpleFragListBuilder"/>
 
       <!-- Configure the single fragListBuilder -->
-      <fragListBuilder name="single" 
+      <fragListBuilder name="single"
                        class="solr.highlight.SingleFragListBuilder"/>
 
       <!-- default tag FragmentsBuilder -->
-      <fragmentsBuilder name="default" 
+      <fragmentsBuilder name="default"
                         default="true"
                         class="solr.highlight.ScoreOrderFragmentsBuilder">
-        <!-- 
+        <!--
         <lst name="defaults">
           <str name="hl.multiValuedSeparatorChar">/</str>
         </lst>
@@ -1528,7 +1528,7 @@
       </fragmentsBuilder>
 
       <!-- multi-colored tag FragmentsBuilder -->
-      <fragmentsBuilder name="colored" 
+      <fragmentsBuilder name="colored"
                         class="solr.highlight.ScoreOrderFragmentsBuilder">
         <lst name="defaults">
           <str name="hl.tag.pre"><![CDATA[
@@ -1551,15 +1551,15 @@
 
        http://wiki.apache.org/solr/UpdateRequestProcessor
 
-    --> 
+    -->
   <!-- Deduplication
 
        An example dedup update processor that creates the "id" field
        on the fly based on the hash code of some other fields.  This
        example has overwriteDupes set to false since we are using the
        id field as the signatureField and Solr will maintain
-       uniqueness based on that anyway.  
-       
+       uniqueness based on that anyway.
+
     -->
   <!--
      <updateRequestProcessorChain name="dedupe">
@@ -1590,7 +1590,7 @@
        overridden...
     -->
   <!--
-     <queryResponseWriter name="xml" 
+     <queryResponseWriter name="xml"
                           default="true"
                           class="solr.XMLResponseWriter" />
      <queryResponseWriter name="json" class="solr.JSONResponseWriter"/>
@@ -1612,7 +1612,7 @@
 
   <!-- XSLT response writer transforms the XML output by any xslt file found
        in Solr's conf/xslt directory.  Changes to xslt files are checked for
-       every xsltCacheLifetimeSeconds.  
+       every xsltCacheLifetimeSeconds.
     -->
   <queryResponseWriter name="xslt" class="solr.XSLTResponseWriter">
     <int name="xsltCacheLifetimeSeconds">5</int>
@@ -1640,7 +1640,7 @@
     -->
   <!-- example of registering a custom function parser  -->
   <!--
-     <valueSourceParser name="myfunc" 
+     <valueSourceParser name="myfunc"
                         class="com.mycompany.MyValueSourceParser" />
     -->
 
@@ -1649,7 +1649,7 @@
     <defaultQuery>*:*</defaultQuery>
 
     <!-- configure a healthcheck file for servers behind a
-         loadbalancer 
+         loadbalancer
       -->
     <!--
        <healthcheck type="file">server-enabled</healthcheck>
diff --git a/java/solr.multicore/eng-GB/conf/xslt/example.xsl b/java/solr.multicore/eng-GB/conf/xslt/example.xsl
index b8992700..aa546593 100644
--- a/java/solr.multicore/eng-GB/conf/xslt/example.xsl
+++ b/java/solr.multicore/eng-GB/conf/xslt/example.xsl
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 
-<!-- 
+<!--
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.
@@ -17,17 +17,17 @@
  * limitations under the License.
  -->
 
-<!-- 
+<!--
   Simple transform of Solr query results to HTML
  -->
 <xsl:stylesheet version='1.0'
     xmlns:xsl='http://www.w3.org/1999/XSL/Transform'
 >
 
-  <xsl:output media-type="text/html" encoding="UTF-8"/> 
-  
+  <xsl:output media-type="text/html" encoding="UTF-8"/>
+
   <xsl:variable name="title" select="concat('Solr search results (',response/result/@numFound,' documents)')"/>
-  
+
   <xsl:template match='/'>
     <html>
       <head>
@@ -44,7 +44,7 @@
       </body>
     </html>
   </xsl:template>
-  
+
   <xsl:template match="doc">
     <xsl:variable name="pos" select="position()"/>
     <div class="doc">
@@ -110,7 +110,7 @@
   </xsl:template>
 
   <xsl:template match="*"/>
-  
+
   <xsl:template name="css">
     <script>
       function toggle(id) {
diff --git a/java/solr.multicore/eng-GB/conf/xslt/example_atom.xsl b/java/solr.multicore/eng-GB/conf/xslt/example_atom.xsl
index b6c23151..86e77507 100644
--- a/java/solr.multicore/eng-GB/conf/xslt/example_atom.xsl
+++ b/java/solr.multicore/eng-GB/conf/xslt/example_atom.xsl
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 
-<!-- 
+<!--
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.
@@ -17,7 +17,7 @@
  * limitations under the License.
  -->
 
-<!-- 
+<!--
   Simple transform of Solr query results to Atom
  -->
 
@@ -42,7 +42,7 @@
         <name>Apache Solr</name>
         <email>solr-user@lucene.apache.org</email>
       </author>
-      <link rel="self" type="application/atom+xml" 
+      <link rel="self" type="application/atom+xml"
             href="http://localhost:8983/solr/q={$query}&amp;wt=xslt&amp;tr=atom.xsl"/>
       <updated>
         <xsl:value-of select="response/result/doc[position()=1]/date[@name='timestamp']"/>
@@ -51,7 +51,7 @@
       <xsl:apply-templates select="response/result/doc"/>
     </feed>
   </xsl:template>
-    
+
   <!-- search results xslt -->
   <xsl:template match="doc">
     <xsl:variable name="id" select="str[@name='id']"/>
diff --git a/java/solr.multicore/eng-GB/conf/xslt/example_rss.xsl b/java/solr.multicore/eng-GB/conf/xslt/example_rss.xsl
index 2857f117..407e65a7 100644
--- a/java/solr.multicore/eng-GB/conf/xslt/example_rss.xsl
+++ b/java/solr.multicore/eng-GB/conf/xslt/example_rss.xsl
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 
-<!-- 
+<!--
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.
@@ -17,7 +17,7 @@
  * limitations under the License.
  -->
 
-<!-- 
+<!--
   Simple transform of Solr query results to RSS
  -->
 
@@ -44,7 +44,7 @@
        </channel>
     </rss>
   </xsl:template>
-  
+
   <!-- search results xslt -->
   <xsl:template match="doc">
     <xsl:variable name="id" select="str[@name='id']"/>
diff --git a/java/solr.multicore/eng-GB/conf/xslt/luke.xsl b/java/solr.multicore/eng-GB/conf/xslt/luke.xsl
index 8553f3c6..6e988afe 100644
--- a/java/solr.multicore/eng-GB/conf/xslt/luke.xsl
+++ b/java/solr.multicore/eng-GB/conf/xslt/luke.xsl
@@ -6,9 +6,9 @@
     The ASF licenses this file to You under the Apache License, Version 2.0
     (the "License"); you may not use this file except in compliance with
     the License.  You may obtain a copy of the License at
-    
+
     http://www.apache.org/licenses/LICENSE-2.0
-    
+
     Unless required by applicable law or agreed to in writing, software
     distributed under the License is distributed on an "AS IS" BASIS,
     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -17,7 +17,7 @@
 -->
 
 
-<!-- 
+<!--
   Display the luke request handler with graphs
  -->
 <xsl:stylesheet
@@ -190,7 +190,7 @@
                  <div class="histogram">
                   <xsl:attribute name="style">background-color: <xsl:value-of select="$fill"/>; width: <xsl:value-of select="$bar_width"/>px; height: <xsl:value-of select="($iheight*number(.)) div $max"/>px;</xsl:attribute>
                  </div>
-                   </td> 
+                   </td>
                 </xsl:for-each>
               </tr>
               <tr>
diff --git a/java/solr.multicore/fre-FR/conf/mapping-FoldToASCII.txt b/java/solr.multicore/fre-FR/conf/mapping-FoldToASCII.txt
index 9a84b6ea..e59baf7d 100644
--- a/java/solr.multicore/fre-FR/conf/mapping-FoldToASCII.txt
+++ b/java/solr.multicore/fre-FR/conf/mapping-FoldToASCII.txt
@@ -34,7 +34,7 @@
 # - Supplemental Punctuation: http://www.unicode.org/charts/PDF/U2E00.pdf
 # - Alphabetic Presentation Forms: http://www.unicode.org/charts/PDF/UFB00.pdf
 # - Halfwidth and Fullwidth Forms: http://www.unicode.org/charts/PDF/UFF00.pdf
-#  
+#
 # See: http://en.wikipedia.org/wiki/Latin_characters_in_Unicode
 #
 # The set of character conversions supported by this map is a superset of
@@ -3785,11 +3785,11 @@
 #
 # use warnings;
 # use strict;
-# 
+#
 # my @source_chars = ();
 # my @source_char_descriptions = ();
 # my $target = '';
-# 
+#
 # while (<>) {
 #   if (/case\s+'(\\u[A-F0-9]+)':\s*\/\/\s*(.*)/i) {
 #     push @source_chars, $1;
diff --git a/java/solr.multicore/fre-FR/conf/schema.xml b/java/solr.multicore/fre-FR/conf/schema.xml
index 7d9da682..9d783cad 100755
--- a/java/solr.multicore/fre-FR/conf/schema.xml
+++ b/java/solr.multicore/fre-FR/conf/schema.xml
@@ -304,7 +304,7 @@
 
 
     <!-- A general unstemmed text field that indexes tokens normally and also
-         reversed (via ReversedWildcardFilterFactory), to enable more efficient 
+         reversed (via ReversedWildcardFilterFactory), to enable more efficient
      leading wildcard queries. -->
     <fieldType name="text_rev" class="solr.TextField" positionIncrementGap="100">
       <analyzer type="index">
@@ -344,7 +344,7 @@
         <tokenizer class="solr.StandardTokenizerFactory"/>
         <filter class="solr.StopFilterFactory" ignoreCase="true" words="stopwords.txt"/>
         <filter class="solr.StandardFilterFactory"/>
-        <filter class="solr.LowerCaseFilterFactory"/> 
+        <filter class="solr.LowerCaseFilterFactory"/>
         <filter class="solr.WordDelimiterFilterFactory" generateWordParts="0" splitOnNumerics="0" generateNumberParts="0" catenateWords="0" catenateNumbers="0" catenateAll="0" splitOnCaseChange="1"/>
         <filter class="solr.RemoveDuplicatesTokenFilterFactory"/>
        </analyzer>
@@ -361,11 +361,11 @@
  <!-- eZ Find: This field type is dedicated to Elevate.  -->
     <fieldType name="elevate_string" stored="false" indexed="false" class="solr.TextField">
           <analyzer>
-              <tokenizer class="solr.WhitespaceTokenizerFactory"/>        
+              <tokenizer class="solr.WhitespaceTokenizerFactory"/>
               <filter class="solr.LowerCaseFilterFactory"/>
           </analyzer>
     </fieldType>
-    
+
 <!-- eZ Find: This field type is dedicated to ez publish keywords.  -->
     <fieldtype name="keyword" class="solr.TextField" positionIncrementGap="100">
          <analyzer type="index">
@@ -475,7 +475,7 @@
     </fieldType>
 
     <!-- since fields of this type are by default not stored or indexed,
-         any data added to them will be ignored outright.  --> 
+         any data added to them will be ignored outright.  -->
     <fieldtype name="ignored" stored="false" indexed="false" multiValued="true" class="solr.StrField" />
     <!-- The geopoint type holds latitude / longitude information
       implictely it holds several subfields-->
@@ -483,7 +483,7 @@
 
     <!-- This point type indexes the coordinates as separate fields (subFields)
       If subFieldType is defined, it references a type, and a dynamic field
-      definition is created matching *___<typename>.  Alternately, if 
+      definition is created matching *___<typename>.  Alternately, if
       subFieldSuffix is defined, that is used to create the subFields.
       Example: if subFieldType="double", then the coordinates would be
         indexed in fields myloc_0___double,myloc_1___double.
@@ -544,8 +544,8 @@
    <field name="meta_name_t" type="text" indexed="true" stored="true" termVectors="true"/>  <!-- Object name -->
    <field name="meta_sort_name_ms" type="mtext" indexed="true" stored="true"/>  <!-- Object name for sorting (not tokenized) -->
    <field name="meta_main_node_id_si" type="sint" indexed="true" stored="true"/>           <!-- Main node ID -->
-   <field name="meta_language_code_ms" type="mstring" indexed="true" stored="true"/>          <!-- Language code --> 
-   <field name="meta_available_language_codes_ms" type="mstring" indexed="true" stored="true" multiValued="true"/>          <!-- List of available language codes in the corresponding content object -->    
+   <field name="meta_language_code_ms" type="mstring" indexed="true" stored="true"/>          <!-- Language code -->
+   <field name="meta_available_language_codes_ms" type="mstring" indexed="true" stored="true" multiValued="true"/>          <!-- List of available language codes in the corresponding content object -->
    <field name="meta_anon_access_b" type="boolean" indexed="true" stored="false" />         <!-- Anonymous user access to object -->
    <field name="meta_object_states_si" type="sint" indexed="true" stored="true" multiValued="true"/>                     <!-- Object states -->
 
@@ -676,12 +676,12 @@
 
       <field name="ezf_df_text" type="text"    indexed="true"  stored="true" multiValued="true" termVectors="true"/>
 
-   <!-- uncomment the following to ignore any fields that don't already match an existing 
-        field name or dynamic field, rather than reporting them as an error. 
-        alternately, change the type="ignored" to some other type e.g. "text" if you want 
-        unknown fields indexed and/or stored by default --> 
+   <!-- uncomment the following to ignore any fields that don't already match an existing
+        field name or dynamic field, rather than reporting them as an error.
+        alternately, change the type="ignored" to some other type e.g. "text" if you want
+        unknown fields indexed and/or stored by default -->
    <!--dynamicField name="*" type="ignored" multiValued="true" /-->
-   
+
  </fields>
 
  <!-- Field to use to determine and enforce document uniqueness.
@@ -708,12 +708,12 @@
     <copyField source="*_t" dest="ezf_sp_words"/>
     <copyField source="*_s" dest="ezf_sp_words"/>
 
-    
-   <!-- Above, multiple source fields are copied to the [text] field. 
-      Another way to map multiple source fields to the same 
-      destination field is to use the dynamic field syntax. 
+
+   <!-- Above, multiple source fields are copied to the [text] field.
+      Another way to map multiple source fields to the same
+      destination field is to use the dynamic field syntax.
       copyField also supports a maxChars to copy setting.  -->
-       
+
    <!-- <copyField source="*_t" dest="text" maxChars="3000"/> -->
 
    <!-- copy name to alphaNameSort, a field designed for sorting by name -->
diff --git a/java/solr.multicore/fre-FR/conf/solrconfig.xml b/java/solr.multicore/fre-FR/conf/solrconfig.xml
index 002b63cf..cdb24b22 100755
--- a/java/solr.multicore/fre-FR/conf/solrconfig.xml
+++ b/java/solr.multicore/fre-FR/conf/solrconfig.xml
@@ -16,9 +16,9 @@
  limitations under the License.
 -->
 
-<!-- 
+<!--
      For more details about configurations options that may appear in
-     this file, see http://wiki.apache.org/solr/SolrConfigXml. 
+     this file, see http://wiki.apache.org/solr/SolrConfigXml.
 -->
 <config>
   <!-- In all configuration below, a prefix of "solr." for class names
@@ -40,7 +40,7 @@
          -Dsolr.abortOnConfigurationError=false
     -->
   <abortOnConfigurationError>${solr.abortOnConfigurationError:true}</abortOnConfigurationError>
-  
+
   <!-- Controls what version of Lucene various components of Solr
        adhere to.  Generally, you want to use the latest version to
        get all bug fixes and improvements. It is highly recommended
@@ -60,7 +60,7 @@
        If a "./lib" directory exists in your instanceDir, all files
        found in it are included as if you had used the following
        syntax...
-       
+
               <lib dir="./lib" />
     -->
   <!-- A dir option by itself adds any files found in the directory to
@@ -85,9 +85,9 @@
        will cause a serious error to be logged if it can't be loaded.
     -->
   <!--
-  <lib path="../a-jar-that-does-not-exist.jar" /> 
+  <lib path="../a-jar-that-does-not-exist.jar" />
   -->
-  
+
   <!-- Data Directory
 
        Used to specify an alternate directory to hold all index data
@@ -100,12 +100,12 @@
 
 
   <!-- The DirectoryFactory to use for indexes.
-       
+
        solr.StandardDirectoryFactory, the default, is filesystem
        based.  solr.RAMDirectoryFactory is memory based, not
        persistent, and doesn't work with replication.
     -->
-  <directoryFactory name="DirectoryFactory" 
+  <directoryFactory name="DirectoryFactory"
                     class="${solr.directoryFactory:solr.StandardDirectoryFactory}"/>
 
 
@@ -127,7 +127,7 @@
          flushed to the Directory.  -->
     <ramBufferSizeMB>32</ramBufferSizeMB>
     <!-- If both ramBufferSizeMB and maxBufferedDocs is set, then
-         Lucene will flush based on whichever limit is hit first.  
+         Lucene will flush based on whichever limit is hit first.
       -->
     <!-- <maxBufferedDocs>1000</maxBufferedDocs> -->
 
@@ -135,16 +135,16 @@
     <writeLockTimeout>1000</writeLockTimeout>
     <commitLockTimeout>10000</commitLockTimeout>
 
-    <!-- Expert: Merge Policy 
+    <!-- Expert: Merge Policy
 
          The Merge Policy in Lucene controls how merging is handled by
          Lucene.  The default in 2.3 is the LogByteSizeMergePolicy,
          previous versions used LogDocMergePolicy.
-         
+
          LogByteSizeMergePolicy chooses segments to merge based on
          their size.  The Lucene 2.2 default, LogDocMergePolicy chose
          when to merge based on number of documents
-         
+
          Other implementations of MergePolicy must have a no-argument
          constructor
       -->
@@ -159,15 +159,15 @@
          can perform merges in the background using separate threads.
          The SerialMergeScheduler (Lucene 2.2 default) does not.
      -->
-    <!-- 
+    <!--
        <mergeScheduler class="org.apache.lucene.index.ConcurrentMergeScheduler"/>
        -->
-      
-    <!-- LockFactory 
+
+    <!-- LockFactory
 
          This option specifies which Lucene LockFactory implementation
          to use.
-      
+
          single = SingleInstanceLockFactory - suggested for a
                   read-only index or when there is no possibility of
                   another process trying to modify the index.
@@ -211,7 +211,7 @@
          This is not needed if lock type is 'none' or 'single'
      -->
     <unlockOnStartup>false</unlockOnStartup>
-    
+
     <!-- If true, IndexReaders will be reopened (often more efficient)
          instead of closed and then opened.
       -->
@@ -227,7 +227,7 @@
          The standard Solr IndexDeletionPolicy implementation supports
          deleting index commit points on number of commits, age of
          commit point and optimized status.
-         
+
          The latest commit point should always be preserved regardless
          of the criteria.
     -->
@@ -247,19 +247,19 @@
     </deletionPolicy>
 
     <!-- Lucene Infostream
-       
+
          To aid in advanced debugging, Lucene provides an "InfoStream"
          of detailed information when indexing.
 
          Setting The value to true will instruct the underlying Lucene
          IndexWriter to write it's debugging info the specified file
       -->
-     <infoStream file="INFOSTREAM.txt">false</infoStream> 
+     <infoStream file="INFOSTREAM.txt">false</infoStream>
 
   </mainIndex>
 
   <!-- JMX
-       
+
        This example enables JMX if and only if an existing MBeanServer
        is found, use this if you want to configure JMX through JVM
        parameters. Remove this to disable exposing Solr configuration
@@ -269,7 +269,7 @@
     -->
   <jmx />
   <!-- If you want to connect to a particular server, specify the
-       agentId 
+       agentId
     -->
   <!-- <jmx agentId="myAgent" /> -->
   <!-- If you want to start a new MBeanServer, specify the serviceUrl -->
@@ -283,7 +283,7 @@
 
          Perform a <commit/> automatically under certain conditions.
          Instead of enabling autoCommit, consider using "commitWithin"
-         when adding documents. 
+         when adding documents.
 
          http://wiki.apache.org/solr/UpdateXmlMessages
 
@@ -292,17 +292,17 @@
 
          maxTime - Maximum amount of time that is allowed to pass
                    since a document was added before automaticly
-                   triggering a new commit. 
+                   triggering a new commit.
       -->
     <!--
-       <autoCommit> 
+       <autoCommit>
          <maxDocs>10000</maxDocs>
-         <maxTime>1000</maxTime> 
+         <maxTime>1000</maxTime>
        </autoCommit>
       -->
 
     <!-- Update Related Event Listeners
-         
+
          Various IndexWriter realted events can trigger Listeners to
          take actions.
 
@@ -311,10 +311,10 @@
       -->
     <!-- The RunExecutableListener executes an external command from a
          hook such as postCommit or postOptimize.
-         
+
          exe - the name of the executable to run
          dir - dir to use as the current working directory. (default=".")
-         wait - the calling thread waits until the executable returns. 
+         wait - the calling thread waits until the executable returns.
                 (default="true")
          args - the arguments to pass to the program.  (default is none)
          env - environment variables to set.  (default is none)
@@ -333,7 +333,7 @@
        </listener>
       -->
   </updateHandler>
-  
+
   <!-- IndexReaderFactory
 
        Use the following format to specify a custom IndexReaderFactory,
@@ -365,7 +365,7 @@
        be specified.
     -->
   <!--
-     <indexReaderFactory name="IndexReaderFactory" 
+     <indexReaderFactory name="IndexReaderFactory"
                          class="solr.StandardIndexReaderFactory">
        <int name="setTermIndexDivisor">12</int>
      </indexReaderFactory >
@@ -379,12 +379,12 @@
          is thrown if exceeded.
 
          ** WARNING **
-         
+
          This option actually modifies a global Lucene property that
          will affect all SolrCores.  If multiple solrconfig.xml files
          disagree on this property, the value at any given moment will
          be based on the last SolrCore to be initialized.
-         
+
       -->
     <maxBooleanClauses>10000</maxBooleanClauses>
 
@@ -392,7 +392,7 @@
 
          There are two implementations of cache available for Solr,
          LRUCache, based on a synchronized LinkedHashMap, and
-         FastLRUCache, based on a ConcurrentHashMap.  
+         FastLRUCache, based on a ConcurrentHashMap.
 
          FastLRUCache has faster gets and slower puts in single
          threaded operation and thus is generally faster than LRUCache
@@ -417,7 +417,7 @@
            initialSize - the initial capacity (number of entries) of
                the cache.  (see java.util.HashMap)
            autowarmCount - the number of entries to prepopulate from
-               and old cache.  
+               and old cache.
       -->
     <filterCache class="solr.FastLRUCache"
                  size="512"
@@ -425,28 +425,28 @@
                  autowarmCount="0"/>
 
     <!-- Query Result Cache
-         
+
          Caches results of searches - ordered lists of document ids
-         (DocList) based on a query, a sort, and the range of documents requested.  
+         (DocList) based on a query, a sort, and the range of documents requested.
       -->
     <queryResultCache class="solr.LRUCache"
                      size="512"
                      initialSize="512"
                      autowarmCount="0"/>
-   
+
     <!-- Document Cache
 
          Caches Lucene Document objects (the stored fields for each
          document).  Since Lucene internal document ids are transient,
-         this cache will not be autowarmed.  
+         this cache will not be autowarmed.
       -->
     <documentCache class="solr.LRUCache"
                    size="512"
                    initialSize="512"
                    autowarmCount="0"/>
-    
+
     <!-- Field Value Cache
-         
+
          Cache used to hold field values that are quickly accessible
          by document id.  The fieldValueCache is created by default
          even if not configured here.
@@ -464,8 +464,8 @@
          name through SolrIndexSearcher.getCache(),cacheLookup(), and
          cacheInsert().  The purpose is to enable easy caching of
          user/application level data.  The regenerator argument should
-         be specified as an implementation of solr.CacheRegenerator 
-         if autowarming is desired.  
+         be specified as an implementation of solr.CacheRegenerator
+         if autowarming is desired.
       -->
     <!--
        <cache name="myUserCache"
@@ -512,12 +512,12 @@
         are collected.  For example, if a search for a particular query
         requests matching documents 10 through 19, and queryWindowSize is 50,
         then documents 0 through 49 will be collected and cached.  Any further
-        requests in that range can be satisfied via the cache.  
+        requests in that range can be satisfied via the cache.
      -->
     <queryResultWindowSize>50</queryResultWindowSize>
 
    <!-- Maximum number of documents to cache for any entry in the
-        queryResultCache. 
+        queryResultCache.
      -->
    <queryResultMaxDocsCached>200</queryResultMaxDocsCached>
 
@@ -535,10 +535,10 @@
         prepared but there is no current registered searcher to handle
         requests or to gain autowarming data from.
 
-        
+
      -->
     <!-- QuerySenderListener takes an array of NamedList and executes a
-         local query request for each NamedList in sequence. 
+         local query request for each NamedList in sequence.
       -->
     <listener event="newSearcher" class="solr.QuerySenderListener">
       <arr name="queries">
@@ -566,7 +566,7 @@
     <useColdSearcher>false</useColdSearcher>
 
     <!-- Max Warming Searchers
-         
+
          Maximum number of searchers that may be warming in the
          background concurrently.  An error is returned if this limit
          is exceeded.
@@ -606,14 +606,14 @@
 
          multipartUploadLimitInKB - specifies the max size of
          Multipart File Uploads that Solr will alow in a Request.
-         
+
          *** WARNING ***
          The settings below authorize Solr to fetch remote files, You
          should make sure your system has some authentication before
          using enableRemoteStreaming="true"
 
-      --> 
-    <requestParsers enableRemoteStreaming="true" 
+      -->
+    <requestParsers enableRemoteStreaming="true"
                     multipartUploadLimitInKB="2048000" />
 
     <!-- HTTP Caching
@@ -627,21 +627,21 @@
     <!-- If you include a <cacheControl> directive, it will be used to
          generate a Cache-Control header (as well as an Expires header
          if the value contains "max-age=")
-         
+
          By default, no Cache-Control header is generated.
-         
+
          You can use the <cacheControl> option even if you have set
          never304="true"
       -->
     <!--
        <httpCaching never304="true" >
-         <cacheControl>max-age=30, public</cacheControl> 
+         <cacheControl>max-age=30, public</cacheControl>
        </httpCaching>
       -->
     <!-- To enable Solr to responde with automaticly generated HTTP
          Caching headers, and to response to Cache Validation requests
          correctly, set the value of never304="false"
-         
+
          This will cause Solr to generate Last-Modified and ETag
          headers based on the properties of the Index.
 
@@ -666,12 +666,12 @@
     <!--
        <httpCaching lastModifiedFrom="openTime"
                     etagSeed="Solr">
-         <cacheControl>max-age=30, public</cacheControl> 
+         <cacheControl>max-age=30, public</cacheControl>
        </httpCaching>
       -->
   </requestDispatcher>
 
-  <!-- Request Handlers 
+  <!-- Request Handlers
 
        http://wiki.apache.org/solr/SolrRequestHandler
 
@@ -685,7 +685,7 @@
        If a /select request is processed with out a qt param
        specified, the requestHandler that declares default="true" will
        be used.
-       
+
        If a Request Handler is declared with startup="lazy", then it will
        not be initialized until the first request that uses it.
 
@@ -845,8 +845,8 @@
      -->
   </requestHandler>
 
-  <!-- XML Update Request Handler.  
-       
+  <!-- XML Update Request Handler.
+
        http://wiki.apache.org/solr/UpdateXmlMessages
 
        The canonical Request Handler for Modifying the Index through
@@ -856,10 +856,10 @@
        type header if posted in the body. For example, curl now
        requires: -H 'Content-type:text/xml; charset=utf-8'
     -->
-  <requestHandler name="/update" 
+  <requestHandler name="/update"
                   class="solr.XmlUpdateRequestHandler">
-    <!-- See below for information on defining 
-         updateRequestProcessorChains that can be used by name 
+    <!-- See below for information on defining
+         updateRequestProcessorChains that can be used by name
          on each Update Request
       -->
     <!--
@@ -871,29 +871,29 @@
   <!-- Binary Update Request Handler
        http://wiki.apache.org/solr/javabin
     -->
-  <requestHandler name="/update/javabin" 
+  <requestHandler name="/update/javabin"
                   class="solr.BinaryUpdateRequestHandler" />
 
   <!-- CSV Update Request Handler
        http://wiki.apache.org/solr/UpdateCSV
     -->
-  <requestHandler name="/update/csv" 
-                  class="solr.CSVRequestHandler" 
+  <requestHandler name="/update/csv"
+                  class="solr.CSVRequestHandler"
                   startup="lazy" />
 
   <!-- JSON Update Request Handler
        http://wiki.apache.org/solr/UpdateJSON
     -->
-  <requestHandler name="/update/json" 
-                  class="solr.JsonUpdateRequestHandler" 
+  <requestHandler name="/update/json"
+                  class="solr.JsonUpdateRequestHandler"
                   startup="lazy" />
 
   <!-- Solr Cell Update Request Handler
 
-       http://wiki.apache.org/solr/ExtractingRequestHandler 
+       http://wiki.apache.org/solr/ExtractingRequestHandler
 
     -->
-  <requestHandler name="/update/extract" 
+  <requestHandler name="/update/extract"
                   startup="lazy"
                   class="solr.extraction.ExtractingRequestHandler" >
     <lst name="defaults">
@@ -928,7 +928,7 @@
            field value analysis will be marked as "matched" for every
            token that is produces by the query analysis
    -->
-  <requestHandler name="/analysis/field" 
+  <requestHandler name="/analysis/field"
                   startup="lazy"
                   class="solr.FieldAnalysisRequestHandler" />
 
@@ -1056,18 +1056,18 @@
     request paraemter that holds the query text to be analyized. It
     also supports the "analysis.showmatch" parameter which when set to
     true, all field tokens that match the query tokens will be marked
-    as a "match". 
+    as a "match".
   -->
-  <requestHandler name="/analysis/document" 
-                  class="solr.DocumentAnalysisRequestHandler" 
+  <requestHandler name="/analysis/document"
+                  class="solr.DocumentAnalysisRequestHandler"
                   startup="lazy" />
 
   <!-- Admin Handlers
 
        Admin Handlers - This will register all the standard admin
-       RequestHandlers.  
+       RequestHandlers.
     -->
-  <requestHandler name="/admin/" 
+  <requestHandler name="/admin/"
                   class="solr.admin.AdminHandlers" />
   <!-- This single handler is equivilent to the following... -->
   <!--
@@ -1079,14 +1079,14 @@
      <requestHandler name="/admin/file"       class="solr.admin.ShowFileRequestHandler" >
     -->
   <!-- If you wish to hide files under ${solr.home}/conf, explicitly
-       register the ShowFileRequestHandler using: 
+       register the ShowFileRequestHandler using:
     -->
   <!--
-     <requestHandler name="/admin/file" 
+     <requestHandler name="/admin/file"
                      class="solr.admin.ShowFileRequestHandler" >
        <lst name="invariants">
-         <str name="hidden">synonyms.txt</str> 
-         <str name="hidden">anotherfile.txt</str> 
+         <str name="hidden">synonyms.txt</str>
+         <str name="hidden">anotherfile.txt</str>
        </lst>
      </requestHandler>
     -->
@@ -1103,11 +1103,11 @@
   <!-- Echo the request contents back to the client -->
   <requestHandler name="/debug/dump" class="solr.DumpRequestHandler" >
     <lst name="defaults">
-     <str name="echoParams">explicit</str> 
+     <str name="echoParams">explicit</str>
      <str name="echoHandler">true</str>
     </lst>
   </requestHandler>
-  
+
   <requestHandler name="ezpublish" class="solr.DisMaxRequestHandler" >
     <lst name="defaults">
       <str name="echoParams">explicit</str>
@@ -1148,7 +1148,7 @@
        The SolrReplicationHandler supports replicating indexes from a
        "master" used for indexing and "salves" used for queries.
 
-       http://wiki.apache.org/solr/SolrReplication 
+       http://wiki.apache.org/solr/SolrReplication
 
        In the example below, remove the <lst name="master"> section if
        this is just a slave and remove  the <lst name="slave"> section
@@ -1170,18 +1170,18 @@
 
   <!-- Search Components
 
-       Search components are registered to SolrCore and used by 
+       Search components are registered to SolrCore and used by
        instances of SearchHandler (which can access them by name)
-       
+
        By default, the following components are avaliable:
-       
+
        <searchComponent name="query"     class="solr.QueryComponent" />
        <searchComponent name="facet"     class="solr.FacetComponent" />
        <searchComponent name="mlt"       class="solr.MoreLikeThisComponent" />
        <searchComponent name="highlight" class="solr.HighlightComponent" />
        <searchComponent name="stats"     class="solr.StatsComponent" />
        <searchComponent name="debug"     class="solr.DebugComponent" />
-   
+
        Default configuration in a requestHandler would look like:
 
        <arr name="components">
@@ -1193,28 +1193,28 @@
          <str>debug</str>
        </arr>
 
-       If you register a searchComponent to one of the standard names, 
+       If you register a searchComponent to one of the standard names,
        that will be used instead of the default.
 
        To insert components before or after the 'standard' components, use:
-    
+
        <arr name="first-components">
          <str>myFirstComponentName</str>
        </arr>
-    
+
        <arr name="last-components">
          <str>myLastComponentName</str>
        </arr>
 
        NOTE: The component registered with the name "debug" will
-       always be executed after the "last-components" 
-       
+       always be executed after the "last-components"
+
      -->
 
    <!-- Spell Check
 
         The spell check component can return a list of alternative spelling
-        suggestions.  
+        suggestions.
 
         http://wiki.apache.org/solr/SpellCheckComponent
      -->
@@ -1248,7 +1248,7 @@
        </lst>
      -->
 
-    <!-- a spellchecker that use an alternate comparator 
+    <!-- a spellchecker that use an alternate comparator
 
          comparatorClass be one of:
           1. score (default)
@@ -1276,7 +1276,7 @@
       -->
   </searchComponent>
 
-  <!-- A request handler for demonstrating the spellcheck component.  
+  <!-- A request handler for demonstrating the spellcheck component.
 
        NOTE: This is purely as an example.  The whole purpose of the
        SpellCheckComponent is to hook it into the request handler that
@@ -1285,7 +1285,7 @@
 
        IN OTHER WORDS, THERE IS REALLY GOOD CHANCE THE SETUP BELOW IS
        NOT WHAT YOU WANT FOR YOUR PRODUCTION SYSTEM!
-       
+
        See http://wiki.apache.org/solr/SpellCheckComponent for details
        on the request parameters.
     -->
@@ -1312,8 +1312,8 @@
 
        This is purely as an example.
 
-       In reality you will likely want to add the component to your 
-       already specified request handlers. 
+       In reality you will likely want to add the component to your
+       already specified request handlers.
     -->
   <requestHandler name="tvrh" class="solr.SearchHandler" startup="lazy">
     <lst name="defaults">
@@ -1335,20 +1335,20 @@
 
           java -Dsolr.clustering.enabled=true -jar start.jar
     -->
-  <searchComponent name="clustering" 
+  <searchComponent name="clustering"
                    enable="${solr.clustering.enabled:false}"
                    class="solr.clustering.ClusteringComponent" >
     <!-- Declare an engine -->
     <lst name="engine">
       <!-- The name, only one can be named "default" -->
       <str name="name">default</str>
-      <!-- Class name of Carrot2 clustering algorithm. 
-           
+      <!-- Class name of Carrot2 clustering algorithm.
+
            Currently available algorithms are:
-           
+
            * org.carrot2.clustering.lingo.LingoClusteringAlgorithm
            * org.carrot2.clustering.stc.STCClusteringAlgorithm
-           
+
            See http://project.carrot2.org/algorithms.html for the
            algorithm's characteristics.
         -->
@@ -1363,9 +1363,9 @@
            name and attribute value as parameter value.
         -->
       <str name="LingoClusteringAlgorithm.desiredClusterCountBase">20</str>
-      
+
       <!-- The language to assume for the documents.
-           
+
            For a list of allowed values, see:
            http://download.carrot2.org/stable/manual/#section.attribute.lingo.MultilingualClustering.defaultLanguage
        -->
@@ -1381,8 +1381,8 @@
 
        This is purely as an example.
 
-       In reality you will likely want to add the component to your 
-       already specified request handlers. 
+       In reality you will likely want to add the component to your
+       already specified request handlers.
     -->
   <requestHandler name="/clustering"
                   startup="lazy"
@@ -1403,7 +1403,7 @@
        <!--<int name="carrot.numDescriptions">5</int>-->
        <!-- produce sub clusters -->
        <bool name="carrot.outputSubClusters">false</bool>
-       
+
        <str name="defType">edismax</str>
        <str name="qf">
           text^0.5 features^1.0 name^1.2 sku^1.5 id^10.0 manu^1.1 cat^1.4
@@ -1411,12 +1411,12 @@
        <str name="q.alt">*:*</str>
        <str name="rows">10</str>
        <str name="fl">*,score</str>
-    </lst>     
+    </lst>
     <arr name="last-components">
       <str>clustering</str>
     </arr>
   </requestHandler>
-  
+
   <!-- Terms Component
 
        http://wiki.apache.org/solr/TermsComponent
@@ -1469,7 +1469,7 @@
     <highlighting>
       <!-- Configure the standard fragmenter -->
       <!-- This could most likely be commented out in the "default" case -->
-      <fragmenter name="gap" 
+      <fragmenter name="gap"
                   default="true"
                   class="solr.highlight.GapFragmenter">
         <lst name="defaults">
@@ -1477,8 +1477,8 @@
         </lst>
       </fragmenter>
 
-      <!-- A regular-expression-based fragmenter 
-           (for sentence extraction) 
+      <!-- A regular-expression-based fragmenter
+           (for sentence extraction)
         -->
       <fragmenter name="regex"
                   class="solr.highlight.RegexFragmenter">
@@ -1493,7 +1493,7 @@
       </fragmenter>
 
       <!-- Configure the standard formatter -->
-      <formatter name="html" 
+      <formatter name="html"
                  default="true"
                  class="solr.highlight.HtmlFormatter">
         <lst name="defaults">
@@ -1503,24 +1503,24 @@
       </formatter>
 
       <!-- Configure the standard encoder -->
-      <encoder name="html" 
+      <encoder name="html"
                default="true"
                class="solr.highlight.HtmlEncoder" />
 
       <!-- Configure the standard fragListBuilder -->
-      <fragListBuilder name="simple" 
+      <fragListBuilder name="simple"
                        default="true"
                        class="solr.highlight.SimpleFragListBuilder"/>
 
       <!-- Configure the single fragListBuilder -->
-      <fragListBuilder name="single" 
+      <fragListBuilder name="single"
                        class="solr.highlight.SingleFragListBuilder"/>
 
       <!-- default tag FragmentsBuilder -->
-      <fragmentsBuilder name="default" 
+      <fragmentsBuilder name="default"
                         default="true"
                         class="solr.highlight.ScoreOrderFragmentsBuilder">
-        <!-- 
+        <!--
         <lst name="defaults">
           <str name="hl.multiValuedSeparatorChar">/</str>
         </lst>
@@ -1528,7 +1528,7 @@
       </fragmentsBuilder>
 
       <!-- multi-colored tag FragmentsBuilder -->
-      <fragmentsBuilder name="colored" 
+      <fragmentsBuilder name="colored"
                         class="solr.highlight.ScoreOrderFragmentsBuilder">
         <lst name="defaults">
           <str name="hl.tag.pre"><![CDATA[
@@ -1551,15 +1551,15 @@
 
        http://wiki.apache.org/solr/UpdateRequestProcessor
 
-    --> 
+    -->
   <!-- Deduplication
 
        An example dedup update processor that creates the "id" field
        on the fly based on the hash code of some other fields.  This
        example has overwriteDupes set to false since we are using the
        id field as the signatureField and Solr will maintain
-       uniqueness based on that anyway.  
-       
+       uniqueness based on that anyway.
+
     -->
   <!--
      <updateRequestProcessorChain name="dedupe">
@@ -1590,7 +1590,7 @@
        overridden...
     -->
   <!--
-     <queryResponseWriter name="xml" 
+     <queryResponseWriter name="xml"
                           default="true"
                           class="solr.XMLResponseWriter" />
      <queryResponseWriter name="json" class="solr.JSONResponseWriter"/>
@@ -1612,7 +1612,7 @@
 
   <!-- XSLT response writer transforms the XML output by any xslt file found
        in Solr's conf/xslt directory.  Changes to xslt files are checked for
-       every xsltCacheLifetimeSeconds.  
+       every xsltCacheLifetimeSeconds.
     -->
   <queryResponseWriter name="xslt" class="solr.XSLTResponseWriter">
     <int name="xsltCacheLifetimeSeconds">5</int>
@@ -1640,7 +1640,7 @@
     -->
   <!-- example of registering a custom function parser  -->
   <!--
-     <valueSourceParser name="myfunc" 
+     <valueSourceParser name="myfunc"
                         class="com.mycompany.MyValueSourceParser" />
     -->
 
@@ -1649,7 +1649,7 @@
     <defaultQuery>*:*</defaultQuery>
 
     <!-- configure a healthcheck file for servers behind a
-         loadbalancer 
+         loadbalancer
       -->
     <!--
        <healthcheck type="file">server-enabled</healthcheck>
diff --git a/java/solr.multicore/fre-FR/conf/xslt/example.xsl b/java/solr.multicore/fre-FR/conf/xslt/example.xsl
index b8992700..aa546593 100644
--- a/java/solr.multicore/fre-FR/conf/xslt/example.xsl
+++ b/java/solr.multicore/fre-FR/conf/xslt/example.xsl
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 
-<!-- 
+<!--
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.
@@ -17,17 +17,17 @@
  * limitations under the License.
  -->
 
-<!-- 
+<!--
   Simple transform of Solr query results to HTML
  -->
 <xsl:stylesheet version='1.0'
     xmlns:xsl='http://www.w3.org/1999/XSL/Transform'
 >
 
-  <xsl:output media-type="text/html" encoding="UTF-8"/> 
-  
+  <xsl:output media-type="text/html" encoding="UTF-8"/>
+
   <xsl:variable name="title" select="concat('Solr search results (',response/result/@numFound,' documents)')"/>
-  
+
   <xsl:template match='/'>
     <html>
       <head>
@@ -44,7 +44,7 @@
       </body>
     </html>
   </xsl:template>
-  
+
   <xsl:template match="doc">
     <xsl:variable name="pos" select="position()"/>
     <div class="doc">
@@ -110,7 +110,7 @@
   </xsl:template>
 
   <xsl:template match="*"/>
-  
+
   <xsl:template name="css">
     <script>
       function toggle(id) {
diff --git a/java/solr.multicore/fre-FR/conf/xslt/example_atom.xsl b/java/solr.multicore/fre-FR/conf/xslt/example_atom.xsl
index b6c23151..86e77507 100644
--- a/java/solr.multicore/fre-FR/conf/xslt/example_atom.xsl
+++ b/java/solr.multicore/fre-FR/conf/xslt/example_atom.xsl
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 
-<!-- 
+<!--
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.
@@ -17,7 +17,7 @@
  * limitations under the License.
  -->
 
-<!-- 
+<!--
   Simple transform of Solr query results to Atom
  -->
 
@@ -42,7 +42,7 @@
         <name>Apache Solr</name>
         <email>solr-user@lucene.apache.org</email>
       </author>
-      <link rel="self" type="application/atom+xml" 
+      <link rel="self" type="application/atom+xml"
             href="http://localhost:8983/solr/q={$query}&amp;wt=xslt&amp;tr=atom.xsl"/>
       <updated>
         <xsl:value-of select="response/result/doc[position()=1]/date[@name='timestamp']"/>
@@ -51,7 +51,7 @@
       <xsl:apply-templates select="response/result/doc"/>
     </feed>
   </xsl:template>
-    
+
   <!-- search results xslt -->
   <xsl:template match="doc">
     <xsl:variable name="id" select="str[@name='id']"/>
diff --git a/java/solr.multicore/fre-FR/conf/xslt/example_rss.xsl b/java/solr.multicore/fre-FR/conf/xslt/example_rss.xsl
index 2857f117..407e65a7 100644
--- a/java/solr.multicore/fre-FR/conf/xslt/example_rss.xsl
+++ b/java/solr.multicore/fre-FR/conf/xslt/example_rss.xsl
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 
-<!-- 
+<!--
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.
@@ -17,7 +17,7 @@
  * limitations under the License.
  -->
 
-<!-- 
+<!--
   Simple transform of Solr query results to RSS
  -->
 
@@ -44,7 +44,7 @@
        </channel>
     </rss>
   </xsl:template>
-  
+
   <!-- search results xslt -->
   <xsl:template match="doc">
     <xsl:variable name="id" select="str[@name='id']"/>
diff --git a/java/solr.multicore/fre-FR/conf/xslt/luke.xsl b/java/solr.multicore/fre-FR/conf/xslt/luke.xsl
index 8553f3c6..6e988afe 100644
--- a/java/solr.multicore/fre-FR/conf/xslt/luke.xsl
+++ b/java/solr.multicore/fre-FR/conf/xslt/luke.xsl
@@ -6,9 +6,9 @@
     The ASF licenses this file to You under the Apache License, Version 2.0
     (the "License"); you may not use this file except in compliance with
     the License.  You may obtain a copy of the License at
-    
+
     http://www.apache.org/licenses/LICENSE-2.0
-    
+
     Unless required by applicable law or agreed to in writing, software
     distributed under the License is distributed on an "AS IS" BASIS,
     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -17,7 +17,7 @@
 -->
 
 
-<!-- 
+<!--
   Display the luke request handler with graphs
  -->
 <xsl:stylesheet
@@ -190,7 +190,7 @@
                  <div class="histogram">
                   <xsl:attribute name="style">background-color: <xsl:value-of select="$fill"/>; width: <xsl:value-of select="$bar_width"/>px; height: <xsl:value-of select="($iheight*number(.)) div $max"/>px;</xsl:attribute>
                  </div>
-                   </td> 
+                   </td>
                 </xsl:for-each>
               </tr>
               <tr>
diff --git a/java/solr.multicore/nor-NO/conf/mapping-FoldToASCII.txt b/java/solr.multicore/nor-NO/conf/mapping-FoldToASCII.txt
index 9a84b6ea..e59baf7d 100644
--- a/java/solr.multicore/nor-NO/conf/mapping-FoldToASCII.txt
+++ b/java/solr.multicore/nor-NO/conf/mapping-FoldToASCII.txt
@@ -34,7 +34,7 @@
 # - Supplemental Punctuation: http://www.unicode.org/charts/PDF/U2E00.pdf
 # - Alphabetic Presentation Forms: http://www.unicode.org/charts/PDF/UFB00.pdf
 # - Halfwidth and Fullwidth Forms: http://www.unicode.org/charts/PDF/UFF00.pdf
-#  
+#
 # See: http://en.wikipedia.org/wiki/Latin_characters_in_Unicode
 #
 # The set of character conversions supported by this map is a superset of
@@ -3785,11 +3785,11 @@
 #
 # use warnings;
 # use strict;
-# 
+#
 # my @source_chars = ();
 # my @source_char_descriptions = ();
 # my $target = '';
-# 
+#
 # while (<>) {
 #   if (/case\s+'(\\u[A-F0-9]+)':\s*\/\/\s*(.*)/i) {
 #     push @source_chars, $1;
diff --git a/java/solr.multicore/nor-NO/conf/schema.xml b/java/solr.multicore/nor-NO/conf/schema.xml
index 47dbe3a2..87b854db 100644
--- a/java/solr.multicore/nor-NO/conf/schema.xml
+++ b/java/solr.multicore/nor-NO/conf/schema.xml
@@ -304,7 +304,7 @@
 
 
     <!-- A general unstemmed text field that indexes tokens normally and also
-         reversed (via ReversedWildcardFilterFactory), to enable more efficient 
+         reversed (via ReversedWildcardFilterFactory), to enable more efficient
      leading wildcard queries. -->
     <fieldType name="text_rev" class="solr.TextField" positionIncrementGap="100">
       <analyzer type="index">
@@ -344,7 +344,7 @@
         <tokenizer class="solr.StandardTokenizerFactory"/>
         <filter class="solr.StopFilterFactory" ignoreCase="true" words="stopwords.txt"/>
         <filter class="solr.StandardFilterFactory"/>
-        <filter class="solr.LowerCaseFilterFactory"/> 
+        <filter class="solr.LowerCaseFilterFactory"/>
         <filter class="solr.WordDelimiterFilterFactory" generateWordParts="0" splitOnNumerics="0" generateNumberParts="0" catenateWords="0" catenateNumbers="0" catenateAll="0" splitOnCaseChange="1"/>
         <filter class="solr.RemoveDuplicatesTokenFilterFactory"/>
        </analyzer>
@@ -361,11 +361,11 @@
  <!-- eZ Find: This field type is dedicated to Elevate.  -->
     <fieldType name="elevate_string" stored="false" indexed="false" class="solr.TextField">
           <analyzer>
-              <tokenizer class="solr.WhitespaceTokenizerFactory"/>        
+              <tokenizer class="solr.WhitespaceTokenizerFactory"/>
               <filter class="solr.LowerCaseFilterFactory"/>
           </analyzer>
     </fieldType>
-    
+
 <!-- eZ Find: This field type is dedicated to ez publish keywords.  -->
     <fieldtype name="keyword" class="solr.TextField" positionIncrementGap="100">
          <analyzer type="index">
@@ -475,7 +475,7 @@
     </fieldType>
 
     <!-- since fields of this type are by default not stored or indexed,
-         any data added to them will be ignored outright.  --> 
+         any data added to them will be ignored outright.  -->
     <fieldtype name="ignored" stored="false" indexed="false" multiValued="true" class="solr.StrField" />
     <!-- The geopoint type holds latitude / longitude information
       implictely it holds several subfields-->
@@ -483,7 +483,7 @@
 
     <!-- This point type indexes the coordinates as separate fields (subFields)
       If subFieldType is defined, it references a type, and a dynamic field
-      definition is created matching *___<typename>.  Alternately, if 
+      definition is created matching *___<typename>.  Alternately, if
       subFieldSuffix is defined, that is used to create the subFields.
       Example: if subFieldType="double", then the coordinates would be
         indexed in fields myloc_0___double,myloc_1___double.
@@ -544,8 +544,8 @@
    <field name="meta_name_t" type="text" indexed="true" stored="true" termVectors="true"/>  <!-- Object name -->
    <field name="meta_sort_name_ms" type="mtext" indexed="true" stored="true"/>  <!-- Object name for sorting (not tokenized) -->
    <field name="meta_main_node_id_si" type="sint" indexed="true" stored="true"/>           <!-- Main node ID -->
-   <field name="meta_language_code_ms" type="mstring" indexed="true" stored="true"/>          <!-- Language code --> 
-   <field name="meta_available_language_codes_ms" type="mstring" indexed="true" stored="true" multiValued="true"/>          <!-- List of available language codes in the corresponding content object -->    
+   <field name="meta_language_code_ms" type="mstring" indexed="true" stored="true"/>          <!-- Language code -->
+   <field name="meta_available_language_codes_ms" type="mstring" indexed="true" stored="true" multiValued="true"/>          <!-- List of available language codes in the corresponding content object -->
    <field name="meta_anon_access_b" type="boolean" indexed="true" stored="false" />         <!-- Anonymous user access to object -->
    <field name="meta_object_states_si" type="sint" indexed="true" stored="true" multiValued="true"/>                     <!-- Object states -->
 
@@ -676,12 +676,12 @@
 
       <field name="ezf_df_text" type="text"    indexed="true"  stored="true" multiValued="true" termVectors="true"/>
 
-   <!-- uncomment the following to ignore any fields that don't already match an existing 
-        field name or dynamic field, rather than reporting them as an error. 
-        alternately, change the type="ignored" to some other type e.g. "text" if you want 
-        unknown fields indexed and/or stored by default --> 
+   <!-- uncomment the following to ignore any fields that don't already match an existing
+        field name or dynamic field, rather than reporting them as an error.
+        alternately, change the type="ignored" to some other type e.g. "text" if you want
+        unknown fields indexed and/or stored by default -->
    <!--dynamicField name="*" type="ignored" multiValued="true" /-->
-   
+
  </fields>
 
  <!-- Field to use to determine and enforce document uniqueness.
@@ -708,12 +708,12 @@
     <copyField source="*_t" dest="ezf_sp_words"/>
     <copyField source="*_s" dest="ezf_sp_words"/>
 
-    
-   <!-- Above, multiple source fields are copied to the [text] field. 
-      Another way to map multiple source fields to the same 
-      destination field is to use the dynamic field syntax. 
+
+   <!-- Above, multiple source fields are copied to the [text] field.
+      Another way to map multiple source fields to the same
+      destination field is to use the dynamic field syntax.
       copyField also supports a maxChars to copy setting.  -->
-       
+
    <!-- <copyField source="*_t" dest="text" maxChars="3000"/> -->
 
    <!-- copy name to alphaNameSort, a field designed for sorting by name -->
diff --git a/java/solr.multicore/nor-NO/conf/solrconfig.xml b/java/solr.multicore/nor-NO/conf/solrconfig.xml
index 002b63cf..cdb24b22 100644
--- a/java/solr.multicore/nor-NO/conf/solrconfig.xml
+++ b/java/solr.multicore/nor-NO/conf/solrconfig.xml
@@ -16,9 +16,9 @@
  limitations under the License.
 -->
 
-<!-- 
+<!--
      For more details about configurations options that may appear in
-     this file, see http://wiki.apache.org/solr/SolrConfigXml. 
+     this file, see http://wiki.apache.org/solr/SolrConfigXml.
 -->
 <config>
   <!-- In all configuration below, a prefix of "solr." for class names
@@ -40,7 +40,7 @@
          -Dsolr.abortOnConfigurationError=false
     -->
   <abortOnConfigurationError>${solr.abortOnConfigurationError:true}</abortOnConfigurationError>
-  
+
   <!-- Controls what version of Lucene various components of Solr
        adhere to.  Generally, you want to use the latest version to
        get all bug fixes and improvements. It is highly recommended
@@ -60,7 +60,7 @@
        If a "./lib" directory exists in your instanceDir, all files
        found in it are included as if you had used the following
        syntax...
-       
+
               <lib dir="./lib" />
     -->
   <!-- A dir option by itself adds any files found in the directory to
@@ -85,9 +85,9 @@
        will cause a serious error to be logged if it can't be loaded.
     -->
   <!--
-  <lib path="../a-jar-that-does-not-exist.jar" /> 
+  <lib path="../a-jar-that-does-not-exist.jar" />
   -->
-  
+
   <!-- Data Directory
 
        Used to specify an alternate directory to hold all index data
@@ -100,12 +100,12 @@
 
 
   <!-- The DirectoryFactory to use for indexes.
-       
+
        solr.StandardDirectoryFactory, the default, is filesystem
        based.  solr.RAMDirectoryFactory is memory based, not
        persistent, and doesn't work with replication.
     -->
-  <directoryFactory name="DirectoryFactory" 
+  <directoryFactory name="DirectoryFactory"
                     class="${solr.directoryFactory:solr.StandardDirectoryFactory}"/>
 
 
@@ -127,7 +127,7 @@
          flushed to the Directory.  -->
     <ramBufferSizeMB>32</ramBufferSizeMB>
     <!-- If both ramBufferSizeMB and maxBufferedDocs is set, then
-         Lucene will flush based on whichever limit is hit first.  
+         Lucene will flush based on whichever limit is hit first.
       -->
     <!-- <maxBufferedDocs>1000</maxBufferedDocs> -->
 
@@ -135,16 +135,16 @@
     <writeLockTimeout>1000</writeLockTimeout>
     <commitLockTimeout>10000</commitLockTimeout>
 
-    <!-- Expert: Merge Policy 
+    <!-- Expert: Merge Policy
 
          The Merge Policy in Lucene controls how merging is handled by
          Lucene.  The default in 2.3 is the LogByteSizeMergePolicy,
          previous versions used LogDocMergePolicy.
-         
+
          LogByteSizeMergePolicy chooses segments to merge based on
          their size.  The Lucene 2.2 default, LogDocMergePolicy chose
          when to merge based on number of documents
-         
+
          Other implementations of MergePolicy must have a no-argument
          constructor
       -->
@@ -159,15 +159,15 @@
          can perform merges in the background using separate threads.
          The SerialMergeScheduler (Lucene 2.2 default) does not.
      -->
-    <!-- 
+    <!--
        <mergeScheduler class="org.apache.lucene.index.ConcurrentMergeScheduler"/>
        -->
-      
-    <!-- LockFactory 
+
+    <!-- LockFactory
 
          This option specifies which Lucene LockFactory implementation
          to use.
-      
+
          single = SingleInstanceLockFactory - suggested for a
                   read-only index or when there is no possibility of
                   another process trying to modify the index.
@@ -211,7 +211,7 @@
          This is not needed if lock type is 'none' or 'single'
      -->
     <unlockOnStartup>false</unlockOnStartup>
-    
+
     <!-- If true, IndexReaders will be reopened (often more efficient)
          instead of closed and then opened.
       -->
@@ -227,7 +227,7 @@
          The standard Solr IndexDeletionPolicy implementation supports
          deleting index commit points on number of commits, age of
          commit point and optimized status.
-         
+
          The latest commit point should always be preserved regardless
          of the criteria.
     -->
@@ -247,19 +247,19 @@
     </deletionPolicy>
 
     <!-- Lucene Infostream
-       
+
          To aid in advanced debugging, Lucene provides an "InfoStream"
          of detailed information when indexing.
 
          Setting The value to true will instruct the underlying Lucene
          IndexWriter to write it's debugging info the specified file
       -->
-     <infoStream file="INFOSTREAM.txt">false</infoStream> 
+     <infoStream file="INFOSTREAM.txt">false</infoStream>
 
   </mainIndex>
 
   <!-- JMX
-       
+
        This example enables JMX if and only if an existing MBeanServer
        is found, use this if you want to configure JMX through JVM
        parameters. Remove this to disable exposing Solr configuration
@@ -269,7 +269,7 @@
     -->
   <jmx />
   <!-- If you want to connect to a particular server, specify the
-       agentId 
+       agentId
     -->
   <!-- <jmx agentId="myAgent" /> -->
   <!-- If you want to start a new MBeanServer, specify the serviceUrl -->
@@ -283,7 +283,7 @@
 
          Perform a <commit/> automatically under certain conditions.
          Instead of enabling autoCommit, consider using "commitWithin"
-         when adding documents. 
+         when adding documents.
 
          http://wiki.apache.org/solr/UpdateXmlMessages
 
@@ -292,17 +292,17 @@
 
          maxTime - Maximum amount of time that is allowed to pass
                    since a document was added before automaticly
-                   triggering a new commit. 
+                   triggering a new commit.
       -->
     <!--
-       <autoCommit> 
+       <autoCommit>
          <maxDocs>10000</maxDocs>
-         <maxTime>1000</maxTime> 
+         <maxTime>1000</maxTime>
        </autoCommit>
       -->
 
     <!-- Update Related Event Listeners
-         
+
          Various IndexWriter realted events can trigger Listeners to
          take actions.
 
@@ -311,10 +311,10 @@
       -->
     <!-- The RunExecutableListener executes an external command from a
          hook such as postCommit or postOptimize.
-         
+
          exe - the name of the executable to run
          dir - dir to use as the current working directory. (default=".")
-         wait - the calling thread waits until the executable returns. 
+         wait - the calling thread waits until the executable returns.
                 (default="true")
          args - the arguments to pass to the program.  (default is none)
          env - environment variables to set.  (default is none)
@@ -333,7 +333,7 @@
        </listener>
       -->
   </updateHandler>
-  
+
   <!-- IndexReaderFactory
 
        Use the following format to specify a custom IndexReaderFactory,
@@ -365,7 +365,7 @@
        be specified.
     -->
   <!--
-     <indexReaderFactory name="IndexReaderFactory" 
+     <indexReaderFactory name="IndexReaderFactory"
                          class="solr.StandardIndexReaderFactory">
        <int name="setTermIndexDivisor">12</int>
      </indexReaderFactory >
@@ -379,12 +379,12 @@
          is thrown if exceeded.
 
          ** WARNING **
-         
+
          This option actually modifies a global Lucene property that
          will affect all SolrCores.  If multiple solrconfig.xml files
          disagree on this property, the value at any given moment will
          be based on the last SolrCore to be initialized.
-         
+
       -->
     <maxBooleanClauses>10000</maxBooleanClauses>
 
@@ -392,7 +392,7 @@
 
          There are two implementations of cache available for Solr,
          LRUCache, based on a synchronized LinkedHashMap, and
-         FastLRUCache, based on a ConcurrentHashMap.  
+         FastLRUCache, based on a ConcurrentHashMap.
 
          FastLRUCache has faster gets and slower puts in single
          threaded operation and thus is generally faster than LRUCache
@@ -417,7 +417,7 @@
            initialSize - the initial capacity (number of entries) of
                the cache.  (see java.util.HashMap)
            autowarmCount - the number of entries to prepopulate from
-               and old cache.  
+               and old cache.
       -->
     <filterCache class="solr.FastLRUCache"
                  size="512"
@@ -425,28 +425,28 @@
                  autowarmCount="0"/>
 
     <!-- Query Result Cache
-         
+
          Caches results of searches - ordered lists of document ids
-         (DocList) based on a query, a sort, and the range of documents requested.  
+         (DocList) based on a query, a sort, and the range of documents requested.
       -->
     <queryResultCache class="solr.LRUCache"
                      size="512"
                      initialSize="512"
                      autowarmCount="0"/>
-   
+
     <!-- Document Cache
 
          Caches Lucene Document objects (the stored fields for each
          document).  Since Lucene internal document ids are transient,
-         this cache will not be autowarmed.  
+         this cache will not be autowarmed.
       -->
     <documentCache class="solr.LRUCache"
                    size="512"
                    initialSize="512"
                    autowarmCount="0"/>
-    
+
     <!-- Field Value Cache
-         
+
          Cache used to hold field values that are quickly accessible
          by document id.  The fieldValueCache is created by default
          even if not configured here.
@@ -464,8 +464,8 @@
          name through SolrIndexSearcher.getCache(),cacheLookup(), and
          cacheInsert().  The purpose is to enable easy caching of
          user/application level data.  The regenerator argument should
-         be specified as an implementation of solr.CacheRegenerator 
-         if autowarming is desired.  
+         be specified as an implementation of solr.CacheRegenerator
+         if autowarming is desired.
       -->
     <!--
        <cache name="myUserCache"
@@ -512,12 +512,12 @@
         are collected.  For example, if a search for a particular query
         requests matching documents 10 through 19, and queryWindowSize is 50,
         then documents 0 through 49 will be collected and cached.  Any further
-        requests in that range can be satisfied via the cache.  
+        requests in that range can be satisfied via the cache.
      -->
     <queryResultWindowSize>50</queryResultWindowSize>
 
    <!-- Maximum number of documents to cache for any entry in the
-        queryResultCache. 
+        queryResultCache.
      -->
    <queryResultMaxDocsCached>200</queryResultMaxDocsCached>
 
@@ -535,10 +535,10 @@
         prepared but there is no current registered searcher to handle
         requests or to gain autowarming data from.
 
-        
+
      -->
     <!-- QuerySenderListener takes an array of NamedList and executes a
-         local query request for each NamedList in sequence. 
+         local query request for each NamedList in sequence.
       -->
     <listener event="newSearcher" class="solr.QuerySenderListener">
       <arr name="queries">
@@ -566,7 +566,7 @@
     <useColdSearcher>false</useColdSearcher>
 
     <!-- Max Warming Searchers
-         
+
          Maximum number of searchers that may be warming in the
          background concurrently.  An error is returned if this limit
          is exceeded.
@@ -606,14 +606,14 @@
 
          multipartUploadLimitInKB - specifies the max size of
          Multipart File Uploads that Solr will alow in a Request.
-         
+
          *** WARNING ***
          The settings below authorize Solr to fetch remote files, You
          should make sure your system has some authentication before
          using enableRemoteStreaming="true"
 
-      --> 
-    <requestParsers enableRemoteStreaming="true" 
+      -->
+    <requestParsers enableRemoteStreaming="true"
                     multipartUploadLimitInKB="2048000" />
 
     <!-- HTTP Caching
@@ -627,21 +627,21 @@
     <!-- If you include a <cacheControl> directive, it will be used to
          generate a Cache-Control header (as well as an Expires header
          if the value contains "max-age=")
-         
+
          By default, no Cache-Control header is generated.
-         
+
          You can use the <cacheControl> option even if you have set
          never304="true"
       -->
     <!--
        <httpCaching never304="true" >
-         <cacheControl>max-age=30, public</cacheControl> 
+         <cacheControl>max-age=30, public</cacheControl>
        </httpCaching>
       -->
     <!-- To enable Solr to responde with automaticly generated HTTP
          Caching headers, and to response to Cache Validation requests
          correctly, set the value of never304="false"
-         
+
          This will cause Solr to generate Last-Modified and ETag
          headers based on the properties of the Index.
 
@@ -666,12 +666,12 @@
     <!--
        <httpCaching lastModifiedFrom="openTime"
                     etagSeed="Solr">
-         <cacheControl>max-age=30, public</cacheControl> 
+         <cacheControl>max-age=30, public</cacheControl>
        </httpCaching>
       -->
   </requestDispatcher>
 
-  <!-- Request Handlers 
+  <!-- Request Handlers
 
        http://wiki.apache.org/solr/SolrRequestHandler
 
@@ -685,7 +685,7 @@
        If a /select request is processed with out a qt param
        specified, the requestHandler that declares default="true" will
        be used.
-       
+
        If a Request Handler is declared with startup="lazy", then it will
        not be initialized until the first request that uses it.
 
@@ -845,8 +845,8 @@
      -->
   </requestHandler>
 
-  <!-- XML Update Request Handler.  
-       
+  <!-- XML Update Request Handler.
+
        http://wiki.apache.org/solr/UpdateXmlMessages
 
        The canonical Request Handler for Modifying the Index through
@@ -856,10 +856,10 @@
        type header if posted in the body. For example, curl now
        requires: -H 'Content-type:text/xml; charset=utf-8'
     -->
-  <requestHandler name="/update" 
+  <requestHandler name="/update"
                   class="solr.XmlUpdateRequestHandler">
-    <!-- See below for information on defining 
-         updateRequestProcessorChains that can be used by name 
+    <!-- See below for information on defining
+         updateRequestProcessorChains that can be used by name
          on each Update Request
       -->
     <!--
@@ -871,29 +871,29 @@
   <!-- Binary Update Request Handler
        http://wiki.apache.org/solr/javabin
     -->
-  <requestHandler name="/update/javabin" 
+  <requestHandler name="/update/javabin"
                   class="solr.BinaryUpdateRequestHandler" />
 
   <!-- CSV Update Request Handler
        http://wiki.apache.org/solr/UpdateCSV
     -->
-  <requestHandler name="/update/csv" 
-                  class="solr.CSVRequestHandler" 
+  <requestHandler name="/update/csv"
+                  class="solr.CSVRequestHandler"
                   startup="lazy" />
 
   <!-- JSON Update Request Handler
        http://wiki.apache.org/solr/UpdateJSON
     -->
-  <requestHandler name="/update/json" 
-                  class="solr.JsonUpdateRequestHandler" 
+  <requestHandler name="/update/json"
+                  class="solr.JsonUpdateRequestHandler"
                   startup="lazy" />
 
   <!-- Solr Cell Update Request Handler
 
-       http://wiki.apache.org/solr/ExtractingRequestHandler 
+       http://wiki.apache.org/solr/ExtractingRequestHandler
 
     -->
-  <requestHandler name="/update/extract" 
+  <requestHandler name="/update/extract"
                   startup="lazy"
                   class="solr.extraction.ExtractingRequestHandler" >
     <lst name="defaults">
@@ -928,7 +928,7 @@
            field value analysis will be marked as "matched" for every
            token that is produces by the query analysis
    -->
-  <requestHandler name="/analysis/field" 
+  <requestHandler name="/analysis/field"
                   startup="lazy"
                   class="solr.FieldAnalysisRequestHandler" />
 
@@ -1056,18 +1056,18 @@
     request paraemter that holds the query text to be analyized. It
     also supports the "analysis.showmatch" parameter which when set to
     true, all field tokens that match the query tokens will be marked
-    as a "match". 
+    as a "match".
   -->
-  <requestHandler name="/analysis/document" 
-                  class="solr.DocumentAnalysisRequestHandler" 
+  <requestHandler name="/analysis/document"
+                  class="solr.DocumentAnalysisRequestHandler"
                   startup="lazy" />
 
   <!-- Admin Handlers
 
        Admin Handlers - This will register all the standard admin
-       RequestHandlers.  
+       RequestHandlers.
     -->
-  <requestHandler name="/admin/" 
+  <requestHandler name="/admin/"
                   class="solr.admin.AdminHandlers" />
   <!-- This single handler is equivilent to the following... -->
   <!--
@@ -1079,14 +1079,14 @@
      <requestHandler name="/admin/file"       class="solr.admin.ShowFileRequestHandler" >
     -->
   <!-- If you wish to hide files under ${solr.home}/conf, explicitly
-       register the ShowFileRequestHandler using: 
+       register the ShowFileRequestHandler using:
     -->
   <!--
-     <requestHandler name="/admin/file" 
+     <requestHandler name="/admin/file"
                      class="solr.admin.ShowFileRequestHandler" >
        <lst name="invariants">
-         <str name="hidden">synonyms.txt</str> 
-         <str name="hidden">anotherfile.txt</str> 
+         <str name="hidden">synonyms.txt</str>
+         <str name="hidden">anotherfile.txt</str>
        </lst>
      </requestHandler>
     -->
@@ -1103,11 +1103,11 @@
   <!-- Echo the request contents back to the client -->
   <requestHandler name="/debug/dump" class="solr.DumpRequestHandler" >
     <lst name="defaults">
-     <str name="echoParams">explicit</str> 
+     <str name="echoParams">explicit</str>
      <str name="echoHandler">true</str>
     </lst>
   </requestHandler>
-  
+
   <requestHandler name="ezpublish" class="solr.DisMaxRequestHandler" >
     <lst name="defaults">
       <str name="echoParams">explicit</str>
@@ -1148,7 +1148,7 @@
        The SolrReplicationHandler supports replicating indexes from a
        "master" used for indexing and "salves" used for queries.
 
-       http://wiki.apache.org/solr/SolrReplication 
+       http://wiki.apache.org/solr/SolrReplication
 
        In the example below, remove the <lst name="master"> section if
        this is just a slave and remove  the <lst name="slave"> section
@@ -1170,18 +1170,18 @@
 
   <!-- Search Components
 
-       Search components are registered to SolrCore and used by 
+       Search components are registered to SolrCore and used by
        instances of SearchHandler (which can access them by name)
-       
+
        By default, the following components are avaliable:
-       
+
        <searchComponent name="query"     class="solr.QueryComponent" />
        <searchComponent name="facet"     class="solr.FacetComponent" />
        <searchComponent name="mlt"       class="solr.MoreLikeThisComponent" />
        <searchComponent name="highlight" class="solr.HighlightComponent" />
        <searchComponent name="stats"     class="solr.StatsComponent" />
        <searchComponent name="debug"     class="solr.DebugComponent" />
-   
+
        Default configuration in a requestHandler would look like:
 
        <arr name="components">
@@ -1193,28 +1193,28 @@
          <str>debug</str>
        </arr>
 
-       If you register a searchComponent to one of the standard names, 
+       If you register a searchComponent to one of the standard names,
        that will be used instead of the default.
 
        To insert components before or after the 'standard' components, use:
-    
+
        <arr name="first-components">
          <str>myFirstComponentName</str>
        </arr>
-    
+
        <arr name="last-components">
          <str>myLastComponentName</str>
        </arr>
 
        NOTE: The component registered with the name "debug" will
-       always be executed after the "last-components" 
-       
+       always be executed after the "last-components"
+
      -->
 
    <!-- Spell Check
 
         The spell check component can return a list of alternative spelling
-        suggestions.  
+        suggestions.
 
         http://wiki.apache.org/solr/SpellCheckComponent
      -->
@@ -1248,7 +1248,7 @@
        </lst>
      -->
 
-    <!-- a spellchecker that use an alternate comparator 
+    <!-- a spellchecker that use an alternate comparator
 
          comparatorClass be one of:
           1. score (default)
@@ -1276,7 +1276,7 @@
       -->
   </searchComponent>
 
-  <!-- A request handler for demonstrating the spellcheck component.  
+  <!-- A request handler for demonstrating the spellcheck component.
 
        NOTE: This is purely as an example.  The whole purpose of the
        SpellCheckComponent is to hook it into the request handler that
@@ -1285,7 +1285,7 @@
 
        IN OTHER WORDS, THERE IS REALLY GOOD CHANCE THE SETUP BELOW IS
        NOT WHAT YOU WANT FOR YOUR PRODUCTION SYSTEM!
-       
+
        See http://wiki.apache.org/solr/SpellCheckComponent for details
        on the request parameters.
     -->
@@ -1312,8 +1312,8 @@
 
        This is purely as an example.
 
-       In reality you will likely want to add the component to your 
-       already specified request handlers. 
+       In reality you will likely want to add the component to your
+       already specified request handlers.
     -->
   <requestHandler name="tvrh" class="solr.SearchHandler" startup="lazy">
     <lst name="defaults">
@@ -1335,20 +1335,20 @@
 
           java -Dsolr.clustering.enabled=true -jar start.jar
     -->
-  <searchComponent name="clustering" 
+  <searchComponent name="clustering"
                    enable="${solr.clustering.enabled:false}"
                    class="solr.clustering.ClusteringComponent" >
     <!-- Declare an engine -->
     <lst name="engine">
       <!-- The name, only one can be named "default" -->
       <str name="name">default</str>
-      <!-- Class name of Carrot2 clustering algorithm. 
-           
+      <!-- Class name of Carrot2 clustering algorithm.
+
            Currently available algorithms are:
-           
+
            * org.carrot2.clustering.lingo.LingoClusteringAlgorithm
            * org.carrot2.clustering.stc.STCClusteringAlgorithm
-           
+
            See http://project.carrot2.org/algorithms.html for the
            algorithm's characteristics.
         -->
@@ -1363,9 +1363,9 @@
            name and attribute value as parameter value.
         -->
       <str name="LingoClusteringAlgorithm.desiredClusterCountBase">20</str>
-      
+
       <!-- The language to assume for the documents.
-           
+
            For a list of allowed values, see:
            http://download.carrot2.org/stable/manual/#section.attribute.lingo.MultilingualClustering.defaultLanguage
        -->
@@ -1381,8 +1381,8 @@
 
        This is purely as an example.
 
-       In reality you will likely want to add the component to your 
-       already specified request handlers. 
+       In reality you will likely want to add the component to your
+       already specified request handlers.
     -->
   <requestHandler name="/clustering"
                   startup="lazy"
@@ -1403,7 +1403,7 @@
        <!--<int name="carrot.numDescriptions">5</int>-->
        <!-- produce sub clusters -->
        <bool name="carrot.outputSubClusters">false</bool>
-       
+
        <str name="defType">edismax</str>
        <str name="qf">
           text^0.5 features^1.0 name^1.2 sku^1.5 id^10.0 manu^1.1 cat^1.4
@@ -1411,12 +1411,12 @@
        <str name="q.alt">*:*</str>
        <str name="rows">10</str>
        <str name="fl">*,score</str>
-    </lst>     
+    </lst>
     <arr name="last-components">
       <str>clustering</str>
     </arr>
   </requestHandler>
-  
+
   <!-- Terms Component
 
        http://wiki.apache.org/solr/TermsComponent
@@ -1469,7 +1469,7 @@
     <highlighting>
       <!-- Configure the standard fragmenter -->
       <!-- This could most likely be commented out in the "default" case -->
-      <fragmenter name="gap" 
+      <fragmenter name="gap"
                   default="true"
                   class="solr.highlight.GapFragmenter">
         <lst name="defaults">
@@ -1477,8 +1477,8 @@
         </lst>
       </fragmenter>
 
-      <!-- A regular-expression-based fragmenter 
-           (for sentence extraction) 
+      <!-- A regular-expression-based fragmenter
+           (for sentence extraction)
         -->
       <fragmenter name="regex"
                   class="solr.highlight.RegexFragmenter">
@@ -1493,7 +1493,7 @@
       </fragmenter>
 
       <!-- Configure the standard formatter -->
-      <formatter name="html" 
+      <formatter name="html"
                  default="true"
                  class="solr.highlight.HtmlFormatter">
         <lst name="defaults">
@@ -1503,24 +1503,24 @@
       </formatter>
 
       <!-- Configure the standard encoder -->
-      <encoder name="html" 
+      <encoder name="html"
                default="true"
                class="solr.highlight.HtmlEncoder" />
 
       <!-- Configure the standard fragListBuilder -->
-      <fragListBuilder name="simple" 
+      <fragListBuilder name="simple"
                        default="true"
                        class="solr.highlight.SimpleFragListBuilder"/>
 
       <!-- Configure the single fragListBuilder -->
-      <fragListBuilder name="single" 
+      <fragListBuilder name="single"
                        class="solr.highlight.SingleFragListBuilder"/>
 
       <!-- default tag FragmentsBuilder -->
-      <fragmentsBuilder name="default" 
+      <fragmentsBuilder name="default"
                         default="true"
                         class="solr.highlight.ScoreOrderFragmentsBuilder">
-        <!-- 
+        <!--
         <lst name="defaults">
           <str name="hl.multiValuedSeparatorChar">/</str>
         </lst>
@@ -1528,7 +1528,7 @@
       </fragmentsBuilder>
 
       <!-- multi-colored tag FragmentsBuilder -->
-      <fragmentsBuilder name="colored" 
+      <fragmentsBuilder name="colored"
                         class="solr.highlight.ScoreOrderFragmentsBuilder">
         <lst name="defaults">
           <str name="hl.tag.pre"><![CDATA[
@@ -1551,15 +1551,15 @@
 
        http://wiki.apache.org/solr/UpdateRequestProcessor
 
-    --> 
+    -->
   <!-- Deduplication
 
        An example dedup update processor that creates the "id" field
        on the fly based on the hash code of some other fields.  This
        example has overwriteDupes set to false since we are using the
        id field as the signatureField and Solr will maintain
-       uniqueness based on that anyway.  
-       
+       uniqueness based on that anyway.
+
     -->
   <!--
      <updateRequestProcessorChain name="dedupe">
@@ -1590,7 +1590,7 @@
        overridden...
     -->
   <!--
-     <queryResponseWriter name="xml" 
+     <queryResponseWriter name="xml"
                           default="true"
                           class="solr.XMLResponseWriter" />
      <queryResponseWriter name="json" class="solr.JSONResponseWriter"/>
@@ -1612,7 +1612,7 @@
 
   <!-- XSLT response writer transforms the XML output by any xslt file found
        in Solr's conf/xslt directory.  Changes to xslt files are checked for
-       every xsltCacheLifetimeSeconds.  
+       every xsltCacheLifetimeSeconds.
     -->
   <queryResponseWriter name="xslt" class="solr.XSLTResponseWriter">
     <int name="xsltCacheLifetimeSeconds">5</int>
@@ -1640,7 +1640,7 @@
     -->
   <!-- example of registering a custom function parser  -->
   <!--
-     <valueSourceParser name="myfunc" 
+     <valueSourceParser name="myfunc"
                         class="com.mycompany.MyValueSourceParser" />
     -->
 
@@ -1649,7 +1649,7 @@
     <defaultQuery>*:*</defaultQuery>
 
     <!-- configure a healthcheck file for servers behind a
-         loadbalancer 
+         loadbalancer
       -->
     <!--
        <healthcheck type="file">server-enabled</healthcheck>
diff --git a/java/solr.multicore/nor-NO/conf/xslt/example.xsl b/java/solr.multicore/nor-NO/conf/xslt/example.xsl
index b8992700..aa546593 100644
--- a/java/solr.multicore/nor-NO/conf/xslt/example.xsl
+++ b/java/solr.multicore/nor-NO/conf/xslt/example.xsl
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 
-<!-- 
+<!--
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.
@@ -17,17 +17,17 @@
  * limitations under the License.
  -->
 
-<!-- 
+<!--
   Simple transform of Solr query results to HTML
  -->
 <xsl:stylesheet version='1.0'
     xmlns:xsl='http://www.w3.org/1999/XSL/Transform'
 >
 
-  <xsl:output media-type="text/html" encoding="UTF-8"/> 
-  
+  <xsl:output media-type="text/html" encoding="UTF-8"/>
+
   <xsl:variable name="title" select="concat('Solr search results (',response/result/@numFound,' documents)')"/>
-  
+
   <xsl:template match='/'>
     <html>
       <head>
@@ -44,7 +44,7 @@
       </body>
     </html>
   </xsl:template>
-  
+
   <xsl:template match="doc">
     <xsl:variable name="pos" select="position()"/>
     <div class="doc">
@@ -110,7 +110,7 @@
   </xsl:template>
 
   <xsl:template match="*"/>
-  
+
   <xsl:template name="css">
     <script>
       function toggle(id) {
diff --git a/java/solr.multicore/nor-NO/conf/xslt/example_atom.xsl b/java/solr.multicore/nor-NO/conf/xslt/example_atom.xsl
index b6c23151..86e77507 100644
--- a/java/solr.multicore/nor-NO/conf/xslt/example_atom.xsl
+++ b/java/solr.multicore/nor-NO/conf/xslt/example_atom.xsl
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 
-<!-- 
+<!--
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.
@@ -17,7 +17,7 @@
  * limitations under the License.
  -->
 
-<!-- 
+<!--
   Simple transform of Solr query results to Atom
  -->
 
@@ -42,7 +42,7 @@
         <name>Apache Solr</name>
         <email>solr-user@lucene.apache.org</email>
       </author>
-      <link rel="self" type="application/atom+xml" 
+      <link rel="self" type="application/atom+xml"
             href="http://localhost:8983/solr/q={$query}&amp;wt=xslt&amp;tr=atom.xsl"/>
       <updated>
         <xsl:value-of select="response/result/doc[position()=1]/date[@name='timestamp']"/>
@@ -51,7 +51,7 @@
       <xsl:apply-templates select="response/result/doc"/>
     </feed>
   </xsl:template>
-    
+
   <!-- search results xslt -->
   <xsl:template match="doc">
     <xsl:variable name="id" select="str[@name='id']"/>
diff --git a/java/solr.multicore/nor-NO/conf/xslt/example_rss.xsl b/java/solr.multicore/nor-NO/conf/xslt/example_rss.xsl
index 2857f117..407e65a7 100644
--- a/java/solr.multicore/nor-NO/conf/xslt/example_rss.xsl
+++ b/java/solr.multicore/nor-NO/conf/xslt/example_rss.xsl
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 
-<!-- 
+<!--
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.
@@ -17,7 +17,7 @@
  * limitations under the License.
  -->
 
-<!-- 
+<!--
   Simple transform of Solr query results to RSS
  -->
 
@@ -44,7 +44,7 @@
        </channel>
     </rss>
   </xsl:template>
-  
+
   <!-- search results xslt -->
   <xsl:template match="doc">
     <xsl:variable name="id" select="str[@name='id']"/>
diff --git a/java/solr.multicore/nor-NO/conf/xslt/luke.xsl b/java/solr.multicore/nor-NO/conf/xslt/luke.xsl
index 8553f3c6..6e988afe 100644
--- a/java/solr.multicore/nor-NO/conf/xslt/luke.xsl
+++ b/java/solr.multicore/nor-NO/conf/xslt/luke.xsl
@@ -6,9 +6,9 @@
     The ASF licenses this file to You under the Apache License, Version 2.0
     (the "License"); you may not use this file except in compliance with
     the License.  You may obtain a copy of the License at
-    
+
     http://www.apache.org/licenses/LICENSE-2.0
-    
+
     Unless required by applicable law or agreed to in writing, software
     distributed under the License is distributed on an "AS IS" BASIS,
     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -17,7 +17,7 @@
 -->
 
 
-<!-- 
+<!--
   Display the luke request handler with graphs
  -->
 <xsl:stylesheet
@@ -190,7 +190,7 @@
                  <div class="histogram">
                   <xsl:attribute name="style">background-color: <xsl:value-of select="$fill"/>; width: <xsl:value-of select="$bar_width"/>px; height: <xsl:value-of select="($iheight*number(.)) div $max"/>px;</xsl:attribute>
                  </div>
-                   </td> 
+                   </td>
                 </xsl:for-each>
               </tr>
               <tr>
diff --git a/java/solr.sh b/java/solr.sh
index 92721aec..37f187a1 100755
--- a/java/solr.sh
+++ b/java/solr.sh
@@ -14,6 +14,6 @@ then
   exit
 fi
 
-# start solr 
+# start solr
 exec $JAVA -jar start.jar
 
diff --git a/java/solr/README.txt b/java/solr/README.txt
index 6bd90efb..b9839032 100644
--- a/java/solr/README.txt
+++ b/java/solr/README.txt
@@ -31,7 +31,7 @@ The Solr Home directory typically contains the following subdirectories...
 
    conf/
         This directory is mandatory and must contain your solrconfig.xml
-        and schema.xml.  Any other optional configuration files would also 
+        and schema.xml.  Any other optional configuration files would also
         be kept here.
 
    data/
diff --git a/java/solr/bin/backupcleaner b/java/solr/bin/backupcleaner
index 52a83632..25b9a50b 100755
--- a/java/solr/bin/backupcleaner
+++ b/java/solr/bin/backupcleaner
@@ -112,7 +112,7 @@ then
     else
       unset maxdepth
     fi
-  
+
     logMessage cleaning up backups more than ${days} days old
     for i in `find ${data_dir} ${maxdepth} -name 'backup.*' -mtime +${days} -print`
     do
diff --git a/java/solr/bin/rsyncd-start b/java/solr/bin/rsyncd-start
index 6bfc130c..3d042a3c 100755
--- a/java/solr/bin/rsyncd-start
+++ b/java/solr/bin/rsyncd-start
@@ -115,7 +115,7 @@ then
 fi
 cat <<EOF > ${solr_root}/conf/rsyncd.conf
 #### rsyncd.conf file ####
- 
+
 uid = $(whoami)
 gid = $(whoami)
 use chroot = no
diff --git a/java/solr/conf/mapping-FoldToASCII.txt b/java/solr/conf/mapping-FoldToASCII.txt
index 9a84b6ea..e59baf7d 100644
--- a/java/solr/conf/mapping-FoldToASCII.txt
+++ b/java/solr/conf/mapping-FoldToASCII.txt
@@ -34,7 +34,7 @@
 # - Supplemental Punctuation: http://www.unicode.org/charts/PDF/U2E00.pdf
 # - Alphabetic Presentation Forms: http://www.unicode.org/charts/PDF/UFB00.pdf
 # - Halfwidth and Fullwidth Forms: http://www.unicode.org/charts/PDF/UFF00.pdf
-#  
+#
 # See: http://en.wikipedia.org/wiki/Latin_characters_in_Unicode
 #
 # The set of character conversions supported by this map is a superset of
@@ -3785,11 +3785,11 @@
 #
 # use warnings;
 # use strict;
-# 
+#
 # my @source_chars = ();
 # my @source_char_descriptions = ();
 # my $target = '';
-# 
+#
 # while (<>) {
 #   if (/case\s+'(\\u[A-F0-9]+)':\s*\/\/\s*(.*)/i) {
 #     push @source_chars, $1;
diff --git a/java/solr/conf/schema.xml b/java/solr/conf/schema.xml
index 5aace129..5fd37b3a 100644
--- a/java/solr/conf/schema.xml
+++ b/java/solr/conf/schema.xml
@@ -304,7 +304,7 @@
 
 
     <!-- A general unstemmed text field that indexes tokens normally and also
-         reversed (via ReversedWildcardFilterFactory), to enable more efficient 
+         reversed (via ReversedWildcardFilterFactory), to enable more efficient
      leading wildcard queries. -->
     <fieldType name="text_rev" class="solr.TextField" positionIncrementGap="100">
       <analyzer type="index">
@@ -361,11 +361,11 @@
  <!-- eZ Find: This field type is dedicated to Elevate.  -->
     <fieldType name="elevate_string" stored="false" indexed="false" class="solr.TextField">
           <analyzer>
-              <tokenizer class="solr.WhitespaceTokenizerFactory"/>        
+              <tokenizer class="solr.WhitespaceTokenizerFactory"/>
               <filter class="solr.LowerCaseFilterFactory"/>
           </analyzer>
     </fieldType>
-    
+
 <!-- eZ Find: This field type is dedicated to ez publish keywords.  -->
     <fieldtype name="keyword" class="solr.TextField" positionIncrementGap="100">
          <analyzer type="index">
@@ -483,7 +483,7 @@
 
     <!-- This point type indexes the coordinates as separate fields (subFields)
       If subFieldType is defined, it references a type, and a dynamic field
-      definition is created matching *___<typename>.  Alternately, if 
+      definition is created matching *___<typename>.  Alternately, if
       subFieldSuffix is defined, that is used to create the subFields.
       Example: if subFieldType="double", then the coordinates would be
         indexed in fields myloc_0___double,myloc_1___double.
@@ -544,8 +544,8 @@
    <field name="meta_name_t" type="text" indexed="true" stored="true" termVectors="true"/>  <!-- Object name -->
    <field name="meta_sort_name_ms" type="mtext" indexed="true" stored="true"/>  <!-- Object name for sorting (not tokenized) -->
    <field name="meta_main_node_id_si" type="sint" indexed="true" stored="true"/>           <!-- Main node ID -->
-   <field name="meta_language_code_ms" type="mstring" indexed="true" stored="true"/>          <!-- Language code --> 
-   <field name="meta_available_language_codes_ms" type="mstring" indexed="true" stored="true" multiValued="true"/>          <!-- List of available language codes in the corresponding content object -->    
+   <field name="meta_language_code_ms" type="mstring" indexed="true" stored="true"/>          <!-- Language code -->
+   <field name="meta_available_language_codes_ms" type="mstring" indexed="true" stored="true" multiValued="true"/>          <!-- List of available language codes in the corresponding content object -->
    <field name="meta_anon_access_b" type="boolean" indexed="true" stored="false" />         <!-- Anonymous user access to object -->
    <field name="meta_object_states_si" type="sint" indexed="true" stored="true" multiValued="true"/>                     <!-- Object states -->
 
@@ -676,12 +676,12 @@
 
       <field name="ezf_df_text" type="text"    indexed="true"  stored="true" multiValued="true" termVectors="true"/>
 
-   <!-- uncomment the following to ignore any fields that don't already match an existing 
-        field name or dynamic field, rather than reporting them as an error. 
-        alternately, change the type="ignored" to some other type e.g. "text" if you want 
-        unknown fields indexed and/or stored by default --> 
+   <!-- uncomment the following to ignore any fields that don't already match an existing
+        field name or dynamic field, rather than reporting them as an error.
+        alternately, change the type="ignored" to some other type e.g. "text" if you want
+        unknown fields indexed and/or stored by default -->
    <!--dynamicField name="*" type="ignored" multiValued="true" /-->
-   
+
  </fields>
 
  <!-- Field to use to determine and enforce document uniqueness.
diff --git a/java/solr/conf/solrconfig.xml b/java/solr/conf/solrconfig.xml
index c8f292b2..6e070449 100755
--- a/java/solr/conf/solrconfig.xml
+++ b/java/solr/conf/solrconfig.xml
@@ -16,9 +16,9 @@
  limitations under the License.
 -->
 
-<!-- 
+<!--
      For more details about configurations options that may appear in
-     this file, see http://wiki.apache.org/solr/SolrConfigXml. 
+     this file, see http://wiki.apache.org/solr/SolrConfigXml.
 -->
 <config>
   <!-- In all configuration below, a prefix of "solr." for class names
@@ -40,7 +40,7 @@
          -Dsolr.abortOnConfigurationError=false
     -->
   <abortOnConfigurationError>${solr.abortOnConfigurationError:true}</abortOnConfigurationError>
-  
+
   <!-- Controls what version of Lucene various components of Solr
        adhere to.  Generally, you want to use the latest version to
        get all bug fixes and improvements. It is highly recommended
@@ -60,7 +60,7 @@
        If a "./lib" directory exists in your instanceDir, all files
        found in it are included as if you had used the following
        syntax...
-       
+
               <lib dir="./lib" />
     -->
   <!-- A dir option by itself adds any files found in the directory to
@@ -85,9 +85,9 @@
        will cause a serious error to be logged if it can't be loaded.
     -->
   <!--
-  <lib path="../a-jar-that-does-not-exist.jar" /> 
+  <lib path="../a-jar-that-does-not-exist.jar" />
   -->
-  
+
   <!-- Data Directory
 
        Used to specify an alternate directory to hold all index data
@@ -99,12 +99,12 @@
 
 
   <!-- The DirectoryFactory to use for indexes.
-       
+
        solr.StandardDirectoryFactory, the default, is filesystem
        based.  solr.RAMDirectoryFactory is memory based, not
        persistent, and doesn't work with replication.
     -->
-  <directoryFactory name="DirectoryFactory" 
+  <directoryFactory name="DirectoryFactory"
                     class="${solr.directoryFactory:solr.StandardDirectoryFactory}"/>
 
 
@@ -126,7 +126,7 @@
          flushed to the Directory.  -->
     <ramBufferSizeMB>32</ramBufferSizeMB>
     <!-- If both ramBufferSizeMB and maxBufferedDocs is set, then
-         Lucene will flush based on whichever limit is hit first.  
+         Lucene will flush based on whichever limit is hit first.
       -->
     <!-- <maxBufferedDocs>1000</maxBufferedDocs> -->
 
@@ -134,16 +134,16 @@
     <writeLockTimeout>1000</writeLockTimeout>
     <commitLockTimeout>10000</commitLockTimeout>
 
-    <!-- Expert: Merge Policy 
+    <!-- Expert: Merge Policy
 
          The Merge Policy in Lucene controls how merging is handled by
          Lucene.  The default in 2.3 is the LogByteSizeMergePolicy,
          previous versions used LogDocMergePolicy.
-         
+
          LogByteSizeMergePolicy chooses segments to merge based on
          their size.  The Lucene 2.2 default, LogDocMergePolicy chose
          when to merge based on number of documents
-         
+
          Other implementations of MergePolicy must have a no-argument
          constructor
       -->
@@ -161,12 +161,12 @@
     <!--
        <mergeScheduler class="org.apache.lucene.index.ConcurrentMergeScheduler"/>
        -->
-      
-    <!-- LockFactory 
+
+    <!-- LockFactory
 
          This option specifies which Lucene LockFactory implementation
          to use.
-      
+
          single = SingleInstanceLockFactory - suggested for a
                   read-only index or when there is no possibility of
                   another process trying to modify the index.
@@ -210,7 +210,7 @@
          This is not needed if lock type is 'none' or 'single'
      -->
     <unlockOnStartup>false</unlockOnStartup>
-    
+
     <!-- If true, IndexReaders will be reopened (often more efficient)
          instead of closed and then opened.
       -->
@@ -226,7 +226,7 @@
          The standard Solr IndexDeletionPolicy implementation supports
          deleting index commit points on number of commits, age of
          commit point and optimized status.
-         
+
          The latest commit point should always be preserved regardless
          of the criteria.
     -->
@@ -246,19 +246,19 @@
     </deletionPolicy>
 
     <!-- Lucene Infostream
-       
+
          To aid in advanced debugging, Lucene provides an "InfoStream"
          of detailed information when indexing.
 
          Setting The value to true will instruct the underlying Lucene
          IndexWriter to write it's debugging info the specified file
       -->
-     <infoStream file="INFOSTREAM.txt">false</infoStream> 
+     <infoStream file="INFOSTREAM.txt">false</infoStream>
 
   </mainIndex>
 
   <!-- JMX
-       
+
        This example enables JMX if and only if an existing MBeanServer
        is found, use this if you want to configure JMX through JVM
        parameters. Remove this to disable exposing Solr configuration
@@ -268,7 +268,7 @@
     -->
   <jmx />
   <!-- If you want to connect to a particular server, specify the
-       agentId 
+       agentId
     -->
   <!-- <jmx agentId="myAgent" /> -->
   <!-- If you want to start a new MBeanServer, specify the serviceUrl -->
@@ -282,7 +282,7 @@
 
          Perform a <commit/> automatically under certain conditions.
          Instead of enabling autoCommit, consider using "commitWithin"
-         when adding documents. 
+         when adding documents.
 
          http://wiki.apache.org/solr/UpdateXmlMessages
 
@@ -291,17 +291,17 @@
 
          maxTime - Maximum amount of time that is allowed to pass
                    since a document was added before automaticly
-                   triggering a new commit. 
+                   triggering a new commit.
       -->
     <!--
-       <autoCommit> 
+       <autoCommit>
          <maxDocs>10000</maxDocs>
-         <maxTime>1000</maxTime> 
+         <maxTime>1000</maxTime>
        </autoCommit>
       -->
 
     <!-- Update Related Event Listeners
-         
+
          Various IndexWriter realted events can trigger Listeners to
          take actions.
 
@@ -310,10 +310,10 @@
       -->
     <!-- The RunExecutableListener executes an external command from a
          hook such as postCommit or postOptimize.
-         
+
          exe - the name of the executable to run
          dir - dir to use as the current working directory. (default=".")
-         wait - the calling thread waits until the executable returns. 
+         wait - the calling thread waits until the executable returns.
                 (default="true")
          args - the arguments to pass to the program.  (default is none)
          env - environment variables to set.  (default is none)
@@ -332,7 +332,7 @@
        </listener>
       -->
   </updateHandler>
-  
+
   <!-- IndexReaderFactory
 
        Use the following format to specify a custom IndexReaderFactory,
@@ -364,7 +364,7 @@
        be specified.
     -->
   <!--
-     <indexReaderFactory name="IndexReaderFactory" 
+     <indexReaderFactory name="IndexReaderFactory"
                          class="solr.StandardIndexReaderFactory">
        <int name="setTermIndexDivisor">12</int>
      </indexReaderFactory >
@@ -378,12 +378,12 @@
          is thrown if exceeded.
 
          ** WARNING **
-         
+
          This option actually modifies a global Lucene property that
          will affect all SolrCores.  If multiple solrconfig.xml files
          disagree on this property, the value at any given moment will
          be based on the last SolrCore to be initialized.
-         
+
       -->
     <maxBooleanClauses>10000</maxBooleanClauses>
 
@@ -391,7 +391,7 @@
 
          There are two implementations of cache available for Solr,
          LRUCache, based on a synchronized LinkedHashMap, and
-         FastLRUCache, based on a ConcurrentHashMap.  
+         FastLRUCache, based on a ConcurrentHashMap.
 
          FastLRUCache has faster gets and slower puts in single
          threaded operation and thus is generally faster than LRUCache
@@ -416,7 +416,7 @@
            initialSize - the initial capacity (number of entries) of
                the cache.  (see java.util.HashMap)
            autowarmCount - the number of entries to prepopulate from
-               and old cache.  
+               and old cache.
       -->
     <filterCache class="solr.FastLRUCache"
                  size="512"
@@ -424,28 +424,28 @@
                  autowarmCount="0"/>
 
     <!-- Query Result Cache
-         
+
          Caches results of searches - ordered lists of document ids
-         (DocList) based on a query, a sort, and the range of documents requested.  
+         (DocList) based on a query, a sort, and the range of documents requested.
       -->
     <queryResultCache class="solr.LRUCache"
                      size="512"
                      initialSize="512"
                      autowarmCount="0"/>
-   
+
     <!-- Document Cache
 
          Caches Lucene Document objects (the stored fields for each
          document).  Since Lucene internal document ids are transient,
-         this cache will not be autowarmed.  
+         this cache will not be autowarmed.
       -->
     <documentCache class="solr.LRUCache"
                    size="512"
                    initialSize="512"
                    autowarmCount="0"/>
-    
+
     <!-- Field Value Cache
-         
+
          Cache used to hold field values that are quickly accessible
          by document id.  The fieldValueCache is created by default
          even if not configured here.
@@ -463,8 +463,8 @@
          name through SolrIndexSearcher.getCache(),cacheLookup(), and
          cacheInsert().  The purpose is to enable easy caching of
          user/application level data.  The regenerator argument should
-         be specified as an implementation of solr.CacheRegenerator 
-         if autowarming is desired.  
+         be specified as an implementation of solr.CacheRegenerator
+         if autowarming is desired.
       -->
     <!--
        <cache name="myUserCache"
@@ -511,12 +511,12 @@
         are collected.  For example, if a search for a particular query
         requests matching documents 10 through 19, and queryWindowSize is 50,
         then documents 0 through 49 will be collected and cached.  Any further
-        requests in that range can be satisfied via the cache.  
+        requests in that range can be satisfied via the cache.
      -->
     <queryResultWindowSize>50</queryResultWindowSize>
 
    <!-- Maximum number of documents to cache for any entry in the
-        queryResultCache. 
+        queryResultCache.
      -->
    <queryResultMaxDocsCached>200</queryResultMaxDocsCached>
 
@@ -534,10 +534,10 @@
         prepared but there is no current registered searcher to handle
         requests or to gain autowarming data from.
 
-        
+
      -->
     <!-- QuerySenderListener takes an array of NamedList and executes a
-         local query request for each NamedList in sequence. 
+         local query request for each NamedList in sequence.
       -->
     <listener event="newSearcher" class="solr.QuerySenderListener">
       <arr name="queries">
@@ -565,7 +565,7 @@
     <useColdSearcher>false</useColdSearcher>
 
     <!-- Max Warming Searchers
-         
+
          Maximum number of searchers that may be warming in the
          background concurrently.  An error is returned if this limit
          is exceeded.
@@ -605,14 +605,14 @@
 
          multipartUploadLimitInKB - specifies the max size of
          Multipart File Uploads that Solr will alow in a Request.
-         
+
          *** WARNING ***
          The settings below authorize Solr to fetch remote files, You
          should make sure your system has some authentication before
          using enableRemoteStreaming="true"
 
-      --> 
-    <requestParsers enableRemoteStreaming="true" 
+      -->
+    <requestParsers enableRemoteStreaming="true"
                     multipartUploadLimitInKB="2048000" />
 
     <!-- HTTP Caching
@@ -626,21 +626,21 @@
     <!-- If you include a <cacheControl> directive, it will be used to
          generate a Cache-Control header (as well as an Expires header
          if the value contains "max-age=")
-         
+
          By default, no Cache-Control header is generated.
-         
+
          You can use the <cacheControl> option even if you have set
          never304="true"
       -->
     <!--
        <httpCaching never304="true" >
-         <cacheControl>max-age=30, public</cacheControl> 
+         <cacheControl>max-age=30, public</cacheControl>
        </httpCaching>
       -->
     <!-- To enable Solr to responde with automaticly generated HTTP
          Caching headers, and to response to Cache Validation requests
          correctly, set the value of never304="false"
-         
+
          This will cause Solr to generate Last-Modified and ETag
          headers based on the properties of the Index.
 
@@ -665,12 +665,12 @@
     <!--
        <httpCaching lastModifiedFrom="openTime"
                     etagSeed="Solr">
-         <cacheControl>max-age=30, public</cacheControl> 
+         <cacheControl>max-age=30, public</cacheControl>
        </httpCaching>
       -->
   </requestDispatcher>
 
-  <!-- Request Handlers 
+  <!-- Request Handlers
 
        http://wiki.apache.org/solr/SolrRequestHandler
 
@@ -684,7 +684,7 @@
        If a /select request is processed with out a qt param
        specified, the requestHandler that declares default="true" will
        be used.
-       
+
        If a Request Handler is declared with startup="lazy", then it will
        not be initialized until the first request that uses it.
 
@@ -844,8 +844,8 @@
      -->
   </requestHandler>
 
-  <!-- XML Update Request Handler.  
-       
+  <!-- XML Update Request Handler.
+
        http://wiki.apache.org/solr/UpdateXmlMessages
 
        The canonical Request Handler for Modifying the Index through
@@ -855,10 +855,10 @@
        type header if posted in the body. For example, curl now
        requires: -H 'Content-type:text/xml; charset=utf-8'
     -->
-  <requestHandler name="/update" 
+  <requestHandler name="/update"
                   class="solr.XmlUpdateRequestHandler">
-    <!-- See below for information on defining 
-         updateRequestProcessorChains that can be used by name 
+    <!-- See below for information on defining
+         updateRequestProcessorChains that can be used by name
          on each Update Request
       -->
     <!--
@@ -870,29 +870,29 @@
   <!-- Binary Update Request Handler
        http://wiki.apache.org/solr/javabin
     -->
-  <requestHandler name="/update/javabin" 
+  <requestHandler name="/update/javabin"
                   class="solr.BinaryUpdateRequestHandler" />
 
   <!-- CSV Update Request Handler
        http://wiki.apache.org/solr/UpdateCSV
     -->
-  <requestHandler name="/update/csv" 
-                  class="solr.CSVRequestHandler" 
+  <requestHandler name="/update/csv"
+                  class="solr.CSVRequestHandler"
                   startup="lazy" />
 
   <!-- JSON Update Request Handler
        http://wiki.apache.org/solr/UpdateJSON
     -->
-  <requestHandler name="/update/json" 
-                  class="solr.JsonUpdateRequestHandler" 
+  <requestHandler name="/update/json"
+                  class="solr.JsonUpdateRequestHandler"
                   startup="lazy" />
 
   <!-- Solr Cell Update Request Handler
 
-       http://wiki.apache.org/solr/ExtractingRequestHandler 
+       http://wiki.apache.org/solr/ExtractingRequestHandler
 
     -->
-  <requestHandler name="/update/extract" 
+  <requestHandler name="/update/extract"
                   startup="lazy"
                   class="solr.extraction.ExtractingRequestHandler" >
     <lst name="defaults">
@@ -927,7 +927,7 @@
            field value analysis will be marked as "matched" for every
            token that is produces by the query analysis
    -->
-  <requestHandler name="/analysis/field" 
+  <requestHandler name="/analysis/field"
                   startup="lazy"
                   class="solr.FieldAnalysisRequestHandler" />
 
@@ -1055,18 +1055,18 @@
     request paraemter that holds the query text to be analyized. It
     also supports the "analysis.showmatch" parameter which when set to
     true, all field tokens that match the query tokens will be marked
-    as a "match". 
+    as a "match".
   -->
-  <requestHandler name="/analysis/document" 
-                  class="solr.DocumentAnalysisRequestHandler" 
+  <requestHandler name="/analysis/document"
+                  class="solr.DocumentAnalysisRequestHandler"
                   startup="lazy" />
 
   <!-- Admin Handlers
 
        Admin Handlers - This will register all the standard admin
-       RequestHandlers.  
+       RequestHandlers.
     -->
-  <requestHandler name="/admin/" 
+  <requestHandler name="/admin/"
                   class="solr.admin.AdminHandlers" />
   <!-- This single handler is equivilent to the following... -->
   <!--
@@ -1078,14 +1078,14 @@
      <requestHandler name="/admin/file"       class="solr.admin.ShowFileRequestHandler" >
     -->
   <!-- If you wish to hide files under ${solr.home}/conf, explicitly
-       register the ShowFileRequestHandler using: 
+       register the ShowFileRequestHandler using:
     -->
   <!--
-     <requestHandler name="/admin/file" 
+     <requestHandler name="/admin/file"
                      class="solr.admin.ShowFileRequestHandler" >
        <lst name="invariants">
-         <str name="hidden">synonyms.txt</str> 
-         <str name="hidden">anotherfile.txt</str> 
+         <str name="hidden">synonyms.txt</str>
+         <str name="hidden">anotherfile.txt</str>
        </lst>
      </requestHandler>
     -->
@@ -1102,11 +1102,11 @@
   <!-- Echo the request contents back to the client -->
   <requestHandler name="/debug/dump" class="solr.DumpRequestHandler" >
     <lst name="defaults">
-     <str name="echoParams">explicit</str> 
+     <str name="echoParams">explicit</str>
      <str name="echoHandler">true</str>
     </lst>
   </requestHandler>
-  
+
   <requestHandler name="ezpublish" class="solr.DisMaxRequestHandler" >
     <lst name="defaults">
       <str name="echoParams">explicit</str>
@@ -1147,7 +1147,7 @@
        The SolrReplicationHandler supports replicating indexes from a
        "master" used for indexing and "salves" used for queries.
 
-       http://wiki.apache.org/solr/SolrReplication 
+       http://wiki.apache.org/solr/SolrReplication
 
        In the example below, remove the <lst name="master"> section if
        this is just a slave and remove  the <lst name="slave"> section
@@ -1169,18 +1169,18 @@
 
   <!-- Search Components
 
-       Search components are registered to SolrCore and used by 
+       Search components are registered to SolrCore and used by
        instances of SearchHandler (which can access them by name)
-       
+
        By default, the following components are avaliable:
-       
+
        <searchComponent name="query"     class="solr.QueryComponent" />
        <searchComponent name="facet"     class="solr.FacetComponent" />
        <searchComponent name="mlt"       class="solr.MoreLikeThisComponent" />
        <searchComponent name="highlight" class="solr.HighlightComponent" />
        <searchComponent name="stats"     class="solr.StatsComponent" />
        <searchComponent name="debug"     class="solr.DebugComponent" />
-   
+
        Default configuration in a requestHandler would look like:
 
        <arr name="components">
@@ -1192,28 +1192,28 @@
          <str>debug</str>
        </arr>
 
-       If you register a searchComponent to one of the standard names, 
+       If you register a searchComponent to one of the standard names,
        that will be used instead of the default.
 
        To insert components before or after the 'standard' components, use:
-    
+
        <arr name="first-components">
          <str>myFirstComponentName</str>
        </arr>
-    
+
        <arr name="last-components">
          <str>myLastComponentName</str>
        </arr>
 
        NOTE: The component registered with the name "debug" will
-       always be executed after the "last-components" 
-       
+       always be executed after the "last-components"
+
      -->
 
    <!-- Spell Check
 
         The spell check component can return a list of alternative spelling
-        suggestions.  
+        suggestions.
 
         http://wiki.apache.org/solr/SpellCheckComponent
      -->
@@ -1247,7 +1247,7 @@
        </lst>
      -->
 
-    <!-- a spellchecker that use an alternate comparator 
+    <!-- a spellchecker that use an alternate comparator
 
          comparatorClass be one of:
           1. score (default)
@@ -1275,7 +1275,7 @@
       -->
   </searchComponent>
 
-  <!-- A request handler for demonstrating the spellcheck component.  
+  <!-- A request handler for demonstrating the spellcheck component.
 
        NOTE: This is purely as an example.  The whole purpose of the
        SpellCheckComponent is to hook it into the request handler that
@@ -1284,7 +1284,7 @@
 
        IN OTHER WORDS, THERE IS REALLY GOOD CHANCE THE SETUP BELOW IS
        NOT WHAT YOU WANT FOR YOUR PRODUCTION SYSTEM!
-       
+
        See http://wiki.apache.org/solr/SpellCheckComponent for details
        on the request parameters.
     -->
@@ -1311,8 +1311,8 @@
 
        This is purely as an example.
 
-       In reality you will likely want to add the component to your 
-       already specified request handlers. 
+       In reality you will likely want to add the component to your
+       already specified request handlers.
     -->
   <requestHandler name="tvrh" class="solr.SearchHandler" startup="lazy">
     <lst name="defaults">
@@ -1334,20 +1334,20 @@
 
           java -Dsolr.clustering.enabled=true -jar start.jar
     -->
-  <searchComponent name="clustering" 
+  <searchComponent name="clustering"
                    enable="${solr.clustering.enabled:false}"
                    class="solr.clustering.ClusteringComponent" >
     <!-- Declare an engine -->
     <lst name="engine">
       <!-- The name, only one can be named "default" -->
       <str name="name">default</str>
-      <!-- Class name of Carrot2 clustering algorithm. 
-           
+      <!-- Class name of Carrot2 clustering algorithm.
+
            Currently available algorithms are:
-           
+
            * org.carrot2.clustering.lingo.LingoClusteringAlgorithm
            * org.carrot2.clustering.stc.STCClusteringAlgorithm
-           
+
            See http://project.carrot2.org/algorithms.html for the
            algorithm's characteristics.
         -->
@@ -1362,9 +1362,9 @@
            name and attribute value as parameter value.
         -->
       <str name="LingoClusteringAlgorithm.desiredClusterCountBase">20</str>
-      
+
       <!-- The language to assume for the documents.
-           
+
            For a list of allowed values, see:
            http://download.carrot2.org/stable/manual/#section.attribute.lingo.MultilingualClustering.defaultLanguage
        -->
@@ -1380,8 +1380,8 @@
 
        This is purely as an example.
 
-       In reality you will likely want to add the component to your 
-       already specified request handlers. 
+       In reality you will likely want to add the component to your
+       already specified request handlers.
     -->
   <requestHandler name="/clustering"
                   startup="lazy"
@@ -1402,7 +1402,7 @@
        <!--<int name="carrot.numDescriptions">5</int>-->
        <!-- produce sub clusters -->
        <bool name="carrot.outputSubClusters">false</bool>
-       
+
        <str name="defType">edismax</str>
        <str name="qf">
           text^0.5 features^1.0 name^1.2 sku^1.5 id^10.0 manu^1.1 cat^1.4
@@ -1410,12 +1410,12 @@
        <str name="q.alt">*:*</str>
        <str name="rows">10</str>
        <str name="fl">*,score</str>
-    </lst>     
+    </lst>
     <arr name="last-components">
       <str>clustering</str>
     </arr>
   </requestHandler>
-  
+
   <!-- Terms Component
 
        http://wiki.apache.org/solr/TermsComponent
@@ -1468,7 +1468,7 @@
     <highlighting>
       <!-- Configure the standard fragmenter -->
       <!-- This could most likely be commented out in the "default" case -->
-      <fragmenter name="gap" 
+      <fragmenter name="gap"
                   default="true"
                   class="solr.highlight.GapFragmenter">
         <lst name="defaults">
@@ -1476,8 +1476,8 @@
         </lst>
       </fragmenter>
 
-      <!-- A regular-expression-based fragmenter 
-           (for sentence extraction) 
+      <!-- A regular-expression-based fragmenter
+           (for sentence extraction)
         -->
       <fragmenter name="regex"
                   class="solr.highlight.RegexFragmenter">
@@ -1492,7 +1492,7 @@
       </fragmenter>
 
       <!-- Configure the standard formatter -->
-      <formatter name="html" 
+      <formatter name="html"
                  default="true"
                  class="solr.highlight.HtmlFormatter">
         <lst name="defaults">
@@ -1502,24 +1502,24 @@
       </formatter>
 
       <!-- Configure the standard encoder -->
-      <encoder name="html" 
+      <encoder name="html"
                default="true"
                class="solr.highlight.HtmlEncoder" />
 
       <!-- Configure the standard fragListBuilder -->
-      <fragListBuilder name="simple" 
+      <fragListBuilder name="simple"
                        default="true"
                        class="solr.highlight.SimpleFragListBuilder"/>
 
       <!-- Configure the single fragListBuilder -->
-      <fragListBuilder name="single" 
+      <fragListBuilder name="single"
                        class="solr.highlight.SingleFragListBuilder"/>
 
       <!-- default tag FragmentsBuilder -->
-      <fragmentsBuilder name="default" 
+      <fragmentsBuilder name="default"
                         default="true"
                         class="solr.highlight.ScoreOrderFragmentsBuilder">
-        <!-- 
+        <!--
         <lst name="defaults">
           <str name="hl.multiValuedSeparatorChar">/</str>
         </lst>
@@ -1527,7 +1527,7 @@
       </fragmentsBuilder>
 
       <!-- multi-colored tag FragmentsBuilder -->
-      <fragmentsBuilder name="colored" 
+      <fragmentsBuilder name="colored"
                         class="solr.highlight.ScoreOrderFragmentsBuilder">
         <lst name="defaults">
           <str name="hl.tag.pre"><![CDATA[
@@ -1550,15 +1550,15 @@
 
        http://wiki.apache.org/solr/UpdateRequestProcessor
 
-    --> 
+    -->
   <!-- Deduplication
 
        An example dedup update processor that creates the "id" field
        on the fly based on the hash code of some other fields.  This
        example has overwriteDupes set to false since we are using the
        id field as the signatureField and Solr will maintain
-       uniqueness based on that anyway.  
-       
+       uniqueness based on that anyway.
+
     -->
   <!--
      <updateRequestProcessorChain name="dedupe">
@@ -1589,7 +1589,7 @@
        overridden...
     -->
   <!--
-     <queryResponseWriter name="xml" 
+     <queryResponseWriter name="xml"
                           default="true"
                           class="solr.XMLResponseWriter" />
      <queryResponseWriter name="json" class="solr.JSONResponseWriter"/>
@@ -1611,7 +1611,7 @@
 
   <!-- XSLT response writer transforms the XML output by any xslt file found
        in Solr's conf/xslt directory.  Changes to xslt files are checked for
-       every xsltCacheLifetimeSeconds.  
+       every xsltCacheLifetimeSeconds.
     -->
   <queryResponseWriter name="xslt" class="solr.XSLTResponseWriter">
     <int name="xsltCacheLifetimeSeconds">5</int>
@@ -1639,7 +1639,7 @@
     -->
   <!-- example of registering a custom function parser  -->
   <!--
-     <valueSourceParser name="myfunc" 
+     <valueSourceParser name="myfunc"
                         class="com.mycompany.MyValueSourceParser" />
     -->
 
@@ -1648,7 +1648,7 @@
     <defaultQuery>*:*</defaultQuery>
 
     <!-- configure a healthcheck file for servers behind a
-         loadbalancer 
+         loadbalancer
       -->
     <!--
        <healthcheck type="file">server-enabled</healthcheck>
diff --git a/java/solr/conf/xslt/example.xsl b/java/solr/conf/xslt/example.xsl
index b8992700..aa546593 100644
--- a/java/solr/conf/xslt/example.xsl
+++ b/java/solr/conf/xslt/example.xsl
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 
-<!-- 
+<!--
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.
@@ -17,17 +17,17 @@
  * limitations under the License.
  -->
 
-<!-- 
+<!--
   Simple transform of Solr query results to HTML
  -->
 <xsl:stylesheet version='1.0'
     xmlns:xsl='http://www.w3.org/1999/XSL/Transform'
 >
 
-  <xsl:output media-type="text/html" encoding="UTF-8"/> 
-  
+  <xsl:output media-type="text/html" encoding="UTF-8"/>
+
   <xsl:variable name="title" select="concat('Solr search results (',response/result/@numFound,' documents)')"/>
-  
+
   <xsl:template match='/'>
     <html>
       <head>
@@ -44,7 +44,7 @@
       </body>
     </html>
   </xsl:template>
-  
+
   <xsl:template match="doc">
     <xsl:variable name="pos" select="position()"/>
     <div class="doc">
@@ -110,7 +110,7 @@
   </xsl:template>
 
   <xsl:template match="*"/>
-  
+
   <xsl:template name="css">
     <script>
       function toggle(id) {
diff --git a/java/solr/conf/xslt/example_atom.xsl b/java/solr/conf/xslt/example_atom.xsl
index b6c23151..86e77507 100644
--- a/java/solr/conf/xslt/example_atom.xsl
+++ b/java/solr/conf/xslt/example_atom.xsl
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 
-<!-- 
+<!--
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.
@@ -17,7 +17,7 @@
  * limitations under the License.
  -->
 
-<!-- 
+<!--
   Simple transform of Solr query results to Atom
  -->
 
@@ -42,7 +42,7 @@
         <name>Apache Solr</name>
         <email>solr-user@lucene.apache.org</email>
       </author>
-      <link rel="self" type="application/atom+xml" 
+      <link rel="self" type="application/atom+xml"
             href="http://localhost:8983/solr/q={$query}&amp;wt=xslt&amp;tr=atom.xsl"/>
       <updated>
         <xsl:value-of select="response/result/doc[position()=1]/date[@name='timestamp']"/>
@@ -51,7 +51,7 @@
       <xsl:apply-templates select="response/result/doc"/>
     </feed>
   </xsl:template>
-    
+
   <!-- search results xslt -->
   <xsl:template match="doc">
     <xsl:variable name="id" select="str[@name='id']"/>
diff --git a/java/solr/conf/xslt/example_rss.xsl b/java/solr/conf/xslt/example_rss.xsl
index 2857f117..407e65a7 100644
--- a/java/solr/conf/xslt/example_rss.xsl
+++ b/java/solr/conf/xslt/example_rss.xsl
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 
-<!-- 
+<!--
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.
@@ -17,7 +17,7 @@
  * limitations under the License.
  -->
 
-<!-- 
+<!--
   Simple transform of Solr query results to RSS
  -->
 
@@ -44,7 +44,7 @@
        </channel>
     </rss>
   </xsl:template>
-  
+
   <!-- search results xslt -->
   <xsl:template match="doc">
     <xsl:variable name="id" select="str[@name='id']"/>
diff --git a/java/solr/conf/xslt/luke.xsl b/java/solr/conf/xslt/luke.xsl
index 8553f3c6..6e988afe 100644
--- a/java/solr/conf/xslt/luke.xsl
+++ b/java/solr/conf/xslt/luke.xsl
@@ -6,9 +6,9 @@
     The ASF licenses this file to You under the Apache License, Version 2.0
     (the "License"); you may not use this file except in compliance with
     the License.  You may obtain a copy of the License at
-    
+
     http://www.apache.org/licenses/LICENSE-2.0
-    
+
     Unless required by applicable law or agreed to in writing, software
     distributed under the License is distributed on an "AS IS" BASIS,
     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -17,7 +17,7 @@
 -->
 
 
-<!-- 
+<!--
   Display the luke request handler with graphs
  -->
 <xsl:stylesheet
@@ -190,7 +190,7 @@
                  <div class="histogram">
                   <xsl:attribute name="style">background-color: <xsl:value-of select="$fill"/>; width: <xsl:value-of select="$bar_width"/>px; height: <xsl:value-of select="($iheight*number(.)) div $max"/>px;</xsl:attribute>
                  </div>
-                   </td> 
+                   </td>
                 </xsl:for-each>
               </tr>
               <tr>
diff --git a/java/solr/solr.xml b/java/solr/solr.xml
index 4d1a84e7..ce025f2e 100644
--- a/java/solr/solr.xml
+++ b/java/solr/solr.xml
@@ -18,14 +18,14 @@
 
 <!--
  All (relative) paths are relative to the installation path
-  
+
   persistent: Save changes made via the API to this file
   sharedLib: path to a lib directory that will be shared across all cores
 -->
 <solr persistent="false">
 
   <!--
-  adminPath: RequestHandler path to manage cores.  
+  adminPath: RequestHandler path to manage cores.
     If 'null' (or absent), cores will not be manageable via request handler
   -->
   <cores adminPath="/admin/cores" defaultCoreName="collection1">
diff --git a/java/src/ezfind/src/main/java/org/ezsystems/solr/handler/ezfind/eZFindRequestHandler.java b/java/src/ezfind/src/main/java/org/ezsystems/solr/handler/ezfind/eZFindRequestHandler.java
index ea399fc6..e557adb6 100644
--- a/java/src/ezfind/src/main/java/org/ezsystems/solr/handler/ezfind/eZFindRequestHandler.java
+++ b/java/src/ezfind/src/main/java/org/ezsystems/solr/handler/ezfind/eZFindRequestHandler.java
@@ -57,39 +57,39 @@
 import java.net.URL;
 
 /**
- * Multi purposer handler, extending Solr's features for <a href="http://ez.no/ezfind/">eZ Find</a>, technological bridge 
- * between the Enterprise Open Source CMS <a href="http://ez.no/ezpublish/">eZ Publish</a> and <a href="http://lucene.apache.org/solr/">Solr</a> 
+ * Multi purposer handler, extending Solr's features for <a href="http://ez.no/ezfind/">eZ Find</a>, technological bridge
+ * between the Enterprise Open Source CMS <a href="http://ez.no/ezpublish/">eZ Publish</a> and <a href="http://lucene.apache.org/solr/">Solr</a>
  * <p/>
  */
 
 public class eZFindRequestHandler extends RequestHandlerBase implements SolrCoreAware {
-  
+
   /**
    * Storing the current core.
    */
   private SolrCore core = null;
 
   /**
-   * Storing the core's first elevation Component encountered. 
+   * Storing the core's first elevation Component encountered.
    * Will be used to update the configuration dynamically.
-   */  
-  private QueryElevationComponent elevationComponent = null;  
-  
+   */
+  private QueryElevationComponent elevationComponent = null;
+
   /**
-   * Used to dynamically update the configuration file, usually named "elevate.xml". 
+   * Used to dynamically update the configuration file, usually named "elevate.xml".
    * Is populated once at initialization.
-   * 
+   *
    * @see init
-   */  
+   */
   private String elevateConfigurationFileName = null;
-  
+
   private transient static Logger log = Logger.getLogger( eZFindRequestHandler.class + "" );
 
   /**
-   * Constant storing the name of the POST/GET variable ( request parameter ) 
+   * Constant storing the name of the POST/GET variable ( request parameter )
    * containing the update configuration XML for the QueryElevation component.
-   */  
-  public static final String CONF_PARAM_NAME = "elevate-configuration"; 
+   */
+  public static final String CONF_PARAM_NAME = "elevate-configuration";
 
   /** <code>init</code> will be called just once, immediately after creation.
    * <p>The args are user-level initialization parameters that
@@ -101,8 +101,8 @@ public void init( NamedList args )
 
   /**
    * Returns the name of the QueryElevation component's configuration file.
-   * 
-   * Is assumed here that the QueryElevation component's configuration is correct ( hence the absence of sanity checks ). 
+   *
+   * Is assumed here that the QueryElevation component's configuration is correct ( hence the absence of sanity checks ).
    * It would have triggered exceptions at startup otherwise.
    */
   private String getElevateConfigurationFileName()
@@ -111,14 +111,14 @@ private String getElevateConfigurationFileName()
 	  {
 		  // Issue accessing the initArgs property of a QueryElevationComponent object, it is private. Need to directly access the config.
 		  //  String f = this.elevationComponent.initArgs.get( QueryElevationComponent.CONFIG_FILE );
-		  
-		  // FIXME: the XML attribute name ( "config-file" ) is only visible from the package in QueryElevationComponent, 
+
+		  // FIXME: the XML attribute name ( "config-file" ) is only visible from the package in QueryElevationComponent,
 		  //         hence the impossibility to use QueryElevationComponent.CONFIG_FILE ( which would be way cleaner ). This issue appears again a few lines below.
-		  this.elevateConfigurationFileName = this.core.getSolrConfig().get( "searchComponent[@class=\"solr.QueryElevationComponent\"]/str[@name=\"" + "config-file" + "\"]", "elevate.xml" );		  
+		  this.elevateConfigurationFileName = this.core.getSolrConfig().get( "searchComponent[@class=\"solr.QueryElevationComponent\"]/str[@name=\"" + "config-file" + "\"]", "elevate.xml" );
 	  }
 	  return this.elevateConfigurationFileName;
   }
-  
+
   /**
    * Handles a query request, this method must be thread safe.
    * <p>
@@ -133,47 +133,47 @@ private String getElevateConfigurationFileName()
   public void handleRequestBody(SolrQueryRequest req, SolrQueryResponse rsp)
   {
 	  String newElevateConfiguration = req.getParams().get( eZFindRequestHandler.CONF_PARAM_NAME );
-	  
+
 	  if ( newElevateConfiguration != null )
 	  {
 		  String f = this.getElevateConfigurationFileName();
-	
+
 	      File fC = new File( this.core.getResourceLoader().getConfigDir(), f );
 	      //File fD = new File( this.core.getDataDir(), f );
-	
-	      // updating files below. 
+
+	      // updating files below.
 	      // TODO : Need for concurrency management / thread safety
 	      // TODO : Need for XML validation here
 	      if( fC.exists() ) {
 	          // Update fC.
-              try 
+              try
               {
             	  this.log.info( "Updating " + fC );
                   FileWriter fw = new FileWriter( fC );
                   BufferedWriter out = new BufferedWriter( fw );
 	              out.write( newElevateConfiguration );
-	              out.close();                  
+	              out.close();
 	    	      // reinitialize the QueryElevation component. Is there another way to take the new configuration into account ?
-	    	      this.elevationComponent.inform( this.core );	              
-              } 
+	    	      this.elevationComponent.inform( this.core );
+              }
               catch (Exception e) {
-            	  this.log.info( "Exception when updating " + fC.getAbsolutePath() + " : " + e.getMessage() );            	  
+            	  this.log.info( "Exception when updating " + fC.getAbsolutePath() + " : " + e.getMessage() );
             	  rsp.add( "error", "Error when updating " + fC.getAbsolutePath() + " : " + e.getMessage() );
               }
 	      }
-	      
-	      
-	      /** 
+
+
+	      /**
 	       * Although the QueryElevationComponent supports having elevate.xml both in the dataDir and in the conf dir,
 	       * this requestHandler will not support having elevate.xml in the dataDir. In fact, the replication feature, being on his way at the moment
 	       * is not able to replicate configuration files placed in the dataDir.
 	       */
-	      
+
 	      /*
 		  else if( fD.exists() )
 	      {
 	          // Update fD.
-              try 
+              try
               {
             	  this.log.info( "Updating " + fD );
                   FileWriter fw = new FileWriter( fD );
@@ -181,30 +181,30 @@ else if( fD.exists() )
 	              out.write( newElevateConfiguration );
 	              out.close();
 	    	      // reinitialize the QueryElevation component. Is there another way to take the new configuration into account ?
-	    	      this.elevationComponent.inform( this.core );	              
-              } 
+	    	      this.elevationComponent.inform( this.core );
+              }
               catch (Exception e) {
-            	  this.log.info( "Exception when updating " + fD.getAbsolutePath() + " : " + e.getMessage());            	  
+            	  this.log.info( "Exception when updating " + fD.getAbsolutePath() + " : " + e.getMessage());
             	  rsp.add( "error", "Error when updating " + fD.getAbsolutePath() + " : " + e.getMessage() );
-              }    	  
+              }
 	      }
 	      */
 	  }
-  }  
-  
+  }
+
 
   //  SolrCoreAware interface implementation - Start
-  public void inform(SolrCore core)   
+  public void inform(SolrCore core)
   {
 	this.core = core;
-	
+
 	Map<String,SearchComponent> availableSearchComponents = core.getSearchComponents();
-	 
-	for ( Iterator i=availableSearchComponents.entrySet().iterator(); i.hasNext(); ) 
+
+	for ( Iterator i=availableSearchComponents.entrySet().iterator(); i.hasNext(); )
 	{
 		Map.Entry e = (Map.Entry) i.next();
 		// Ugly hard-coded fully-qualified class name. Any workaround ?
-		if ( e.getValue().getClass().getName() == "org.apache.solr.handler.component.QueryElevationComponent" ) 
+		if ( e.getValue().getClass().getName() == "org.apache.solr.handler.component.QueryElevationComponent" )
 		{
 			// Found the Query Elevation Component, store it as local property.
 		   	this.elevationComponent = (QueryElevationComponent) e.getValue();
@@ -213,10 +213,10 @@ public void inform(SolrCore core)
 	}
   }
   //  SolrCoreAware interface implementation - End
-      
-  
+
+
   // ////////////////////// SolrInfoMBeans methods //////////////////////
-  
+
   public String getDescription() {
     return "eZFind's dedicated request Handler.";
   }
@@ -234,7 +234,7 @@ public String getSourceId() {
   public String getSource() {
     return "$URL:$";
   }
-  
+
   /**
    * Simple common usage name, e.g. BasicQueryHandler,
    * or fully qualified clas name.
@@ -243,13 +243,13 @@ public String getName()
   {
 	  return "eZFindQueryHandler";
   }
-  
+
   /** Purpose of this Class */
   public Category getCategory()
   {
 	  return null;
   }
-  
+
   /**
    * Documentation URL list.
    *
@@ -258,11 +258,11 @@ public Category getCategory()
    * FAQ on class usage, Design doc for class, Wiki, bug reporting URL, etc...
    * </p>
    */
-  public URL[] getDocs() 
+  public URL[] getDocs()
   {
 	  return null;
   }
-  
+
   /**
    * Any statistics this instance would like to be publicly available via
    * the Solr Administration interface.
diff --git a/settings/ezfind.ini b/settings/ezfind.ini
index 4bae8080..c3b0c196 100644
--- a/settings/ezfind.ini
+++ b/settings/ezfind.ini
@@ -73,7 +73,7 @@ Limit=10
 FacetField=ezf_sp_words
 
 # Number of characters that must be entered before querying for results.
-# A negative value effectively turns off the widget. A value of 0 allows 
+# A negative value effectively turns off the widget. A value of 0 allows
 # queries of null or empty string values.
 MinQueryLength=2
 
diff --git a/share/db_schema.dba b/share/db_schema.dba
index 2c673181..5beab77c 100644
--- a/share/db_schema.dba
+++ b/share/db_schema.dba
@@ -1,26 +1,26 @@
 <?php
 // This array contains the database schema
 $schema = array (
-  'ezfind_elevate_configuration' => 
+  'ezfind_elevate_configuration' =>
   array (
     'name' => 'ezfind_elevate_configuration',
-    'fields' => 
+    'fields' =>
     array (
-      'contentobject_id' => 
+      'contentobject_id' =>
       array (
         'length' => 11,
         'type' => 'int',
         'not_null' => '1',
         'default' => 0,
       ),
-      'language_code' => 
+      'language_code' =>
       array (
         'length' => 20,
         'type' => 'varchar',
         'not_null' => '1',
         'default' => '',
       ),
-      'search_query' => 
+      'search_query' =>
       array (
         'length' => 255,
         'type' => 'varchar',
@@ -28,24 +28,24 @@ $schema = array (
         'default' => '',
       ),
     ),
-    'indexes' => 
+    'indexes' =>
     array (
-      'PRIMARY' => 
+      'PRIMARY' =>
       array (
         'type' => 'primary',
-        'fields' => 
+        'fields' =>
         array (
           0 => 'search_query',
           1 => 'contentobject_id',
           2 => 'language_code',
         ),
       ),
-      'ezfind_elevate_configuration__search_query' => 
+      'ezfind_elevate_configuration__search_query' =>
       array (
         'type' => 'non-unique',
-        'fields' => 
+        'fields' =>
         array (
-          0 => 
+          0 =>
           array (
             'name' => 'search_query',
             'mysql:length' => 100,
@@ -54,14 +54,14 @@ $schema = array (
       ),
     ),
   ),
-  '_info' => 
+  '_info' =>
   array (
     'format' => 'generic',
   ),
 );
 // This array contains the database data
 $data = array (
-  '_info' => 
+  '_info' =>
   array (
     'format' => 'generic',
   ),
diff --git a/share/ezfind_elevate_configuration.dba b/share/ezfind_elevate_configuration.dba
index 2c673181..5beab77c 100644
--- a/share/ezfind_elevate_configuration.dba
+++ b/share/ezfind_elevate_configuration.dba
@@ -1,26 +1,26 @@
 <?php
 // This array contains the database schema
 $schema = array (
-  'ezfind_elevate_configuration' => 
+  'ezfind_elevate_configuration' =>
   array (
     'name' => 'ezfind_elevate_configuration',
-    'fields' => 
+    'fields' =>
     array (
-      'contentobject_id' => 
+      'contentobject_id' =>
       array (
         'length' => 11,
         'type' => 'int',
         'not_null' => '1',
         'default' => 0,
       ),
-      'language_code' => 
+      'language_code' =>
       array (
         'length' => 20,
         'type' => 'varchar',
         'not_null' => '1',
         'default' => '',
       ),
-      'search_query' => 
+      'search_query' =>
       array (
         'length' => 255,
         'type' => 'varchar',
@@ -28,24 +28,24 @@ $schema = array (
         'default' => '',
       ),
     ),
-    'indexes' => 
+    'indexes' =>
     array (
-      'PRIMARY' => 
+      'PRIMARY' =>
       array (
         'type' => 'primary',
-        'fields' => 
+        'fields' =>
         array (
           0 => 'search_query',
           1 => 'contentobject_id',
           2 => 'language_code',
         ),
       ),
-      'ezfind_elevate_configuration__search_query' => 
+      'ezfind_elevate_configuration__search_query' =>
       array (
         'type' => 'non-unique',
-        'fields' => 
+        'fields' =>
         array (
-          0 => 
+          0 =>
           array (
             'name' => 'search_query',
             'mysql:length' => 100,
@@ -54,14 +54,14 @@ $schema = array (
       ),
     ),
   ),
-  '_info' => 
+  '_info' =>
   array (
     'format' => 'generic',
   ),
 );
 // This array contains the database data
 $data = array (
-  '_info' => 
+  '_info' =>
   array (
     'format' => 'generic',
   ),