You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by ho...@apache.org on 2017/05/25 18:22:38 UTC

[1/2] lucene-solr:branch_6x: remove ref-guide mentions of 'deprecated' things that don't even exist in any 6.x release

Repository: lucene-solr
Updated Branches:
  refs/heads/branch_6_6 2bc88b3df -> bfb1ee42b
  refs/heads/branch_6x 7452622e8 -> 388316c80


remove ref-guide mentions of 'deprecated' things that don't even exist in any 6.x release

(cherry picked from commit 461fc596130a9ef728bcb9f1278be62bf3e00f64)


Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/388316c8
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/388316c8
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/388316c8

Branch: refs/heads/branch_6x
Commit: 388316c80c44ae8e2dd4f49ce4df2c3ac91e057e
Parents: 7452622
Author: Chris Hostetter <ho...@apache.org>
Authored: Thu May 25 11:21:51 2017 -0700
Committer: Chris Hostetter <ho...@apache.org>
Committed: Thu May 25 11:22:08 2017 -0700

----------------------------------------------------------------------
 solr/solr-ref-guide/src/language-analysis.adoc  | 37 +-------------------
 .../shards-and-indexing-data-in-solrcloud.adoc  |  5 ---
 2 files changed, 1 insertion(+), 41 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/388316c8/solr/solr-ref-guide/src/language-analysis.adoc
----------------------------------------------------------------------
diff --git a/solr/solr-ref-guide/src/language-analysis.adoc b/solr/solr-ref-guide/src/language-analysis.adoc
index 25124e5..0cf8e13 100644
--- a/solr/solr-ref-guide/src/language-analysis.adoc
+++ b/solr/solr-ref-guide/src/language-analysis.adoc
@@ -511,42 +511,7 @@ Solr can stem Catalan using the Snowball Porter Stemmer with an argument of `lan
 [[LanguageAnalysis-Chinese]]
 === Chinese
 
-[[LanguageAnalysis-ChineseTokenizer]]
-==== Chinese Tokenizer
-
-The Chinese Tokenizer is deprecated as of Solr 3.4. Use the <<tokenizers.adoc#Tokenizers-StandardTokenizer,`solr.StandardTokenizerFactory`>> instead.
-
-*Factory class:* `solr.ChineseTokenizerFactory`
-
-*Arguments:* None
-
-*Example:*
-
-[source,xml]
-----
-<analyzer type="index">
-  <tokenizer class="solr.ChineseTokenizerFactory"/>
-</analyzer>
-----
-
-[[LanguageAnalysis-ChineseFilterFactory]]
-==== Chinese Filter Factory
-
-The Chinese Filter Factory is deprecated as of Solr 3.4. Use the <<filter-descriptions.adoc#FilterDescriptions-StopFilter,`solr.StopFilterFactory`>> instead.
-
-*Factory class:* `solr.ChineseFilterFactory`
-
-*Arguments:* None
-
-*Example:*
-
-[source,xml]
-----
-<analyzer type="index">
-  <tokenizer class="solr.StandardTokenizerFactory"/>
-  <filter class="solr.ChineseFilterFactory"/>
-</analyzer>
-----
+<<tokenizers.adoc#Tokenizers-StandardTokenizer,`solr.StandardTokenizerFactory`>> is suitable for Traditional Chinese text.  Following the Word Break rules from the Unicode Text Segmentation algorithm, it produces one token per Chinese character.
 
 [[LanguageAnalysis-SimplifiedChinese]]
 === Simplified Chinese

http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/388316c8/solr/solr-ref-guide/src/shards-and-indexing-data-in-solrcloud.adoc
----------------------------------------------------------------------
diff --git a/solr/solr-ref-guide/src/shards-and-indexing-data-in-solrcloud.adoc b/solr/solr-ref-guide/src/shards-and-indexing-data-in-solrcloud.adoc
index 4e1c03e..dff118b 100644
--- a/solr/solr-ref-guide/src/shards-and-indexing-data-in-solrcloud.adoc
+++ b/solr/solr-ref-guide/src/shards-and-indexing-data-in-solrcloud.adoc
@@ -45,11 +45,6 @@ If you use the (default) "```compositeId```" router, you can send documents with
 
 Then at query time, you include the prefix(es) into your query with the `\_route_` parameter (i.e., `q=solr&_route_=IBM!`) to direct queries to specific shards. In some situations, this may improve query performance because it overcomes network latency when querying all the shards.
 
-[IMPORTANT]
-====
-The `\_route_` parameter replaces `shard.keys`, which has been deprecated and will be removed in a future Solr release.
-====
-
 The `compositeId` router supports prefixes containing up to 2 levels of routing. For example: a prefix routing first by region, then by customer: "USA!IBM!12345"
 
 Another use case could be if the customer "IBM" has a lot of documents and you want to spread it across multiple shards. The syntax for such a use case would be : "shard_key/num!document_id" where the /num is the number of bits from the shard key to use in the composite hash.

[2/2] lucene-solr:branch_6_6: remove ref-guide mentions of 'deprecated' things that don't even exist in any 6.x release

Posted by ho...@apache.org.
remove ref-guide mentions of 'deprecated' things that don't even exist in any 6.x release

(cherry picked from commit 461fc596130a9ef728bcb9f1278be62bf3e00f64)


Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/bfb1ee42
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/bfb1ee42
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/bfb1ee42

Branch: refs/heads/branch_6_6
Commit: bfb1ee42b2edbc2f2dea49b9d0e3201069d6e781
Parents: 2bc88b3
Author: Chris Hostetter <ho...@apache.org>
Authored: Thu May 25 11:21:51 2017 -0700
Committer: Chris Hostetter <ho...@apache.org>
Committed: Thu May 25 11:22:22 2017 -0700

----------------------------------------------------------------------
 solr/solr-ref-guide/src/language-analysis.adoc  | 37 +-------------------
 .../shards-and-indexing-data-in-solrcloud.adoc  |  5 ---
 2 files changed, 1 insertion(+), 41 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/bfb1ee42/solr/solr-ref-guide/src/language-analysis.adoc
----------------------------------------------------------------------
diff --git a/solr/solr-ref-guide/src/language-analysis.adoc b/solr/solr-ref-guide/src/language-analysis.adoc
index 25124e5..0cf8e13 100644
--- a/solr/solr-ref-guide/src/language-analysis.adoc
+++ b/solr/solr-ref-guide/src/language-analysis.adoc
@@ -511,42 +511,7 @@ Solr can stem Catalan using the Snowball Porter Stemmer with an argument of `lan
 [[LanguageAnalysis-Chinese]]
 === Chinese
 
