FIX: Fix docstring

Author: larsoner

mne/datasets/kiloword/kiloword.py

@@ -47,10 +47,6 @@ def data_path(path=None, force_update=False, update_path=True, download=True,
                       download=download)
 
 
-data_path.__doc__ = _data_path_doc.format(
-    name='kiloword', conf='MNE_DATASETS_KILOWORD_PATH')
-
-
 def get_version():
     """Get dataset version."""
     return _get_version('kiloword')

mne/datasets/utils.py

@@ -270,6 +270,7 @@ def _data_path(path=None, force_update=False, update_path=True, download=True,
     # filename of the resulting downloaded archive (only needed if the URL
     # name does not match resulting filename)
     archive_names = dict(
+        kiloword='MNE-kiloword-data.tar.gz',
         misc='mne-misc-data-%s.tar.gz' % releases['misc'],
         multimodal='MNE-multimodal-data.tar.gz',
         sample='MNE-sample-data-processed.tar.gz',

mne/epochs.py

@@ -211,8 +211,10 @@ class BaseEpochs(ProjMixin, ContainsMixin, UpdateChannelsMixin,
         ignored.
     filename : str | None
         The filename (if the epochs are read from disk).
-    metadata : DataFrame | None.
-        See `Epochs` docstring.
+    metadata : instance of pandas.DataFrame | None
+        See :class:`mne.Epochs` docstring.
+
+        .. versionadded:: 0.16
     verbose : bool, str, int, or None
         If not None, override default verbose level (see :func:`mne.verbose`
         and :ref:`Logging documentation <tut_logging>` for more). Defaults to
@@ -1867,7 +1869,7 @@ class Epochs(BaseEpochs):
         Whether to reject based on annotations. If True (default), epochs
         overlapping with segments whose description begins with ``'bad'`` are
         rejected. If False, no rejection based on annotations is performed.
-    metadata : None | instance of pandas.DataFrame
+    metadata : instance of pandas.DataFrame | None
         A :class:`pandas.DataFrame` specifying more complex metadata about
         events. If given, ``len(metadata)`` must equal ``len(events)``.
         The DataFrame may have values of type (str | int | float).
@@ -2042,7 +2044,7 @@ class EpochsArray(BaseEpochs):
         Apply SSP projection vectors. See :class:`mne.Epochs` for details.
     on_missing : str
         See :class:`mne.Epochs` docstring for details.
-    metadata : None | instance of pandas.DataFrame
+    metadata : instance of pandas.DataFrame | None
         See :class:`mne.Epochs` docstring for details.
 
         .. versionadded:: 0.16