Fixed #106. Replaced all references to freewisdom.org (except for Yuri's homepage).

16 files changed, 42 insertions, 43 deletions

diff --git a/docs/extensions/code_hilite.txt b/docs/extensions/code_hilite.txt
index aa0fe57..55a1a00 100644
--- a/docs/extensions/code_hilite.txt
+++ b/docs/extensions/code_hilite.txt
@@ -13,7 +13,6 @@ Summary
 The CodeHilite Extension adds code/syntax highlighting to standard 
 Python-Markdown code blocks using [Pygments][].
 
-[Python-Markdown]: http://www.freewisdom.org/projects/python-markdown/
 [Pygments]: http://pygments.org/
 
 This extension is included in the  Markdown library.
diff --git a/markdown/__main__.py b/markdown/__main__.py
index 116073f..8ee8c82 100644
--- a/markdown/__main__.py
+++ b/markdown/__main__.py
@@ -20,7 +20,7 @@ def parse_options():
     usage = """%prog [options] [INPUTFILE]
        (STDIN is assumed if no INPUTFILE is given)"""
     desc = "A Python implementation of John Gruber's Markdown. " \
-           "http://www.freewisdom.org/projects/python-markdown/"
+           "http://packages.python.org/Markdown/"
     ver = "%%prog %s" % markdown.version
     
     parser = optparse.OptionParser(usage=usage, description=desc, version=ver)
