You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by sa...@apache.org on 2015/02/25 18:58:13 UTC

svn commit: r1662288 - in /lucene/dev/branches/lucene_solr_4_10: ./ lucene/ lucene/CHANGES.txt lucene/site/ lucene/site/changes/changes2html.pl solr/ solr/CHANGES.txt

Author: sarowe
Date: Wed Feb 25 17:58:13 2015
New Revision: 1662288

URL: http://svn.apache.org/r1662288
Log:
Fix problems with changes2html.pl, mostly to do with marking things as attributions when they shouldn't be, or not when they should; and fixup formatting issues in lucene/CHANGES.txt and solr/CHANGES.txt (merge branch_5x r1661782 and r1662287)

Modified:
    lucene/dev/branches/lucene_solr_4_10/   (props changed)
    lucene/dev/branches/lucene_solr_4_10/lucene/   (props changed)
    lucene/dev/branches/lucene_solr_4_10/lucene/CHANGES.txt   (contents, props changed)
    lucene/dev/branches/lucene_solr_4_10/lucene/site/   (props changed)
    lucene/dev/branches/lucene_solr_4_10/lucene/site/changes/changes2html.pl
    lucene/dev/branches/lucene_solr_4_10/solr/   (props changed)
    lucene/dev/branches/lucene_solr_4_10/solr/CHANGES.txt   (contents, props changed)

Modified: lucene/dev/branches/lucene_solr_4_10/lucene/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene_solr_4_10/lucene/CHANGES.txt?rev=1662288&r1=1662287&r2=1662288&view=diff
==============================================================================
--- lucene/dev/branches/lucene_solr_4_10/lucene/CHANGES.txt (original)
+++ lucene/dev/branches/lucene_solr_4_10/lucene/CHANGES.txt Wed Feb 25 17:58:13 2015
@@ -2588,7 +2588,7 @@ Changes in backwards compatibility polic
     not necessary to specify for example that all of your binary values have
     the same length. Instead its easy for the Codec API to optimize encoding
     based on any properties of the content.
-   (Simon Willnauer, Adrien Grand, Mike McCandless, Robert Muir)
+  (Simon Willnauer, Adrien Grand, Mike McCandless, Robert Muir)
 
 * LUCENE-4757: Cleanup and refactoring of FacetsAccumulator, FacetRequest,
   FacetsAggregator and FacetResultsHandler API. If your application did 
@@ -2869,7 +2869,7 @@ Changes in backwards compatibility polic
     methods such as close() and reference counting management pulled from
     DirectoryTaxonomyReader, and made final. The rest of the methods, remained
     abstract.
-    (Shai Erera, Gilad Barkai)
+  (Shai Erera, Gilad Barkai)
 
 * LUCENE-4576: Remove CachingWrapperFilter(Filter, boolean). This recacheDeletes
   option gave less than 1% speedup at the expense of cache churn (filters were
@@ -5563,8 +5563,8 @@ Optimizations
 
 Test Cases
 
-* LUCENE-3327: Fix AIOOBE when TestFSTs is run with
-  -Dtests.verbose=true (James Dyer via Mike McCandless)
+* LUCENE-3327: Fix AIOOBE when TestFSTs is run with -Dtests.verbose=true
+  (James Dyer via Mike McCandless)
 
 Build
 
@@ -7071,7 +7071,7 @@ API Changes
   - MapOfSets
   - o.a.l.util.cache package
   - lot's of internal APIs of IndexWriter
- (Uwe Schindler, Michael Busch, Kay Kay, Robert Muir, Adriano Crestani)
+  (Uwe Schindler, Michael Busch, Kay Kay, Robert Muir, Adriano Crestani)
   
 * LUCENE-1944, LUCENE-1856, LUCENE-1957, LUCENE-1960, LUCENE-1961,
   LUCENE-1968, LUCENE-1970, LUCENE-1946, LUCENE-1971, LUCENE-1975,

Modified: lucene/dev/branches/lucene_solr_4_10/lucene/site/changes/changes2html.pl
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene_solr_4_10/lucene/site/changes/changes2html.pl?rev=1662288&r1=1662287&r2=1662288&view=diff
==============================================================================
--- lucene/dev/branches/lucene_solr_4_10/lucene/site/changes/changes2html.pl (original)
+++ lucene/dev/branches/lucene_solr_4_10/lucene/site/changes/changes2html.pl Wed Feb 25 17:58:13 2015
@@ -422,6 +422,7 @@ for my $rel (@releases) {
   }
 
   ($release, $reldate, $relinfo, $sections) = @$rel;
+  print STDERR "release: $release  reldate: $reldate\n";
 
   # The first section heading is undefined for the older sectionless releases
   my $has_release_sections = has_release_sections($sections);
@@ -546,6 +547,7 @@ for my $rel (@releases) {
                                         }se;
                                   $bulleted_list;
                                 }ge;
