svn commit: r1434402 - in /lucene/dev/branches/branch_4x: ./ solr/ solr/CHANGES.txt

[sa...@apache.org]

Author: sarowe
Date: Wed Jan 16 21:11:16 2013
New Revision: 1434402

URL: http://svn.apache.org/viewvc?rev=1434402&view=rev
Log:
- Make complex SOLR-2592 changes entry not get converted to a single wrapped line in Changes.html.
- 'Via' -> 'via' (merged lucene_solr_4_1 r1434389)

Modified:
    lucene/dev/branches/branch_4x/   (props changed)
    lucene/dev/branches/branch_4x/solr/   (props changed)
    lucene/dev/branches/branch_4x/solr/CHANGES.txt   (contents, props changed)

Modified: lucene/dev/branches/branch_4x/solr/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/CHANGES.txt?rev=1434402&r1=1434401&r2=1434402&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/CHANGES.txt (original)
+++ lucene/dev/branches/branch_4x/solr/CHANGES.txt Wed Jan 16 21:11:16 2013
@@ -213,14 +213,18 @@ New Features
   numShards=N is specified on collection creation).  Documents with ids sharing
   the same domain (prefix) will be routed to the same shard, allowing for
   efficient querying.
-  Example: 
+
+  Example:
     The following two documents will be indexed to the same shard
     since they share the same domain "customerB!". 
+    <code>
        {"id" : "customerB!doc1" [...] }
        {"id" : "customerB!doc2" [...] }
+    </code>
     At query time, one can specify a "shard.keys" parameter that lists what
     shards the query should cover.
-       http://.../query?q=my_query&shard.keys=customerB! 
+       http://.../query?q=my_query&shard.keys=customerB!
+
   Collections that do not specify numShards at collection creation time
   use custom sharding and default to the "implicit" router.  Document updates
   received by a shard will be indexed to that shard, unless a "_shard_" parameter
@@ -369,7 +373,7 @@ Bug Fixes
 
 * SOLR-4064: When there is an unexpected exception while trying to run the new
   leader process, the SolrCore will not correctly rejoin the election.
-  (Po Rui Via Mark Miller)
+  (Po Rui via Mark Miller)
 
 * SOLR-3989: SolrZkClient constructor dropped exception cause when throwing
   a new RuntimeException. (Colin Bartolome, yonik)