From 1efb5948a8ba1170dfb1061dabe794765f048e1f Mon Sep 17 00:00:00 2001
From: Robert McGibbon <rmcgibbo@gmail.com>
Date: Thu, 1 May 2014 23:02:38 -0700
Subject: [PATCH] Change the order of test_score and train_score in the
 _fit_and_score docstring to reflect what the code actually does

---
 sklearn/cross_validation.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/sklearn/cross_validation.py b/sklearn/cross_validation.py
index b61be5ce46e83..5a9886bb4b2e8 100644
--- 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.