Merge pull request #4042 from lmichelbacher/patch-2

GaelVaroquaux · GaelVaroquaux · commit 69567ec214a3 · 2015-01-09T07:40:48.000+01:00
[MRG+1] Add dependence on max_features to docstring
diff --git a/sklearn/feature_extraction/text.py b/sklearn/feature_extraction/text.py
@@ -607,9 +607,12 @@ class CountVectorizer(BaseEstimator, VectorizerMixin):
         A mapping of terms to feature indices.
 
     stop_words_ : set
-        Terms that were ignored because
-        they occurred in either too many
-        (`max_df`) or in too few (`min_df`) documents.
+        Terms that were ignored because they either:
+
+          - occurred in too many documents (`max_df`)
+          - occurred in too few documents (`min_df`)
+          - were cut off by feature selection (`max_features`).
+
         This is only available if no vocabulary was given.
 
     See also
