Point to docs hosted with PyPI rather than Yuri's missing site.

4 files changed, 10 insertions, 9 deletions

diff --git a/INSTALL.md b/INSTALL.md
index 66359bd..5f50ff4 100644
--- a/INSTALL.md
+++ b/INSTALL.md
@@ -5,4 +5,5 @@ As an Admin/Root user on your system do:
 
     pip install markdown
 
-Or for more specific instructions, view the documentation in `docs/install.txt`.
+Or for more specific instructions, view the documentation in `docs/install.txt`
+or on the website at <http://packages.python.org/Markdown/>.
diff --git a/README.md b/README.md
index a429619..97a44b1 100644
--- a/README.md
+++ b/README.md
@@ -7,10 +7,10 @@ though there are a few known issues. See [Features][] for information
 on what exactly is supported and what is not. Additional features are 
 supported by the [Available Extensions][].
 
-[Python-Markdown]: http://freewisdom.org/projects/python-markdown
+[Python-Markdown]: http://packages.python.org/Markdown/
 [Markdown]: http://daringfireball.net/projects/markdown/
-[Features]: http://www.freewisdom.org/projects/python-markdown/Features
-[Available Extensions]: http://www.freewisdom.org/projects/python-markdown/Available_Extensions
+[Features]: http://packages.python.org/Markdown/index.html#Features
+[Available Extensions]: http://packages.python.org/Markdown/extensions/index.html
 
 
 Documentation
@@ -18,7 +18,7 @@ Documentation
 
 Installation and usage documentation is available in the `docs/` directory
 of the distribution and on the project website at 
-<http://freewisdom.org/projects/python-markdown>.
+<http://packages.python.org/Markdown/>.
 
 Support
 -------
diff --git a/markdown/__init__.py b/markdown/__init__.py
index 013fdc8..f259615 100644
--- a/markdown/__init__.py
+++ b/markdown/__init__.py
@@ -10,7 +10,7 @@ called from the command line.
     import markdown
     html = markdown.markdown(your_text_string)
 
-See <http://www.freewisdom.org/projects/python-markdown/> for more
+See <http://packages.python.org/Markdown/> for more
 information and instructions on how to extend the functionality of
 Python Markdown.  Read that before you try modifying this file.
 
diff --git a/setup.py b/setup.py
index 0fe2751..5370159 100755
--- a/setup.py
+++ b/setup.py
@@ -166,11 +166,11 @@ class md_build(build):
 data = dict(
     name =          'Markdown',
     version =       version,
-    url =           'http://www.freewisdom.org/projects/python-markdown',
+    url =           'http://packages.python.org/Markdown/',
     download_url =  'http://pypi.python.org/packages/source/M/Markdown/Markdown-%s.tar.gz' % version,
     description =   'Python implementation of Markdown.',
-    author =        'Manfred Stienstra and Yuri takhteyev',
-    author_email =  'yuri [at] freewisdom.org',
+    author =        'Manfred Stienstra, Yuri takhteyev and Waylan limberg',
+    author_email =  'markdown [at] freewisdom.org',
     maintainer =    'Waylan Limberg',
     maintainer_email = 'waylan [at] gmail.com',
     license =       'BSD License',