diff --git a/README.rst b/README.rst index 45856f679..d06198bbf 100644 --- a/README.rst +++ b/README.rst @@ -118,26 +118,40 @@ When working on NiBabel itself, it may be useful to install in "editable" mode:: For more information on previous releases, see the `release archive`_ or `development changelog`_. +Please find detailed `download and installation instructions +`_ in the manual. + .. _current release: https://pypi.python.org/pypi/NiBabel -.. _release archive: https://github.com/nipy/NiBabel/releases .. _development changelog: https://nipy.org/nibabel/changelog.html +.. _installation: https://nipy.org/nibabel/installation.html#installation +.. _release archive: https://github.com/nipy/NiBabel/releases -Mailing List -============ +Support +======= + +If you have problems installing the software or questions about usage, +documentation or anything else related to NiBabel, you can post to the NiPy +mailing list: neuroimaging@python.org [subscription_, archive_] + +The mailing list is the preferred way to announce changes and additions to the +project. You can also search the mailing list archive using the mailing list +archive search located in the sidebar of the NiBabel home page. +We recommend that anyone using NiBabel subscribes to the mailing list. -Please send any questions or suggestions to the `neuroimaging mailing list -`_. +.. _subscription: https://mail.python.org/mailman/listinfo/neuroimaging +.. _archive: https://mail.python.org/pipermail/neuroimaging License ======= -NiBabel is licensed under the terms of the `MIT license -`__. -Some code included with NiBabel is licensed under the `BSD license`_. -For more information, please see the COPYING_ file. +NiBabel is free-software (beer and speech) and covered by the +`MIT License `_. This applies to all source code, documentation, +examples and snippets inside the source distribution (including this website). +Please see the `appendix of the manual `_ for the copyright statement +and the full text of the license. -.. _BSD license: https://opensource.org/licenses/BSD-3-Clause -.. _COPYING: https://github.com/nipy/nibabel/blob/master/COPYING +.. _license: https://nipy.org/nibabel/legal.html#license +.. _mit: https://opensource.org/license17s/MIT Citation ======== diff --git a/doc/source/index.rst b/doc/source/index.rst index 701de0136..aca34cce9 100644 --- a/doc/source/index.rst +++ b/doc/source/index.rst @@ -124,41 +124,8 @@ contributed code and discussion (in rough order of appearance): * Jérôme Dockès * Jacob Roberts -License reprise -=============== - -NiBabel is free-software (beer and speech) and covered by the `MIT License`_. -This applies to all source code, documentation, examples and snippets inside -the source distribution (including this website). Please see the -:ref:`appendix of the manual ` for the copyright statement and the -full text of the license. - -Download and Installation -========================= - -Please find detailed :ref:`download and installation instructions -` in the manual. - -Support -======= - -If you have problems installing the software or questions about usage, -documentation or anything else related to NiBabel, you can post to the NiPy -mailing list. - -:Mailing list: neuroimaging@python.org [subscription_, archive_] - -We recommend that anyone using NiBabel subscribes to the mailing list. The -mailing list is the preferred way to announce changes and additions to the -project. You can also search the mailing list archive using the *mailing list -archive search* located in the sidebar of the NiBabel home page. - -.. _subscription: https://mail.python.org/mailman/listinfo/neuroimaging -.. _archive: https://mail.python.org/pipermail/neuroimaging - .. include:: links_names.txt - .. toctree:: :hidden: diff --git a/doc/source/links_names.txt b/doc/source/links_names.txt index 7fbb27b12..438031cf3 100644 --- a/doc/source/links_names.txt +++ b/doc/source/links_names.txt @@ -48,7 +48,6 @@ .. _GPL: https://www.gnu.org/licenses/gpl.html .. _BSD: http://www.opensource.org/licenses/bsd-license.php .. _LGPL: https://www.gnu.org/copyleft/lesser.html -.. _MIT License: http://www.opensource.org/licenses/mit-license.php .. _PDDL 1.0: http://opendatacommons.org/licenses/pddl/1.0/ .. _CC0: http://opendefinition.org/licenses/cc-zero diff --git a/nibabel/info.py b/nibabel/info.py index 063978444..9e64cc318 100644 --- a/nibabel/info.py +++ b/nibabel/info.py @@ -22,7 +22,7 @@ and image data is made available via NumPy arrays. For more information, see NiBabel's `documentation site`_ and `API reference`_. -.. _API reference: https://nipy.org/nibabel/api.html +.. _API reference: ./api.html .. _AFNI BRIK/HEAD: https://afni.nimh.nih.gov/pub/dist/src/README.attributes .. _ANALYZE: http://www.grahamwideman.com/gw/brain/analyze/formatdoc.htm .. _CIFTI-2: https://www.nitrc.org/projects/cifti/ @@ -58,26 +58,39 @@ For more information on previous releases, see the `release archive`_ or `development changelog`_. +Please find detailed `download and installation instructions`_ in the manual. + .. _current release: https://pypi.python.org/pypi/NiBabel +.. _development changelog: ./changelog.html +.. _download and installation instructions: ./installation.html#installation .. _release archive: https://github.com/nipy/NiBabel/releases -.. _development changelog: https://nipy.org/nibabel/changelog.html -Mailing List -============ +Support +======= + +If you have problems installing the software or questions about usage, +documentation or anything else related to NiBabel, you can post to the NiPy +mailing list: neuroimaging@python.org [subscription_, archive_] + +The mailing list is the preferred way to announce changes and additions to the +project. You can also search the mailing list archive using the mailing list +archive search located in the sidebar of the NiBabel home page. +We recommend that anyone using NiBabel subscribes to the mailing list. -Please send any questions or suggestions to the `neuroimaging mailing list -`_. +.. _subscription: https://mail.python.org/mailman/listinfo/neuroimaging +.. _archive: https://mail.python.org/pipermail/neuroimaging License ======= -NiBabel is licensed under the terms of the `MIT license -`__. -Some code included with NiBabel is licensed under the `BSD license`_. -For more information, please see the COPYING_ file. +NiBabel is free-software (beer and speech) and covered by the +`MIT License `_. This applies to all source code, documentation, +examples and snippets inside the source distribution (including this website). +Please see the `appendix of the manual `_ for the copyright statement +and the full text of the license. -.. _BSD license: https://opensource.org/licenses/BSD-3-Clause -.. _COPYING: https://github.com/nipy/nibabel/blob/master/COPYING +.. _license: ./legal.html#license +.. _mit: https://opensource.org/license17s/MIT Citation ========