Update URLs from einstein to tremily.

Also move link targets to the end of the README.

diff --git a/README b/README
index 28c3f72a05a00fe4f8eb79f8575099c204eee331..7ce783fde5a2d701065e9a1921ab43751e698f4d 100644 (file)
--- a/README
+++ b/README
@@ -24,11 +24,6 @@ Although it is not strictly required (thanks to `duck typing`_) you'll
 probably also want my `stepper`_ package or an equivalent
 stepper implementation.
 
-.. _layman: http://layman.sourceforge.net/
-.. _wtk overlay: http://www.physics.drexel.edu/~wking/unfolding-disasters/posts/Gentoo_overlay/
-.. _duck typing: http://en.wikipedia.org/wiki/Duck_typing
-.. _stepper: http://www.physics.drexel.edu/~wking/unfolding-disasters/posts/stepper/
-
 
 Dependencies
 ============
@@ -38,25 +33,20 @@ Pyafm requires the following Python modules:
 * Pypiezo_
 * Stepper_ (or equivalent stepper implementation)
 
-.. _stepper: http://www.physics.drexel.edu/~wking/unfolding-disasters/posts/stepper/
-.. _pypiezo: http://www.physics.drexel.edu/~wking/unfolding-disasters/posts/pypiezo/
-
 
 Getting the source
 ==================
 
 Pyafm is available as a Git_ repository::
 
-    $ git clone http://www.physics.drexel.edu/~wking/code/git/pyafm.git
+    $ git clone git://tremily.us/pyafm.git
 
 There are also periodic bundled releases.  For example, get version
-0.1 as a gzipped tarball with::
+0.3 as a gzipped tarball with::
 
-     $ wget http://www.physics.drexel.edu/~wking/code/python/pyafm-0.1.tar.gz
+     $ wget 'http://git.tremily.us/?p=pyafm.git;a=snapshot;h=v0.3;sf=tgz'
      $ tar -xzvf pyafm-0.1.tar.gz
 
-.. _Git: http://git-scm.com/
-
 
 Installation
 ============
@@ -76,3 +66,11 @@ Usage
 =====
 
 TODO
+
+
+.. _layman: http://layman.sourceforge.net/
+.. _wtk overlay: http://blog.tremily.us/posts/Gentoo_overlay/
+.. _duck typing: http://en.wikipedia.org/wiki/Duck_typing
+.. _stepper: http://blog.tremily.us/posts/stepper/
+.. _pypiezo: http://blog.tremily.us/posts/pypiezo/
+.. _Git: http://git-scm.com/

diff --git a/setup.py b/setup.py
index f2e006e116758af6102d12b423e90ce0858e5ebe..083c807144325a25668ceea279689714ce7e07f4 100644 (file)
--- a/setup.py
+++ b/setup.py
@@ -26,8 +26,9 @@ setup(name=package_name,
       version=__version__,
       maintainer='W. Trevor King',
       maintainer_email='wking@drexel.edu',
-      url='http://www.physics.drexel.edu/~wking/unfolding-disasters/posts/%s/' % package_name,
-      download_url='http://www.physics.drexel.edu/~wking/code/python/%s-%s.tar.gz' % (package_name, __version__),
+      url='http://tremily.us/posts/{}/'.format(package_name),
+      download_url='http://git.tremily.us/?p={}.git;a=snapshot;h=v{};sf=tgz'.format(
+        package_name, __version__),
       license='GNU General Public License (GPL)',
       platforms=['all'],
       description=__doc__,