diff --git a/markdown/extensions/attr_list.py b/markdown/extensions/attr_list.py
index 1a1b87f..0aa18e0 100644
--- a/markdown/extensions/attr_list.py
+++ b/markdown/extensions/attr_list.py
@@ -10,11 +10,11 @@ Copyright 2011 [Waylan Limberg](http://achinghead.com/).
 
 Contact: markdown@freewisdom.org
 
-License: BSD (see ../../LICENSE for details) 
+License: BSD (see ../LICENSE.md for details) 
 
 Dependencies:
 * [Python 2.4+](http://python.org)
-* [Markdown 2.1+](http://www.freewisdom.org/projects/python-markdown/)
+* [Markdown 2.1+](http://packages.python.org/Markdown/)
 
 """
 
diff --git a/markdown/extensions/codehilite.py b/markdown/extensions/codehilite.py
index 0e0d32d..b022f3e 100644
--- a/markdown/extensions/codehilite.py
+++ b/markdown/extensions/codehilite.py
@@ -8,14 +8,14 @@ Adds code/syntax highlighting to standard Python-Markdown code blocks.
 
 Copyright 2006-2008 [Waylan Limberg](http://achinghead.com/).
 
-Project website: <http://www.freewisdom.org/project/python-markdown/CodeHilite>
+Project website: <http://packages.python.org/Markdown/extensions/code_hilite.html>
 Contact: markdown@freewisdom.org
 
-License: BSD (see ../docs/LICENSE for details)
+License: BSD (see ../LICENSE.md for details)
 
 Dependencies:
 * [Python 2.3+](http://python.org/)
-* [Markdown 2.0+](http://www.freewisdom.org/projects/python-markdown/)
+* [Markdown 2.0+](http://packages.python.org/Markdown/)
 * [Pygments](http://pygments.org/)
 
 """
diff --git a/markdown/extensions/fenced_code.py b/markdown/extensions/fenced_code.py
index 95fe3b4..457b35d 100644
--- a/markdown/extensions/fenced_code.py
+++ b/markdown/extensions/fenced_code.py
@@ -63,14 +63,14 @@ Optionally backticks instead of tildes as per how github's code block markdown i
 
 Copyright 2007-2008 [Waylan Limberg](http://achinghead.com/).
 
-Project website: <http://www.freewisdom.org/project/python-markdown/Fenced__Code__Blocks>
+Project website: <http://packages.python.org/Markdown/extensions/fenced_code_blocks.html>
 Contact: markdown@freewisdom.org
 
 License: BSD (see ../docs/LICENSE for details)
 
 Dependencies:
 * [Python 2.4+](http://python.org)
-* [Markdown 2.0+](http://www.freewisdom.org/projects/python-markdown/)
+* [Markdown 2.0+](http://packages.python.org/Markdown/)
 * [Pygments (optional)](http://pygments.org)
 
 """
diff --git a/markdown/extensions/headerid.py b/markdown/extensions/headerid.py
index c99c4bd..3f9e4c4 100644
--- a/markdown/extensions/headerid.py
+++ b/markdown/extensions/headerid.py
@@ -65,14 +65,14 @@ Use with MetaData extension:
 
 Copyright 2007-2011 [Waylan Limberg](http://achinghead.com/).
 
-Project website: <http://www.freewisdom.org/project/python-markdown/HeaderId>
+Project website: <http://packages.python.org/Markdown/extensions/header_id.html>
 Contact: markdown@freewisdom.org
 
 License: BSD (see ../docs/LICENSE for details) 
 
 Dependencies:
 * [Python 2.3+](http://python.org)
-* [Markdown 2.0+](http://www.freewisdom.org/projects/python-markdown/)
+* [Markdown 2.0+](http://packages.python.org/Markdown/)
 
 """
 
diff --git a/markdown/extensions/html_tidy.py b/markdown/extensions/html_tidy.py
index 6aee083..80272a3 100644
--- a/markdown/extensions/html_tidy.py
+++ b/markdown/extensions/html_tidy.py
@@ -22,7 +22,7 @@ License: [BSD](http://www.opensource.org/licenses/bsd-license.php)
 
 Dependencies:
 * [Python2.3+](http://python.org)
-* [Markdown 2.0+](http://www.freewisdom.org/projects/python-markdown/)
+* [Markdown 2.0+](http://packages.python.org/Markdown/)
 * [HTML Tidy](http://utidylib.berlios.de/)
 * [uTidylib](http://utidylib.berlios.de/)
 
diff --git a/markdown/extensions/meta.py b/markdown/extensions/meta.py
index a3407da..a3ee6fb 100644
--- a/markdown/extensions/meta.py
+++ b/markdown/extensions/meta.py
@@ -34,10 +34,10 @@ Make sure text without Meta Data still works (markdown < 1.6b returns a <p>).
 
 Copyright 2007-2008 [Waylan Limberg](http://achinghead.com).
 
-Project website: <http://www.freewisdom.org/project/python-markdown/Meta-Data>
+Project website: <http://packages.python.org/Markdown/meta_data.html>
 Contact: markdown@freewisdom.org
 
-License: BSD (see ../docs/LICENSE for details)
+License: BSD (see ../LICENSE.md for details)
 
 """
 import re
diff --git a/markdown/extensions/nl2br.py b/markdown/extensions/nl2br.py
index 5ba08a9..7e227c3 100644
--- a/markdown/extensions/nl2br.py
+++ b/markdown/extensions/nl2br.py
@@ -16,7 +16,7 @@ Copyright 2011 [Brian Neal](http://deathofagremmie.com/)
 
 Dependencies:
 * [Python 2.4+](http://python.org)
-* [Markdown 2.1+](http://www.freewisdom.org/projects/python-markdown/)
+* [Markdown 2.1+](http://packages.python.org/Markdown/)
 
 """
 
diff --git a/markdown/extensions/rss.py b/markdown/extensions/rss.py
index ae43220..72d6435 100644
--- a/markdown/extensions/rss.py
+++ b/markdown/extensions/rss.py
@@ -1,10 +1,10 @@
 import markdown
 from markdown.util import etree
 
-DEFAULT_URL = "http://www.freewisdom.org/projects/python-markdown/"
+DEFAULT_URL = "http://packages.python.org/Markdown/"
 DEFAULT_CREATOR = "Yuri Takhteyev"
 DEFAULT_TITLE = "Markdown in Python"
-GENERATOR = "http://www.freewisdom.org/projects/python-markdown/markdown2rss"
+GENERATOR = "http://packages.python.org/Markdown/extensions/rss.html"
 
 month_map = { "Jan" : "01",
               "Feb" : "02",
diff --git a/markdown/extensions/toc.py b/markdown/extensions/toc.py
index f00a249..36bd2c5 100644
--- a/markdown/extensions/toc.py
+++ b/markdown/extensions/toc.py
@@ -5,7 +5,7 @@ Table of Contents Extension for Python-Markdown
 (c) 2008 [Jack Miller](http://codezen.org)
 
 Dependencies:
-* [Markdown 2.1+](http://www.freewisdom.org/projects/python-markdown/)
+* [Markdown 2.1+](http://packages.python.org/Markdown/)
 
 """
 import markdown
diff --git a/markdown/extensions/wikilinks.py b/markdown/extensions/wikilinks.py
index af43bba..5384adb 100644
--- a/markdown/extensions/wikilinks.py
+++ b/markdown/extensions/wikilinks.py
@@ -75,7 +75,7 @@ License: [BSD](http://www.opensource.org/licenses/bsd-license.php)
 
 Dependencies:
 * [Python 2.3+](http://python.org)
-* [Markdown 2.0+](http://www.freewisdom.org/projects/python-markdown/)
+* [Markdown 2.0+](http://packages.python.org/Markdown/)
 '''
 
 import markdown
diff --git a/tests/misc/em-around-links.html b/tests/misc/em-around-links.html
index fafac28..22e2aba 100644
--- a/tests/misc/em-around-links.html
+++ b/tests/misc/em-around-links.html
@@ -1,13 +1,13 @@
 <h1>Title</h1>
 <ul>
-<li><em><a href="http://www.freewisdom.org/projects/python-markdown/">Python in Markdown</a> by some
+<li><em><a href="http://packages.python.org/Markdown/">Python in Markdown</a> by some
     great folks</em> - This <em>does</em> work as expected.</li>
-<li><em><a href="http://www.freewisdom.org/projects/python-markdown/">Python in Markdown</a> by some
+<li><em><a href="http://packages.python.org/Markdown/">Python in Markdown</a> by some
     great folks</em> - This <em>does</em> work as expected.</li>
-<li><a href="http://www.freewisdom.org/projects/python-markdown/"><em>Python in Markdown</em></a> by some
+<li><a href="http://packages.python.org/Markdown/"><em>Python in Markdown</em></a> by some
     great folks - This <em>does</em> work as expected.</li>
-<li><a href="http://www.freewisdom.org/projects/python-markdown/"><em>Python in Markdown</em></a> <em>by some
+<li><a href="http://packages.python.org/Markdown/"><em>Python in Markdown</em></a> <em>by some
     great folks</em> - This <em>does</em> work as expected.</li>
 </ul>
-<p><em><a href="http://www.freewisdom.org/projects/python-markdown/">Python in Markdown</a> by some
+<p><em><a href="http://packages.python.org/Markdown/">Python in Markdown</a> by some
 great folks</em> - This <em>does</em> work as expected.</p>
\ No newline at end of file
diff --git a/tests/misc/em-around-links.txt b/tests/misc/em-around-links.txt
index 5b15be4..77dccdb 100644
--- a/tests/misc/em-around-links.txt
+++ b/tests/misc/em-around-links.txt
@@ -1,14 +1,14 @@
 # Title
 
-  - *[Python in Markdown](http://www.freewisdom.org/projects/python-markdown/) by some
+  - *[Python in Markdown](http://packages.python.org/Markdown/) by some
     great folks* - This *does* work as expected.
-  - _[Python in Markdown](http://www.freewisdom.org/projects/python-markdown/) by some
+  - _[Python in Markdown](http://packages.python.org/Markdown/) by some
     great folks_ - This *does* work as expected.
-  - [_Python in Markdown_](http://www.freewisdom.org/projects/python-markdown/) by some
+  - [_Python in Markdown_](http://packages.python.org/Markdown/) by some
     great folks - This *does* work as expected.
-  - [_Python in Markdown_](http://www.freewisdom.org/projects/python-markdown/) _by some
+  - [_Python in Markdown_](http://packages.python.org/Markdown/) _by some
     great folks_ - This *does* work as expected.
 
-_[Python in Markdown](http://www.freewisdom.org/projects/python-markdown/) by some
+_[Python in Markdown](http://packages.python.org/Markdown/) by some
 great folks_ - This *does* work as expected.
 
diff --git a/tests/misc/nested-patterns.html b/tests/misc/nested-patterns.html
index b90d46d..1ac98ee 100644
--- a/tests/misc/nested-patterns.html
+++ b/tests/misc/nested-patterns.html
@@ -1,7 +1,7 @@
-<p><strong><em><a href="http://www.freewisdom.org">link</a></em></strong>
-<strong><em><a href="http://www.freewisdom.org">link</a></em></strong>
-<strong><a href="http://www.freewisdom.org"><em>link</em></a></strong>
-<strong><a href="http://www.freewisdom.org"><em>link</em></a></strong>
-<strong><a href="http://www.freewisdom.org"><em>link</em></a></strong>
-<strong><a href="http://www.freewisdom.org"><em>link</em></a></strong>
-<a href="http://www.freewisdom.org"><strong><em>link</em></strong></a></p>
\ No newline at end of file
+<p><strong><em><a href="http://example.com">link</a></em></strong>
+<strong><em><a href="http://example.com">link</a></em></strong>
+<strong><a href="http://example.com"><em>link</em></a></strong>
+<strong><a href="http://example.com"><em>link</em></a></strong>
+<strong><a href="http://example.com"><em>link</em></a></strong>
+<strong><a href="http://example.com"><em>link</em></a></strong>
+<a href="http://example.com"><strong><em>link</em></strong></a></p>
\ No newline at end of file
diff --git a/tests/misc/nested-patterns.txt b/tests/misc/nested-patterns.txt
index 3f5dc3e..c651b86 100644
--- a/tests/misc/nested-patterns.txt
+++ b/tests/misc/nested-patterns.txt
@@ -1,7 +1,7 @@
-___[link](http://www.freewisdom.org)___
-***[link](http://www.freewisdom.org)***
-**[*link*](http://www.freewisdom.org)**
-__[_link_](http://www.freewisdom.org)__
-__[*link*](http://www.freewisdom.org)__
-**[_link_](http://www.freewisdom.org)**
-[***link***](http://www.freewisdom.org)
+___[link](http://example.com)___
+***[link](http://example.com)***
+**[*link*](http://example.com)**
+__[_link_](http://example.com)__
+__[*link*](http://example.com)__
+**[_link_](http://example.com)**
+[***link***](http://example.com)