diff --git a/build_tools/travis/test_script.sh b/build_tools/travis/test_script.sh index 58f49f4cbb70c1f2144b94fdf785b6e35bf2c8f4..df3add34f0c142d21ecba337a86cb4500f128ca8 100755 --- a/build_tools/travis/test_script.sh +++ b/build_tools/travis/test_script.sh @@ -26,7 +26,7 @@ run_tests() { else TEST_CMD="nosetests --with-timer --timer-top-n 20" fi - # Get into a temp directory to run test from the installed scikit learn and + # Get into a temp directory to run test from the installed scikit-learn and # check if we do not leave artifacts mkdir -p $TEST_DIR # We need the setup.cfg for the nose settings diff --git a/sklearn/datasets/california_housing.py b/sklearn/datasets/california_housing.py index 8db5e3139d159c7a79cd10a1e70338d79f1447a9..a9f21510b0f01c5da827ee4201dfe7704cfa2061 100644 --- a/sklearn/datasets/california_housing.py +++ b/sklearn/datasets/california_housing.py @@ -58,7 +58,7 @@ def fetch_california_housing(data_home=None, download_if_missing=True): ---------- data_home : optional, default: None Specify another download and cache folder for the datasets. By default - all scikit learn data is stored in '~/scikit_learn_data' subfolders. + all scikit-learn data is stored in '~/scikit_learn_data' subfolders. download_if_missing : optional, True by default If False, raise a IOError if the data is not locally available diff --git a/sklearn/datasets/covtype.py b/sklearn/datasets/covtype.py index a165f7c054c62ae135c7f0b243dde92c0b97be8b..6d34cd35754f46c1e80ad077e20d7b7ab702626e 100644 --- a/sklearn/datasets/covtype.py +++ b/sklearn/datasets/covtype.py @@ -50,7 +50,7 @@ def fetch_covtype(data_home=None, download_if_missing=True, ---------- data_home : string, optional Specify another download and cache folder for the datasets. By default - all scikit learn data is stored in '~/scikit_learn_data' subfolders. + all scikit-learn data is stored in '~/scikit_learn_data' subfolders. download_if_missing : boolean, default=True If False, raise a IOError if the data is not locally available diff --git a/sklearn/datasets/kddcup99.py b/sklearn/datasets/kddcup99.py index 4be96e45605f9e6458ac415e4922b17e725eea2b..762ca58a635542b88c288102dfa4139aed610349 100644 --- a/sklearn/datasets/kddcup99.py +++ b/sklearn/datasets/kddcup99.py @@ -228,7 +228,7 @@ def _fetch_brute_kddcup99(subset=None, data_home=None, data_home : string, optional Specify another download and cache folder for the datasets. By default - all scikit learn data is stored in '~/scikit_learn_data' subfolders. + all scikit-learn data is stored in '~/scikit_learn_data' subfolders. download_if_missing : boolean, default=True If False, raise a IOError if the data is not locally available diff --git a/sklearn/datasets/lfw.py b/sklearn/datasets/lfw.py index e3406f9e3ce7e2cd5e1d581791ac3e14c67c2550..50834f7705ef6f02443e7f82e6fce288832d516e 100644 --- a/sklearn/datasets/lfw.py +++ b/sklearn/datasets/lfw.py @@ -251,7 +251,7 @@ def fetch_lfw_people(data_home=None, funneled=True, resize=0.5, ---------- data_home : optional, default: None Specify another download and cache folder for the datasets. By default - all scikit learn data is stored in '~/scikit_learn_data' subfolders. + all scikit-learn data is stored in '~/scikit_learn_data' subfolders. funneled : boolean, optional, default: True Download and use the funneled variant of the dataset. @@ -414,7 +414,7 @@ def fetch_lfw_pairs(subset='train', data_home=None, funneled=True, resize=0.5, data_home : optional, default: None Specify another download and cache folder for the datasets. By - default all scikit learn data is stored in '~/scikit_learn_data' + default all scikit-learn data is stored in '~/scikit_learn_data' subfolders. funneled : boolean, optional, default: True diff --git a/sklearn/datasets/mldata.py b/sklearn/datasets/mldata.py index f5377f203e1da31831f0eab4a1dc14fc7332d626..9b4a8e3a1daa376bbcfbec34c377b38ec716d8ae 100644 --- a/sklearn/datasets/mldata.py +++ b/sklearn/datasets/mldata.py @@ -78,7 +78,7 @@ def fetch_mldata(dataname, target_name='label', data_name='data', data_home : optional, default: None Specify another download and cache folder for the data sets. By default - all scikit learn data is stored in '~/scikit_learn_data' subfolders. + all scikit-learn data is stored in '~/scikit_learn_data' subfolders. Returns ------- diff --git a/sklearn/datasets/olivetti_faces.py b/sklearn/datasets/olivetti_faces.py index 9ecab18c0e5f34e01bd0a16ddd2377c59e23d116..7dfd4dec1624792ccb1fdb8b38225b11bc95d8f9 100644 --- a/sklearn/datasets/olivetti_faces.py +++ b/sklearn/datasets/olivetti_faces.py @@ -61,7 +61,7 @@ def fetch_olivetti_faces(data_home=None, shuffle=False, random_state=0, ---------- data_home : optional, default: None Specify another download and cache folder for the datasets. By default - all scikit learn data is stored in '~/scikit_learn_data' subfolders. + all scikit-learn data is stored in '~/scikit_learn_data' subfolders. shuffle : boolean, optional If True the order of the dataset is shuffled to avoid having diff --git a/sklearn/datasets/rcv1.py b/sklearn/datasets/rcv1.py index ae45764b4042b79f943a7877900a954229cbd24a..0933155c0afc102ee024e8d671fd558bd3c23b47 100644 --- a/sklearn/datasets/rcv1.py +++ b/sklearn/datasets/rcv1.py @@ -57,7 +57,7 @@ def fetch_rcv1(data_home=None, subset='all', download_if_missing=True, ---------- data_home : string, optional Specify another download and cache folder for the datasets. By default - all scikit learn data is stored in '~/scikit_learn_data' subfolders. + all scikit-learn data is stored in '~/scikit_learn_data' subfolders. subset : string, 'train', 'test', or 'all', default='all' Select the dataset to load: 'train' for the training set diff --git a/sklearn/datasets/species_distributions.py b/sklearn/datasets/species_distributions.py index f34eb92d3366d73053bccfe7e83020b10b488bc3..14b5b38d0cd3161bfed92bef0ec2f5d3d7119f30 100644 --- a/sklearn/datasets/species_distributions.py +++ b/sklearn/datasets/species_distributions.py @@ -140,7 +140,7 @@ def fetch_species_distributions(data_home=None, ---------- data_home : optional, default: None Specify another download and cache folder for the datasets. By default - all scikit learn data is stored in '~/scikit_learn_data' subfolders. + all scikit-learn data is stored in '~/scikit_learn_data' subfolders. download_if_missing : optional, True by default If False, raise a IOError if the data is not locally available