fix spacing and merge missing entries

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1231545 13f79535-47bb-0310-9956-ffa450edef68

lucene/contrib/CHANGES.txt

@@ -111,6 +111,12 @@ New Features
  * LUCENE-3634: IndexReader's static main method was moved to a new
    tool, CompoundFileExtractor, in contrib/misc.  (Mike McCandless)
 
+ * SOLR-3020: Add KeywordAttribute support to HunspellStemFilter. Terms marked as
+   keywords are not modified by the stemmer. (Simon Willnauer, Helge Jenssen)
+
+ * LUCENE-3305: Added Kuromoji morphological analyzer for Japanese.
+   (Christian Moen, Masaru Hasegawa, Simon Willnauer, Uwe Schindler, Mike McCandless, Robert Muir)
+
  * LUCENE-3685: Add ToChildBlockJoinQuery and renamed previous
    BlockJoinQuery to ToParentBlockJoinQuery, so that you can now do
    joins in both parent to child and child to parent directions.
@@ -126,7 +132,12 @@ API Changes
    not take position overlaps into account while recalculating norms.
    (Uwe Schindler, Robert Muir)
 
-Changes in runtime behavior:
+ * LUCENE-3305: Added SegmentingTokenizerBase, which breaks text into sentences
+   with BreakIterator and allows subclasses to decompose sentences into words, or
+   use the sentence boundary information for other reasons (e.g. attribute/position increment)
+   (Robert Muir)
+
+Changes in runtime behavior
 
  * LUCENE-3626: PKIndexSplitter and MultiPassIndexSplitter now work
    per segment.  (Uwe Schindler)
@@ -150,6 +161,9 @@ Bug Fixes
    cover all tokens it had matched.  (Koji Sekiguchi, Robert Muir,
    Mike McCandless)
 
+ * LUCENE-3686: CategoryEnhancement must override Object.equals(Object).
+   (Sivan Yogev via Shai Erera)
+
 Documentation
 
  * LUCENE-3599: Javadocs for DistanceUtils.haversine() were incorrectly