Merge pull request #3127 from rmcgibbo/_fit_and_score-docstring

arjoly · arjoly · commit 29e9ed1acd43 · 2014-05-02T11:31:50.000+02:00
[DOC] Make _fit_and_score return value docstring consistent with code.
diff --git a/sklearn/cross_validation.py b/sklearn/cross_validation.py
@@ -1159,12 +1159,12 @@ def _fit_and_score(estimator, X, y, scorer, train, test, verbose, parameters,
 
     Returns
     -------
+    train_score : float, optional
+        Score on training set, returned only if `return_train_score` is `True`. 
+        
     test_score : float
         Score on test set.
 
-    train_score : float, optional
-        Score on training set.
-
     n_test_samples : int
         Number of test samples.
 
