diff --git a/solr/solr-ref-guide/src/language-analysis.adoc b/solr/solr-ref-guide/src/language-analysis.adoc
index 25124e521e0..0cf8e13ac06 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
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 4e1c03e2953..dff118bf1b5 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.