+                    $uncode = markup_trailing_attribution($uncode);
                     $uncode;
                   }
                 }sge;
@@ -627,13 +629,18 @@ print "</body>\n</html>\n";
 sub markup_trailing_attribution {
   my $item = shift;
 
-  # Put attributions on their own lines.
+  # Put attributions on their own lines - this already happens if there is a preceding </ul>
+  my $extra_newline = ($item =~ m:</ul>:) ? '' : '<br />';
   # Check for trailing parenthesized attribution with no following period.
   # Exclude things like "(see #3 above)" and "(use the bug number instead of xxxx)"
-  unless ($item =~ s{\s*(\((?![Ss]ee )
+  unless ($item =~ s{\s+(\((?![Ss]ee )
                            (?!spans\b)
                            (?!mainly\ )
                            (?!LUCENE-\d+\))
+                           (?!SOLR-\d+\))
+                           (?!user's)
+                           (?!like\ )
+                           (?!r\d{6})     # subversion revision 
                            (?!and\ )
                            (?!backported\ )
                            (?!in\ )
@@ -641,7 +648,7 @@ sub markup_trailing_attribution {
                            (?![Tt]he\ )
                            (?!use\ the\ bug\ number)
                      [^()"]+?\))\s*$}
-                    {\n<br /><span class="attrib">$1</span>}x) {
+                    {\n${extra_newline}<span class="attrib">$1</span>}x) {
     # If attribution is not found, then look for attribution with a
     # trailing period, but try not to include trailing parenthesized things
     # that are not attributions.
@@ -651,10 +658,14 @@ sub markup_trailing_attribution {
     # fewer words or it includes the word "via" or the phrase "updates from",
 	  # then it is considered to be an attribution.
 
-    $item =~ s{(\s*(\((?![Ss]ee\ )
+    $item =~ s{(\s+(\((?![Ss]ee\ )
                       (?!spans\b)
                       (?!mainly\ )
                       (?!LUCENE-\d+\))
+                      (?!SOLR-\d+\))
+                      (?!user's)
+                      (?!like\ )
+                      (?!r\d{6})     # subversion revision 
                       (?!and\ )
                       (?!backported\ )
                       (?!in\ )
@@ -670,8 +681,10 @@ sub markup_trailing_attribution {
                 if ($parenthetical !~ /LUCENE-\d+/) {
                   my ($no_parens) = $parenthetical =~ /^\((.*)\)$/s;
                   my @words = grep {/\S/} split /\s+/, $no_parens;
-                  if ($no_parens =~ /\b(?:via|updates\s+from)\b/i || scalar(@words) <= 4) {
-                    $subst = "\n<br /><span class=\"attrib\">$parenthetical</span>";
+                  my $commas = $no_parens =~ s/,/,/g; # count commas
+                  my $max_words = 4 + $commas;
+                  if ($no_parens =~ /\b(?:via|updates\s+from)\b/i || scalar(@words) <= $max_words) {
+                    $subst = "\n${extra_newline}<span class=\"attrib\">$parenthetical</span>";
                   }
                 }
                 $subst . $trailing_period_and_or_issue;
@@ -793,7 +806,9 @@ sub get_release_date {
     # Handle '1.2 RC6', which should be '1.2 final'
     $release = '1.2 final' if ($release eq '1.2 RC6');
 
-    $release =~ s/\.0\.0/\.0/;
+    if (not exists($release_dates{$release})) {
+      $release =~ s/\.0\.0/\.0/;
+    }
 
     $reldate = ( exists($release_dates{$release}) 
                ? $release_dates{$release}

Modified: lucene/dev/branches/lucene_solr_4_10/solr/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene_solr_4_10/solr/CHANGES.txt?rev=1662288&r1=1662287&r2=1662288&view=diff
==============================================================================
--- lucene/dev/branches/lucene_solr_4_10/solr/CHANGES.txt (original)
+++ lucene/dev/branches/lucene_solr_4_10/solr/CHANGES.txt Wed Feb 25 17:58:13 2015
@@ -29,10 +29,10 @@ Bug Fixes
   of all "keys" found in the request parameters, resulting in some key=value param pairs 
   being duplicated.  This was noticeably affecting some areas of the code where iteration 
   was done over the set of all params: 
-    * literal.* in ExtractingRequestHandler
-    * facet.* in FacetComponent
-    * spellcheck.[dictionary name].* and spellcheck.collateParam.* in SpellCheckComponent
-    * olap.* in AnalyticsComponent
+    - literal.* in ExtractingRequestHandler
+    - facet.* in FacetComponent
+    - spellcheck.[dictionary name].* and spellcheck.collateParam.* in SpellCheckComponent
+    - olap.* in AnalyticsComponent
   (Alexandre Rafalovitch & hossman)
 
 ==================  4.10.3 ==================
@@ -171,7 +171,7 @@ Bug Fixes
 * SOLR-6425: If using the new global hdfs block cache option, you can end up
   reading corrupt files on file name reuse. (Mark Miller, Gregory Chanan)
 
-* SOLR-5814: CoreContainer reports incorrect & missleading path for solrconfig.xml 
+* SOLR-5814: CoreContainer reports incorrect & misleading path for solrconfig.xml
   when there are loading problems (Pradeep via hossman)
 
 * SOLR-6024: Fix StatsComponent when using docValues="true" multiValued="true"
@@ -303,6 +303,8 @@ Bug Fixes
 ----------------------
 
 * SOLR-6095 : SolrCloud cluster can end up without an overseer with overseer roles (Noble Paul, Shalin Mangar)
+
+* SOLR-6165: DataImportHandler should write BigInteger and BigDecimal values as strings.
   (Anand Sengamalai via shalin)
   
 * SOLR-6189: Avoid publishing the state as down if the node is not live when determining
@@ -402,9 +404,9 @@ Bug Fixes
 * SOLR-6393: TransactionLog replay performance on HDFS is very poor. (Mark Miller)  
 
 * SOLR-6268: HdfsUpdateLog has a race condition that can expose a closed HDFS FileSystem instance and should 
-  close it's FileSystem instance if either inherited close method is called. (Mark Miller)
+  close its FileSystem instance if either inherited close method is called. (Mark Miller)
 
-* SOLR-6089: When using the HDFS block cache, when a file is deleted, it's underlying data entries in the 
+* SOLR-6089: When using the HDFS block cache, when a file is deleted, its underlying data entries in the 
   block cache are not removed, which is a problem with the global block cache option. 
   (Mark Miller, Patrick Hunt)
 
@@ -481,7 +483,7 @@ Other Changes
 
 * SOLR-6270: Increased timeouts for MultiThreadedOCPTest. (shalin)
 
-* SOLR-6274: UpdateShardHandler should log the params used to configure it's
+* SOLR-6274: UpdateShardHandler should log the params used to configure its
   HttpClient. (Ramkumar Aiyengar via Mark Miller)
 
 * SOLR-6194: Opened up "public" access to DataSource, DocBuilder, and EntityProcessorWrapper
@@ -564,7 +566,7 @@ New Features
   (Joel Bernstein)
 
 * SOLR-5285: Added a new [child ...] DocTransformer for optionally including 
-  Block-Join decendent documents inline in the results of a search.  This works 
+  Block-Join descendant documents inline in the results of a search.  This works 
   independent of whether the search itself is a block-join related query and is 
   supported by he xml, json, and javabin response formats.
   (Varun Thacker via hossman)
@@ -581,8 +583,12 @@ New Features
 Bug Fixes
 ----------------------
 
+* SOLR-5956: Use coreDescriptor.getInstanceDir() instead of getRawInstanceDir()
+  in the SnapShooter to avoid problems when solr.solr.home is a symbolic link.
+  (Timothy Potter) 
+
 * SOLR-6002: Fix a couple of ugly issues around SolrIndexWriter close and 
-  rollback as well as how SolrIndexWriter manages it's ref counted directory
+  rollback as well as how SolrIndexWriter manages its ref counted directory
   instance. (Mark Miller, Gregory Chanan)
 
 * SOLR-6015: Better way to handle managed synonyms when ignoreCase=true
@@ -762,7 +768,7 @@ Upgrading from Solr 4.7
 ----------------------
 
 * In previous versions of Solr, Terms that exceeded Lucene's MAX_TERM_LENGTH were
-  silently ignored when indexing documents.  Begining with Solr 4.8, a document
+  silently ignored when indexing documents.  Beginning with Solr 4.8, a document
   an error will be generated when attempting to index a document with a term
   that is too large.  If you wish to continue to have large terms ignored,
   use "solr.LengthFilterFactory" in all of your Analyzers.  See LUCENE-5472 for
@@ -1011,7 +1017,7 @@ Bug Fixes
 * SOLR-5647: The lib paths in example-schemaless will now load correctly.
   (Paul Westin via Shawn Heisey)
 
-* SOLR-5770: All attempts to match a SolrCore with it's state in clusterstate.json
+* SOLR-5770: All attempts to match a SolrCore with its state in clusterstate.json
   should be done with the CoreNodeName. (Steve Davids via Mark Miller)
 
 * SOLR-5875: QueryComponent.mergeIds() unmarshals all docs' sort field values once
@@ -1072,7 +1078,7 @@ Bug Fixes
   problem if you hit a bad work item. (Mark Miller)
 
 * SOLR-5796: Increase how long we are willing to wait for a core to see the ZK
-  advertised leader in it's local state. (Timothy Potter, Mark Miller)  
+  advertised leader in its local state. (Timothy Potter, Mark Miller)  
 
 * SOLR-5834: Overseer threads are only being interrupted and not closed.
   (hossman, Mark Miller)
@@ -1100,7 +1106,7 @@ Other Changes
 ---------------------
 
 * SOLR-5796: Make how long we are willing to wait for a core to see the ZK
-  advertised leader in it's local state configurable. 
+  advertised leader in its local state configurable. 
   (Timothy Potter via Mark Miller)
 
 ==================  4.7.0 ==================
@@ -1240,8 +1246,8 @@ Bug Fixes
 
 * SOLR-4612: Admin UI - Analysis Screen contains empty table-columns (steffkes)
 
-* SOLR-5451: SyncStrategy closes it's http connection manager before the
-  executor that uses it in it's close method. (Mark Miller)
+* SOLR-5451: SyncStrategy closes its http connection manager before the
+  executor that uses it in its close method. (Mark Miller)
 
 * SOLR-5460: SolrDispatchFilter#sendError can get a SolrCore that it does not 
   close. (Mark Miller)
@@ -1249,7 +1255,7 @@ Bug Fixes
 * SOLR-5461: Request proxying should only set con.setDoOutput(true) if the
   request is a post. (Mark Miller)
 
-* SOLR-5481: SolrCmdDistributor should not let the http client do it's own 
+* SOLR-5481: SolrCmdDistributor should not let the http client do its own 
   retries. (Mark Miller)
 
 * LUCENE-5347: Fixed Solr's Zookeeper Client to copy files to Zookeeper using
@@ -1323,14 +1329,14 @@ Bug Fixes
 
 * SOLR-5667: Performance problem when not using hdfs block cache. (Mark Miller)
 
-* SOLR-5526: Fixed NPE that could arrise when explicitly configuring some built 
+* SOLR-5526: Fixed NPE that could arise when explicitly configuring some built 
   in QParserPlugins (Nikolay Khitrin, Vitaliy Zhovtyuk, hossman)
 
 * SOLR-5598: LanguageIdentifierUpdateProcessor ignores all but the first value
   of multiValued string fields. (Andreas Hubold, Vitaliy Zhovtyuk via shalin)
 
 * SOLR-5593: Replicas should accept the last updates from a leader that has just 
-  lost it's connection to ZooKeeper. (Christine Poerschke via Mark Miller)
+  lost its connection to ZooKeeper. (Christine Poerschke via Mark Miller)
 
 * SOLR-5678: SolrZkClient should throw a SolrException when connect times out
   rather than a RuntimeException. (Karl Wright, Anshum Gupta, Mark Miller)
@@ -1874,11 +1880,11 @@ Upgrading from Solr 4.4.0
   SOLR-5108 for more details.
 
 * In the past, schema.xml parsing would silently ignore "default" or "required" 
-  options specified on <dynamicField/> declarations.  Begining with 4.5, attempting
+  options specified on <dynamicField/> declarations.  Beginning with 4.5, attempting
   to do configured these on a dynamic field will cause an init error.  If you 
   encounter one of these errors when upgrading an existing schema.xml, you can 
   safely remove these attributes, regardless of their value, from your config and 
-  Solr will continue to bahave exactly as it did in previous versions.  See 
+  Solr will continue to behave exactly as it did in previous versions.  See 
   SOLR-5227 for more details.
 
 * The UniqFieldsUpdateProcessorFactory has been improved to support all of the
@@ -1942,7 +1948,7 @@ New Features
   where items are preserved across commits.  (Robert Muir)
 
 * SOLR-4249: UniqFieldsUpdateProcessorFactory now extends 
-  FieldMutatingUpdateProcessorFactory and supports all of it's selector options. Use
+  FieldMutatingUpdateProcessorFactory and supports all of its selector options. Use
   of the "fields" init param is now deprecated in favor of "fieldName" (hossman)
   
 * SOLR-2548: Allow multiple threads to be specified for faceting. When threading, one
@@ -2025,7 +2031,7 @@ Bug Fixes
 * SOLR-4909: Use DirectoryReader.openIfChanged in non-NRT mode.
   (Michael Garski via Robert Muir)
 
-* SOLR-5227: Correctly fail schema initalization if a dynamicField is configured to
+* SOLR-5227: Correctly fail schema initialization if a dynamicField is configured to
   be required, or have a default value.  (hossman)
 
 * SOLR-5231: Fixed a bug with the behavior of BoolField that caused documents w/o
@@ -2112,7 +2118,7 @@ Upgrading from Solr 4.3.0
 * TieredMergePolicy and the various subtypes of LogMergePolicy no longer have 
   an explicit "setUseCompoundFile" method.  Instead the behavior of new 
   segments is determined by the IndexWriter configuration, and the MergePolicy 
-  is only consulted to determine if merge segements should use the compound 
+  is only consulted to determine if merge segments should use the compound 
   file format (based on the value of "setNoCFSRatio").  If you have explicitly 
   configured one of these classes using <mergePolicy> and include an init arg 
   like this...
@@ -2254,7 +2260,7 @@ Bug Fixes
 * SOLR-4891: JsonLoader should preserve field value types from the JSON content stream.
   (Steve Rowe)
  
-* SOLR-4805: SolreCore#reload should not call preRegister and publish a DOWN state to
+* SOLR-4805: SolrCore#reload should not call preRegister and publish a DOWN state to
   ZooKeeper. (Mark Miller, Jared Rodriguez)
 
 * SOLR-4899: When reconnecting after ZooKeeper expiration, we need to be willing to wait 
@@ -2272,18 +2278,18 @@ Bug Fixes
 
 * SOLR-4910: persisting solr.xml is broken. More stringent testing of persistence fixed
   up a number of issues and several bugs with persistence. Among them are
-  > don't persisting implicit properties
-  > should persist zkHost in the <solr> tag (user's list)
-  > reloading a core that has transient="true" returned an error. reload should load
+  - don't persisting implicit properties
+  - should persist zkHost in the <solr> tag (user's list)
+  - reloading a core that has transient="true" returned an error. reload should load
     a transient core if it's not yet loaded.
-  > No longer persisting loadOnStartup or transient core properties if they were not
+  - No longer persisting loadOnStartup or transient core properties if they were not
     specified in the original solr.xml
-  > Testing flushed out the fact that you couldn't swap a core marked transient=true
+  - Testing flushed out the fact that you couldn't swap a core marked transient=true
     loadOnStartup=false because it hadn't been loaded yet.
-  > SOLR-4862, CREATE fails to persist schema, config, and dataDir
-  > SOLR-4363, not persisting coreLoadThreads in <solr> tag
-  > SOLR-3900, logWatcher properties not persisted
-  > SOLR-4850, cores defined as loadOnStartup=true, transient=false can't be searched
+  - SOLR-4862, CREATE fails to persist schema, config, and dataDir
+  - SOLR-4363, not persisting coreLoadThreads in <solr> tag
+  - SOLR-3900, logWatcher properties not persisted
+  - SOLR-4850, cores defined as loadOnStartup=true, transient=false can't be searched
   (Erick Erickson)
 
 * SOLR-4923: Commits to non leaders as part of a request that also contain updates
@@ -2414,7 +2420,7 @@ Other Changes
 * SOLR-4931: SolrDeletionPolicy onInit and onCommit methods changed to override
   exact signatures (with generics) from IndexDeletionPolicy (shalin)
 
-* SOLR-4942: test improvements to randomize use of compound files (hosman)
+* SOLR-4942: test improvements to randomize use of compound files (hossman)
 
 * SOLR-4966: CSS, JS and other files in webapp without license (uschindler,
   steffkes)
@@ -2542,7 +2548,7 @@ Upgrading from Solr 4.2.0
   you would like. If you are using another webapp container, these jars will 
   need to go in the corresponding location for that container. 
   In conjunction, the dist-excl-slf4j and dist-war-excl-slf4 build targets 
-  have been removed since they are redundent.  See the Slf4j documentation, 
+  have been removed since they are redundant.  See the Slf4j documentation, 
   SOLR-3706, and SOLR-4651 for more details.
 
 * The hardcoded SolrCloud defaults for 'hostContext="solr"' and 
@@ -2606,11 +2612,11 @@ New Features
   support for the old style. (Erick Erickson, Mark Miller)
   Additional Work:
   - SOLR-4347: Ensure that newly-created cores via Admin handler are persisted in solr.xml
-  (Erick Erickson)
+    (Erick Erickson)
   - SOLR-1905: Cores created by the admin request handler should be persisted to solr.xml.
-  Also fixed a problem whereby properties like solr.solr.datadir would be persisted
-  to solr.xml. Also, cores that didn't happen to be loaded were not persisted. 
-  (Erick Erickson)
+    Also fixed a problem whereby properties like solr.solr.datadir would be persisted
+    to solr.xml. Also, cores that didn't happen to be loaded were not persisted. 
+    (Erick Erickson)
 
 * SOLR-4717/SOLR-1351: SimpleFacets now work with localParams allowing faceting on the 
   same field multiple ways (ryan, Uri Boness)
@@ -2759,7 +2765,7 @@ Bug Fixes
   fullpath not path. (Mark Miller)
 
 * SOLR-4555: When forceNew is used with CachingDirectoryFactory#get, the old
-  CachValue should give up it's path as it will be used by a new Directory
+  CacheValue should give up its path as it will be used by a new Directory
   instance. (Mark Miller)
 
 * SOLR-4578: CoreAdminHandler#handleCreateAction gets a SolrCore and does not
@@ -2780,7 +2786,7 @@ Bug Fixes
   working correctly. (Mark Miller)
 
 * SOLR-4570: Even if an explicit shard id is used, ZkController#preRegister 
-  should still wait to see the shard id in it's current ClusterState.
+  should still wait to see the shard id in its current ClusterState.
   (Mark Miller)
 
 * SOLR-4585: The Collections API validates numShards with < 0 but should use 
@@ -2808,7 +2814,7 @@ Bug Fixes
   Directory has a refCnt of 0, but it should call closeDirectory(CacheValue).
   (Mark Miller)
 
-* SOLR-4602: ZkController#unregister should cancel it's election participation 
+* SOLR-4602: ZkController#unregister should cancel its election participation 
   before asking the Overseer to delete the SolrCore information. (Mark Miller)
 
 * SOLR-4601: A Collection that is only partially created and then deleted will 
@@ -2837,7 +2843,7 @@ Bug Fixes
   when used in field:value queries in the lucene QParser.  (hossman, yonik)
 
 * SOLR-4617: SolrCore#reload needs to pass the deletion policy to the next 
-  SolrCore through it's constructor rather than setting a field after.
+  SolrCore through its constructor rather than setting a field after.
   (Mark Miller)
     
 * SOLR-4589: Fixed CPU spikes and poor performance in lazy field loading 
@@ -2973,7 +2979,7 @@ Bug Fixes
   when more unused nodes are available. 
   (Eric Falcao, Brett Hoerner, Mark Miller)
 
-* SOLR-4345 : Solr Admin UI dosent work in IE 10 (steffkes)
+* SOLR-4345 : Solr Admin UI doesn't work in IE 10 (steffkes)
 
 * SOLR-4349 : Admin UI - Query Interface does not work in IE
   (steffkes)
@@ -3136,7 +3142,7 @@ Other Changes
   (Shawn Heisey via hossman)
 
 * SOLR-2996: A bare * without a field specification is treated as *:*
-  by the lucene and edismax query paesers.
+  by the lucene and edismax query parsers.
   (hossman, Jan Høydahl, Alan Woodward, yonik)
 
 * SOLR-4416: Upgrade to Tika 1.3. (Markus Jelsma via Mark Miller)
@@ -3292,7 +3298,7 @@ New Features
 * SOLR-4271: Add support for PostingsHighlighter.  (Robert Muir)
 
 * SOLR-4255: The new Solr 4 spatial fields now have a 'filter' boolean local-param
-  that can be set to false to not filter. Its useful when there is already a spatial
+  that can be set to false to not filter. It's useful when there is already a spatial
   filter query but you also need to sort or boost by distance. (David Smiley)
 
 * SOLR-4265, SOLR-4283: Solr now parses request parameters (in URL or sent with POST
@@ -3502,7 +3508,7 @@ Bug Fixes
 * SOLR-3959: Ensure the internal comma separator of poly fields is escaped
   for CSVResponseWriter.  (Areek Zillur via Robert Muir)
   
-* SOLR-4075: A logical shard that has had all of it's SolrCores unloaded should 
+* SOLR-4075: A logical shard that has had all of its SolrCores unloaded should 
   be removed from the cluster state. (Mark Miller, Gilles Comeau)
   
 * SOLR-4034: Check if a collection already exists before trying to create a
@@ -3512,7 +3518,7 @@ Bug Fixes
   (Mark Miller)
   
 * SOLR-4099: Allow the collection api work queue to make forward progress even
-  when it's watcher is not fired for some reason. (Raintung Li via Mark Miller)
+  when its watcher is not fired for some reason. (Raintung Li via Mark Miller)
 
 * SOLR-3960: Fixed a bug where Distributed Grouping ignored PostFilters
   (Nathan Visagan, hossman)
@@ -3528,7 +3534,7 @@ Bug Fixes
   options from being respected in some <fieldType/> declarations (hossman)
 
 * SOLR-4159: When we are starting a shard from rest, a potential leader should 
-  not consider it's last published state when deciding if it can be the new 
+  not consider its last published state when deciding if it can be the new 
   leader. (Mark Miller)
 
 * SOLR-4158: When a core is registering in ZooKeeper it may not wait long 
@@ -3560,7 +3566,7 @@ Bug Fixes
   (steffkes via hossman)
 
 * SOLR-4178: ReplicationHandler should abort any current pulls and wait for 
-  it's executor to stop during core close. (Mark Miller)
+  its executor to stop during core close. (Mark Miller)
 
 * SOLR-3918: Fixed the 'dist-war-excl-slf4j' ant target to exclude all
   slf4j jars, so that the resulting war is usable as is provided the servlet 
@@ -3760,7 +3766,7 @@ Upgrading from Solr 4.0.0-BETA
 In order to better support distributed search mode, the TermVectorComponent's
 response format has been changed so that if the schema defines a 
 uniqueKeyField, then that field value is used as the "key" for each document in
-it's response section, instead of the internal lucene doc id.  Users w/o a 
+its response section, instead of the internal lucene doc id.  Users w/o a 
 uniqueKeyField will continue to see the same response format.  See SOLR-3229
 for more details.
 
@@ -4054,7 +4060,7 @@ Bug Fixes
 
 * SOLR-3783: Fixed Pivot Faceting to work with facet.missing=true (hossman)
 
-* SOLR-3869: A PeerSync attempt to it's replicas by a candidate leader should
+* SOLR-3869: A PeerSync attempt to its replicas by a candidate leader should
   not fail on o.a.http.conn.ConnectTimeoutException. (Mark Miller)
 
 * SOLR-3875: Fixed index boosts on multi-valued fields when docBoost is used 
@@ -5380,7 +5386,7 @@ Bug Fixes
   (James Dyer, others)
   
 * SOLR-3260: DataImportHandler: ScriptTransformer gives better error messages when 
-  problems arise on initalization (no Script Engine, invalid script, etc). (James Dyer)
+  problems arise on initialization (no Script Engine, invalid script, etc). (James Dyer)
 
 * SOLR-2959: edismax now respects the magic fields '_val_' and '_query_'
   (Michael Watts, hossman)
@@ -5987,7 +5993,7 @@ New Features
   the terms component. Example: fq={!term f=weight}1.5   (hossman, yonik) 
 
 * SOLR-1915: DebugComponent now supports using a NamedList to model
-  Explanation objects in it's responses instead of
+  Explanation objects in its responses instead of
   Explanation.toString  (hossman)
 
 * SOLR-2448: Search results clustering updates: bisecting k-means
@@ -6021,7 +6027,7 @@ Bug Fixes
   commit point on server startup is never removed. (yonik)
 
 * SOLR-2466: SolrJ's CommonsHttpSolrServer would retry requests on failure, regardless
-  of the configured maxRetries, due to HttpClient having it's own retry mechanism
+  of the configured maxRetries, due to HttpClient having its own retry mechanism
   by default.  The retryCount of HttpClient is now set to 0, and SolrJ does
   the retry.  (yonik)
 
@@ -6931,7 +6937,7 @@ If you use custom Tokenizer or TokenFilt
 schema.xml, they must support reusability.  If your Tokenizer or TokenFilter
 maintains state, it should implement reset().  If your TokenFilteFactory does
 not return a subclass of TokenFilter, then it should implement reset() and call
-reset() on it's input TokenStream.  TokenizerFactory implementations must
+reset() on its input TokenStream.  TokenizerFactory implementations must
 now return a Tokenizer rather than a TokenStream.
 
 New users of Solr 1.4 will have omitTermFreqAndPositions enabled for non-text
@@ -7169,8 +7175,8 @@ New Features
 47. SOLR-1106: Made CoreAdminHandler Actions pluggable so that additional actions may be plugged in or the existing
     ones can be overridden if needed. (Kay Kay, Noble Paul, shalin)
 
-48. SOLR-1124: Add a top() function query that causes it's argument to
-    have it's values derived from the top level IndexReader, even when
+48. SOLR-1124: Add a top() function query that causes its argument to
+    have its values derived from the top level IndexReader, even when
     invoked from a sub-reader.  top() is implicitly used for the
     ord() and rord() functions.  (yonik)
 
@@ -8922,7 +8928,7 @@ Changes in runtime behavior
  3. A new method "getSolrQueryParser" has been added to the IndexSchema
     class for retrieving a new SolrQueryParser instance with all options
     specified in the schema.xml's <solrQueryParser> block set.  The
-    documentation for the SolrQueryParser constructor and it's use of
+    documentation for the SolrQueryParser constructor and its use of
     IndexSchema have also been clarified.
     (Erik Hatcher and hossman)
 
@@ -8941,7 +8947,7 @@ Changes in runtime behavior
     to facilitate checking for parameters that must be present.
     (Ryan McKinley, J.J. Larrea via yonik)
 
- 8. SOLR-179: By default, solr will abort after any severe initalization
+ 8. SOLR-179: By default, solr will abort after any severe initialization
     errors.  This behavior can be disabled by setting:
     <abortOnConfigurationError>false</abortOnConfigurationError>
     in solrconfig.xml (ryan)