Revert "DOC Fixed whatsnew and tiny docstring fix (scikit-learn#12669)"

This reverts commit 58d9ed3.
xhluca · Apr 28, 2019 · 031a983 · 031a983
1 parent 1164f7f
commit 031a983
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 7 deletions.
diff --git a/doc/whats_new/v0.21.rst b/doc/whats_new/v0.21.rst
@@ -87,12 +87,9 @@ Support for Python 3.4 and below has been officially dropped.
 :mod:`sklearn.model_selection`
 ......................
 
-- |Enhancement| Classes :class:`GridSearchCV`, :class:`RandomSearchCV`, and
-  methods :func:`cross_val_score`, :func:`cross_val_predict`,
-  :func:`cross_validate`, now print train scores when `return_train_scores` is
-  True and `verbose` > 2. For :func:`learning_curve`, and
-  :func:`validation_curve` only the latter is required.
-  :issue:`12613` and :issue:`12669` by :user:`Marc Torrellas <marctorrellas>`.
+- |Enhancement| Method :func:`_fit_and_score` now prints train_scores when
+  `return_train_scores` is True and `verbose` > 2.
+  :issue:`12613` by :user:`Marc Torrellas <marctorrellas>`.
 
 :mod:`sklearn.neighbors`
 ........................

diff --git a/sklearn/model_selection/_search.py b/sklearn/model_selection/_search.py
@@ -342,7 +342,7 @@ def fit_grid_point(X, y, estimator, parameters, train, test, scorer,
     Returns
     -------
     score : float
-         Score of this parameter setting on given test split.
+         Score of this parameter setting on given training / test split.
 
     parameters : dict
         The parameters that have been evaluated.