skimage/version.py should be ignored. Doc has been updated with new module

name ``sklearn``

.gitignore

@@ -11,6 +11,6 @@ doc/build
 source/api
 build
 dist
-scikits/image/version.py
+skimage/version.py
 *.swp
 .coverage

LICENSE.txt

@@ -1,7 +1,7 @@
 Unless otherwise specified by LICENSE.txt files in individual
 directories, all code is
 
-Copyright (C) 2011, the scikits-image team
+Copyright (C) 2011, the Image Scikit team
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without

TASKS.txt

@@ -3,13 +3,13 @@
 How to contribute to ``skimage``
 ======================================
 
-Developing Open Source is great fun!  Join us on the `scikits-image mailing
+Developing Open Source is great fun!  Join us on the `skimage mailing
 list <http://groups.google.com/group/scikits-image>`_ and tell us which of the
 following challenges you'd like to solve.
 
 * Mentoring is available for those new to scientific programming in Python.
 * The technical detail of the `development process`_ is given below.
-* :doc:`How to use GitHub <gitwash/index>` when developing scikits.image
+* :doc:`How to use GitHub <gitwash/index>` when developing skimage
 
 .. contents::
    :local:

doc/source/conf.py

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 #
-# scikits.image documentation build configuration file, created by
+# skimage documentation build configuration file, created by
 # sphinx-quickstart on Sat Aug 22 13:00:30 2009.
 #
 # This file is execfile()d with the current directory set to its containing dir.
@@ -49,7 +49,7 @@ master_doc = 'index'
 
 # General information about the project.
 project = u'skimage'
-copyright = u'2011, scikits-image team'
+copyright = u'2011, the Image Scikit team'
 
 # The version info for the project you're documenting, acts as replacement for
 # |version| and |release|, also used in various other places throughout the
@@ -122,7 +122,7 @@ html_theme_path = ['themes']
 
 # The name for this set of Sphinx documents.  If None, it defaults to
 # "<project> v<release> documentation".
-html_title = 'scikits.image v%s docs' % version
+html_title = 'skimage v%s docs' % version
 
 # A shorter title for the navigation bar.  Default is the same as html_title.
 #html_short_title = None
@@ -197,7 +197,7 @@ htmlhelp_basename = 'scikitsimagedoc'
 # Grouping the document tree into LaTeX files. List of tuples
 # (source start file, target name, title, author, documentclass [howto/manual]).
 latex_documents = [
-  ('contents', 'scikitsimage.tex', u'scikits.image Documentation',
+  ('contents', 'scikitsimage.tex', u'The Image Scikit Documentation',
    u'SciPy Developers', 'manual'),
 ]
 

skimage/data/__init__.py

@@ -18,7 +18,7 @@ def load(f):
     Returns
     -------
     img : ndarray
-        Image loaded from scikits.image.data_dir.
+        Image loaded from skimage.data_dir.
     """
     return imread(_os.path.join(data_dir, f))