Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Change domain name #342

Merged
merged 2 commits into from Oct 4, 2012
Merged

Change domain name #342

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
089f7ff
Change domain name
ahojnnes Oct 4, 2012
70a509b
Revert changes to release notes
ahojnnes Oct 4, 2012
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion doc/Makefile
View file
Open in desktop
Expand Up @@ -124,7 +124,7 @@ gh-pages:

gitwash:
python tools/gitwash/gitwash_dumper.py source scikit-image \
--project-url=http://scikit-image.org \
--project-url=http://skimage.org \
--project-ml-url=http://groups.google.com/group/scikit-image \
--repo-name=scikit-image \
--github-user=scikit-image \
Expand Down
4 changes: 2 additions & 2 deletions doc/release/release_0.3.txt
View file
Open in desktop
Expand Up @@ -9,11 +9,11 @@ Python (>=2.6 or 3.x), NumPy and SciPy can be installed.

For more information, visit our website

http://scikit-image.org
http://scikits-image.org

or the examples gallery at

http://scikit-image.org/docs/0.3/auto_examples/
http://scikits-image.org/docs/0.3/auto_examples/

New Features
------------
Expand Down
10 changes: 5 additions & 5 deletions doc/release/release_0.4.txt
View file
Open in desktop
@@ -1,26 +1,26 @@
Announcement: scikit-image 0.4
Announcement: scikits-image 0.4
===============================

We're happy to announce the 0.4 release of scikit-image, an image processing
We're happy to announce the 0.4 release of scikits-image, an image processing
toolbox for SciPy.

Please visit our examples gallery to see what we've been up to:

http://scikit-image.org/docs/0.4/auto_examples/
http://scikits-image.org/docs/0.4/auto_examples/

Note that, in this release, we renamed the module from ``scikits.image`` to
``skimage``, to work around name space conflicts with other scikits (similarly,
the machine learning scikit is now imported as ``sklearn``).

A big shout-out also to everyone currently at SciPy India; have fun, and
remember to join the scikit-image sprint!
remember to join the scikits-image sprint!

This release runs under all major operating systems where Python (>=2.6 or
3.x), NumPy and SciPy can be installed.

For more information, visit our website

http://scikit-image.org
http://scikits-image.org

New Features
------------
Expand Down
6 changes: 3 additions & 3 deletions doc/release/release_0.5.txt
View file
Open in desktop
@@ -1,12 +1,12 @@
Announcement: scikit-image 0.5
Announcement: scikits-image 0.5
===============================

We're happy to announce the 0.5 release of scikit-image, our image processing
We're happy to announce the 0.5 release of scikits-image, our image processing
toolbox for SciPy.

For more information, please visit our website

http://scikit-image.org
http://scikits-image.org

New Features
------------
Expand Down
6 changes: 3 additions & 3 deletions doc/release/release_0.6.txt
View file
Open in desktop
@@ -1,9 +1,9 @@
Announcement: scikit-image 0.6
Announcement: scikits-image 0.6
===============================

We're happy to announce the 6th version of scikit-image!
We're happy to announce the 6th version of scikits-image!

scikit-image is an image processing toolbox for SciPy that includes algorithms
Scikits-image is an image processing toolbox for SciPy that includes algorithms
for segmentation, geometric transformations, color space manipulation,
analysis, filtering, morphology, feature detection, and more.

Expand Down
8 changes: 4 additions & 4 deletions doc/release/release_0.7.txt
View file
Open in desktop
@@ -1,9 +1,9 @@
Announcement: scikit-image 0.7.0
Announcement: scikits-image 0.7.0
=================================

We're happy to announce the 7th version of scikit-image!
We're happy to announce the 7th version of scikits-image!

scikit-image is an image processing toolbox for SciPy that includes algorithms
Scikits-image is an image processing toolbox for SciPy that includes algorithms
for segmentation, geometric transformations, color space manipulation,
analysis, filtering, morphology, feature detection, and more.

Expand All @@ -15,7 +15,7 @@ For more information, examples, and documentation, please visit our website
New Features
------------

It's been only 3 months since scikit-image 0.6 was released, but in that short
It's been only 3 months since scikits-image 0.6 was released, but in that short
time, we've managed to add plenty of new features and enhancements, including

- Geometric image transforms
Expand Down
2 changes: 1 addition & 1 deletion doc/source/_static/docversions.js
View file
Open in desktop
Expand Up @@ -12,6 +12,6 @@ function insert_version_links() {
document.write(open_list);
document.write('<a href="URL">skimage VERSION</a> </li>\n'
.replace('VERSION', labels[i])
.replace('URL', 'http://scikit-image.org/docs/' + labels[i]));
.replace('URL', 'http://skimage.org/docs/' + labels[i]));
}
}
2 changes: 1 addition & 1 deletion doc/source/gitwash/this_project.inc
View file
Open in desktop
@@ -1,5 +1,5 @@
.. scikit-image
.. _scikit-image: http://scikit-image.org
.. _scikit-image: http://skimage.org
.. _`scikit-image github`: http://github.com/scikit-image/scikit-image

.. _`scikit-image mailing list`: http://groups.google.com/group/scikit-image
4 changes: 2 additions & 2 deletions doc/source/overview.txt
View file
Open in desktop
@@ -1,7 +1,7 @@
Image Processing SciKit
=======================

The `scikit-image <http://scikit-image.org>`__ SciKit (toolkit for
The `scikit-image <http://skimage.org>`__ SciKit (toolkit for
`SciPy <http://www.scipy.org>`__) extends ``scipy.ndimage`` to provide
a versatile set of image processing routines. It is written in the
`Python <http://www.python.org>`_ language.
Expand All @@ -12,7 +12,7 @@ mailing list (address provided below).

Homepage
--------
http://scikit-image.org
http://skimage.org

Source, bugs and patches
------------------------
Expand Down
4 changes: 2 additions & 2 deletions doc/source/random_gallery.py
View file
Open in desktop
Expand Up @@ -32,8 +32,8 @@
examples = glob.glob(os.path.join(example_dir, 'plot_*.py'))

images, links = [], []
image_url = 'http://scikit-image.org/docs/dev/_images/%s.png'
link_url = 'http://scikit-image.org/docs/dev/auto_examples/%s.html'
image_url = 'http://skimage.org/docs/dev/_images/%s.png'
link_url = 'http://skimage.org/docs/dev/auto_examples/%s.html'

for e in examples:
e = os.path.basename(e)
Expand Down
2 changes: 1 addition & 1 deletion doc/source/themes/scikit-image/layout.html
View file
Open in desktop
Expand Up @@ -79,7 +79,7 @@
{%- block extrahead %}{% endblock %}
</head>
<body class="container">
<a href="http://scikit-image.org" class="logo"><img src="{{ pathto('_static/', 1) }}img/logo.png" alt=""></a>
<a href="http://skimage.org" class="logo"><img src="{{ pathto('_static/', 1) }}img/logo.png" alt=""></a>
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This change is fine, but just for the record I had a mistake in the configuration of scikit-image.org, which should now correctly redirect paths like these.

Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

So are you planning to use skimage.org as the main domain name? I suspect that most people will start calling the project skimage if you do so...

<div class="clearfix"></div>
<div class="navbar">
<div class="navbar-inner">
Expand Down