-[[LanguageAnalysis-ChineseTokenizer]]
-==== Chinese Tokenizer
-
-The Chinese Tokenizer is deprecated as of Solr 3.4. Use the <<tokenizers.adoc#Tokenizers-StandardTokenizer,`solr.StandardTokenizerFactory`>> instead.
-
-*Factory class:* `solr.ChineseTokenizerFactory`
-
-*Arguments:* None
-
-*Example:*
-
-[source,xml]
-----
-<analyzer type="index">
-  <tokenizer class="solr.ChineseTokenizerFactory"/>
-</analyzer>
-----
-
-[[LanguageAnalysis-ChineseFilterFactory]]
-==== Chinese Filter Factory
-
-The Chinese Filter Factory is deprecated as of Solr 3.4. Use the <<filter-descriptions.adoc#FilterDescriptions-StopFilter,`solr.StopFilterFactory`>> instead.
-
-*Factory class:* `solr.ChineseFilterFactory`
-
-*Arguments:* None
-
-*Example:*
-
-[source,xml]
-----
-<analyzer type="index">
-  <tokenizer class="solr.StandardTokenizerFactory"/>
-  <filter class="solr.ChineseFilterFactory"/>
-</analyzer>
-----
+<<tokenizers.adoc#Tokenizers-StandardTokenizer,`solr.StandardTokenizerFactory`>> is suitable for Traditional Chinese text.  Following the Word Break rules from the Unicode Text Segmentation algorithm, it produces one token per Chinese character.
 
 [[LanguageAnalysis-SimplifiedChinese]]
 === Simplified Chinese

http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/bfb1ee42/solr/solr-ref-guide/src/shards-and-indexing-data-in-solrcloud.adoc
----------------------------------------------------------------------
diff --git a/solr/solr-ref-guide/src/shards-and-indexing-data-in-solrcloud.adoc b/solr/solr-ref-guide/src/shards-and-indexing-data-in-solrcloud.adoc
index 4e1c03e..dff118b 100644
--- a/solr/solr-ref-guide/src/shards-and-indexing-data-in-solrcloud.adoc
+++ b/solr/solr-ref-guide/src/shards-and-indexing-data-in-solrcloud.adoc
@@ -45,11 +45,6 @@ If you use the (default) "```compositeId```" router, you can send documents with
 
 Then at query time, you include the prefix(es) into your query with the `\_route_` parameter (i.e., `q=solr&_route_=IBM!`) to direct queries to specific shards. In some situations, this may improve query performance because it overcomes network latency when querying all the shards.
 
-[IMPORTANT]
-====
-The `\_route_` parameter replaces `shard.keys`, which has been deprecated and will be removed in a future Solr release.
-====
-
 The `compositeId` router supports prefixes containing up to 2 levels of routing. For example: a prefix routing first by region, then by customer: "USA!IBM!12345"
 
 Another use case could be if the customer "IBM" has a lot of documents and you want to spread it across multiple shards. The syntax for such a use case would be : "shard_key/num!document_id" where the /num is the number of bits from the shard key to use in the composite hash.