Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions doc/source/devel/data_pkg_discuss.rst
Original file line number Diff line number Diff line change
Expand Up @@ -367,14 +367,14 @@ Discovery

.. [#tag-sources]

Revsion ids could for example be hashes of the package instantiation
Revision ids could for example be hashes of the package instantiation
(package contents), so they could be globally unique to the contents,
wherever the contents was when the identifier was made. However, *tags*
are just names that someone has attached to a particular revsion id. If
are just names that someone has attached to a particular revision id. If
there is more than one person providing versions of a particular package,
there may not be agreement on the revsion that a particular tag is attached
there may not be agreement on the revision that a particular tag is attached
to. For example, I might think that ``release-0.3`` of ``some-package``
refers to package state identified by revsion id ``af5bd6``, but you might
refers to package state identified by revision id ``af5bd6``, but you might
think that ``release-0.3`` of ``some-package`` refers to some other package
state. In this case you and are are both a *tag sources* for the package.
The state that particular tag refers to can depend then on the source from
Expand Down
2 changes: 1 addition & 1 deletion doc/source/devel/spm_use.rst
Original file line number Diff line number Diff line change
Expand Up @@ -291,7 +291,7 @@ from volumes, as long as the transform is an affine.

Miscellaneous functions operating on vol structs:

* ``spm_conv_vol`` - convolves volume with seperable functions in x, y, z
* ``spm_conv_vol`` - convolves volume with separable functions in x, y, z
* ``spm_render_vol`` - does a projection of a volume onto a surface
* ``spm_vol_check`` - takes array of vol structs and checks for sameness of
image dimensions and ``mat`` (affines) across the list.
Expand Down
2 changes: 1 addition & 1 deletion doc/source/dicom/dcm2nii_algorithms.rst
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ Compiling dcm2nii
=================

Follow the download / install instructions at the
http://www.lazarus.freepascal.org/ site. I was on a Mac, and folowed the
http://www.lazarus.freepascal.org/ site. I was on a Mac, and followed the
instructions here:
http://wiki.lazarus.freepascal.org/Installing_Lazarus_on_MacOS_X . Default
build with version 0.9.28.2 gave an error linking against Carbon, so I needed to
Expand Down
4 changes: 2 additions & 2 deletions doc/source/dicom/spm_dicom.rst
Original file line number Diff line number Diff line change
Expand Up @@ -80,8 +80,8 @@ There's a check for not-even tag length. If not even:
#. 13 appears to mean 10 and is reset to be 10
#. Any other odd number is not valid and gives a tag length of 0

``SQ`` VR type (Sequnce of items type)
--------------------------------------
``SQ`` VR type (Sequence of items type)
---------------------------------------

tag length of 13 set to tag length 10.

Expand Down
2 changes: 1 addition & 1 deletion doc/source/installation.rst
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ Windows), and type::

This will download and install NiBabel.

If you really like doing stuff manually, you can install NiBabel by downoading
If you really like doing stuff manually, you can install NiBabel by downloading
the source from `NiBabel pypi`_ . Go to the pypi page and select the source
distribution you want. Download the distribution, unpack it, and then, from
the unpacked directory, run::
Expand Down
2 changes: 1 addition & 1 deletion doc/source/old/examples.txt
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ the desired values:
>>> print nim.header['dim']
[ 4 32 32 16 100 1 1 1]

First value shows the number of dimensions in the datset: 4 (good, that's what
First value shows the number of dimensions in the dataset: 4 (good, that's what
we wanted). The following numbers are dataset size on the x, y, z, t, u, v, w
axis (NIfTI files can handle up to 7 dimensions).

Expand Down
2 changes: 1 addition & 1 deletion nibabel/data.py
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ def list_files(self, relative=True):
Parameters
----------
relative: bool, optional
If True, path returned are relative to the base paht of
If True, path returned are relative to the base path of
the data source.

Returns
Expand Down
2 changes: 1 addition & 1 deletion nibabel/pkg_info.py
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ def cmp_pkg_version(version_str, pkg_version_str=__version__):
version_str : str
Version string to compare to current package version
pkg_version_str : str, optional
Version of our package. Optional, set fom ``__version__`` by default.
Version of our package. Optional, set from ``__version__`` by default.

Returns
-------
Expand Down
2 changes: 1 addition & 1 deletion nibabel/tests/test_analyze.py
Original file line number Diff line number Diff line change
Expand Up @@ -656,7 +656,7 @@ def as_analyze_map(self):
exp_hdr['cal_min'] = -100
exp_hdr['cal_max'] = 100
assert klass.from_header(H5()) == exp_hdr
# set_* methods override fields fron header
# set_* methods override fields from header

class H6(H5):

Expand Down
2 changes: 1 addition & 1 deletion nibabel/tests/test_api_validators.py
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ class ValidateAPI(metaclass=validator2test):

Your job is twofold:

* define an ``obj_params`` iteratable, where the iterator returns (``obj``,
* define an ``obj_params`` iterable, where the iterator returns (``obj``,
``params``) pairs. ``obj`` is something that you want to validate against
an API. ``params`` is a mapping giving parameters for this object to test
against.
Expand Down
2 changes: 1 addition & 1 deletion nibabel/tests/test_fileslice.py
Original file line number Diff line number Diff line change
Expand Up @@ -298,7 +298,7 @@ def test_optimize_slicer():
# be 'full'
assert optimize_slicer(slice(9), 10, False, False, 4, _always) == (slice(0, 9, 1), slice(None))
assert optimize_slicer(slice(9), 10, True, False, 4, _always) == (slice(None), slice(0, 9, 1))
# Unless this is the slowest dimenion, and all_true is True, in which case
# Unless this is the slowest dimension, and all_true is True, in which case
# we don't update to full
assert optimize_slicer(slice(9), 10, True, True, 4, _always) == (slice(0, 9, 1), slice(None))
# Nor if the heuristic won't update
Expand Down
2 changes: 1 addition & 1 deletion nibabel/tests/test_processing.py
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ def test_adapt_affine():
[ 3, 4, 12],
[ 6, 7, 13],
[ 0, 0, 1]])
# For 4x4 affine, 1D image, 2 dropped columnn
# For 4x4 affine, 1D image, 2 dropped columns
assert_array_equal(adapt_affine(aff_3d, 1),
[[ 0, 11],
[ 3, 12],
Expand Down
2 changes: 1 addition & 1 deletion nibabel/tests/test_wrapstruct.py
Original file line number Diff line number Diff line change
Expand Up @@ -213,7 +213,7 @@ def test_endian_guess(self):
assert eh_swapped.endianness == swapped_code

def test_binblock_is_file(self):
# Checks that the binary string respresentation is the whole of the
# Checks that the binary string representation is the whole of the
# header file. This is true for Analyze types, but not true Nifti
# single file headers, for example, because they will have extension
# strings following. More generally, there may be other perhaps
Expand Down