Moved around a bunch of metadata.

6 files changed, 55 insertions, 49 deletions

diff --git a/AUTHORS b/AUTHORS.txt
index 9623a7c..e093cd6 100644
--- a/AUTHORS
+++ b/AUTHORS.txt
@@ -29,11 +29,11 @@ The following people have contributed patches to Beautiful Soup:
 The following people made suggestions or found bugs or found ways to
 break Beautiful Soup:
 
- Hanno Böck, Matteo Bertini, Chris Curvey, Simon Cusack, Matt Ernst,
- Michael Foord, Tom Harris, Bill de hOra, Donald Howes, Matt
- Patterson, Scott Roberts, Steve Strassmann, Mike Williams, warchild
- at redho dot com, Sami Kuisma, Carlos Rocha, Bob Hutchison, Joren Mc,
- Michal Migurski, John Kleven, Tim Heaney, Tripp Lilley, Ed Summers,
- Dennis Sutch, Chris Smith, Aaron Sweep^W Swartz, Stuart Turner, Greg
- Edwards, Kevin J Kalupson, Nikos Kouremenos, Artur de Sousa Rocha,
- Yichun Wei, Per Vognsen
+ Hanno Böck, Matteo Bertini, Chris Curvey, Simon Cusack, Bruce Eckel,
+ Matt Ernst, Michael Foord, Tom Harris, Bill de hOra, Donald Howes,
+ Matt Patterson, Scott Roberts, Steve Strassmann, Mike Williams,
+ warchild at redho dot com, Sami Kuisma, Carlos Rocha, Bob Hutchison,
+ Joren Mc, Michal Migurski, John Kleven, Tim Heaney, Tripp Lilley, Ed
+ Summers, Dennis Sutch, Chris Smith, Aaron Sweep^W Swartz, Stuart
+ Turner, Greg Edwards, Kevin J Kalupson, Nikos Kouremenos, Artur de
+ Sousa Rocha, Yichun Wei, Per Vognsen
diff --git a/COPYING b/COPYING.txt
index 2c9cd0c..2c9cd0c 100644
--- a/COPYING
+++ b/COPYING.txt
diff --git a/CHANGELOG b/NEWS.txt
index b0ad7be..aa08b6e 100644
--- a/CHANGELOG
+++ b/NEWS.txt
@@ -1,30 +1,32 @@
-= 4.0 beta 4 =
+= 4.0.0b4 =
 
-Added BeautifulSoup.new_string() to go along with BeautifulSoup.new_tag()
+* Added BeautifulSoup.new_string() to go along with BeautifulSoup.new_tag()
 
-BeautifulSoup.new_tag() will follow the rules of whatever tree-builder
-was used to create the original BeautifulSoup object. A new <p> tag
-will look like "<p />" if the soup object was created to parse XML,
-but it will look like "<p></p>" if the soup object was created to
-parse HTML.
+* BeautifulSoup.new_tag() will follow the rules of whatever
+  tree-builder was used to create the original BeautifulSoup object. A
+  new <p> tag will look like "<p />" if the soup object was created to
+  parse XML, but it will look like "<p></p>" if the soup object was
+  created to parse HTML.
 
-We pass in strict=False to html.parser on Python 3, greatly improving
-html.parser's ability to handle bad HTML.
+* We pass in strict=False to html.parser on Python 3, greatly
+  improving html.parser's ability to handle bad HTML.
 
-Monkeypatch a serious bug in html.parser that made strict=False
-disastrous on Python 3.2.2.
+* We also monkeypatch a serious bug in html.parser that made
+  strict=False disastrous on Python 3.2.2.
 
-Replaced the "substitute_html_entities" argument with the "formatter" argument.
+* Replaced the "substitute_html_entities" argument with the
+  "formatter" argument.
 
-Bare ampersands and angle brackets are always converted to XML
-entities unless the user prevents it.
+* Bare ampersands and angle brackets are always converted to XML
+  entities unless the user prevents it.
 
-Added PageElement.insert_before().
+* Added PageElement.insert_before().
 
-Added PageElement.insert_after().
+* Added PageElement.insert_after().
+
+* Raise an exception when the user tries to do something nonsensical
+  like insert a tag into itself.
 
-Raise an exception when the user tries to do something nonsensical
-like insert a tag into itself.
 
 = 4.0.0b3 =
 
diff --git a/README.txt b/README.txt
index 769da98..e5c78c2 100644
--- a/README.txt
+++ b/README.txt
@@ -34,21 +34,20 @@
    </tag3>
   </tag1>
 
-The bs4/doc directory contains full documentation in Sphinx
-format. Run "make html" to create HTML documentation.
+= Full documentation =
 
-= Running the unit tests =
-
-Here's how to run the tests on Python 2.7:
+The bs4/doc/ directory contains full documentation in Sphinx
+format. Run "make html" in that directory to create HTML
+documentation.
 
- $ cd bs4
- $ python2.7 -m unittest discover -s bs4
+= Running the unit tests =
 
-Here's how to do it with Python 3.2:
+Beautiful Soup supports unit test discovery. You can run the tests
+from the project root directory with this command:
 
- $ ./convert-py3k
- $ cd py3k/bs4
- $ python3 -m unittest discover -s bs4
+ $ python -m unittest discover -s bs4
 
-The script test-all-versions will run the tests twice, once on Python
-2.7 and once on Python 3.
+If you checked out the source tree, you should see a script in the
+home directory called test-all-versions. This script will run the unit
+tests under Python 2.7, then create a temporary Python 3 conversion of
+the source and run the unit tests again under Python 3.
diff --git a/TODO b/TODO.txt
index 2f03dd2..2f03dd2 100644
--- a/TODO
+++ b/TODO.txt
diff --git a/setup.py b/setup.py
index 7fce6b0..4eebcb8 100644
--- a/setup.py
+++ b/setup.py
@@ -7,16 +7,21 @@ except ImportError:
     from distutils.command.build_py import build_py
 
 setup(name="beautifulsoup4",
-    version = "4.0.0b4",
-    author="Leonard Richardson",
-    author_email='leonardr@segfault.org',
-    url="http://www.crummy.com/software/BeautifulSoup/bs4/",
-    download_url = "http://www.crummy.com/software/BeautifulSoup/bs4/download/",
-    long_description="""Beautiful Soup sits atop an HTML or XML parser, providing Pythonic idioms for iterating, searching, and modifying the parse tree.""",
-    license="MIT",
-    packages=['bs4', 'bs4.builder', 'bs4.tests'],
-    package_data={"bs4": ["doc/source/*.jpg", "doc/source/*.rst", "doc/source/*.py", "doc/Makefile"]},
-    cmdclass = {'build_py':build_py},
+      version = "4.0.0b4",
+      author="Leonard Richardson",
+      author_email='leonardr@segfault.org',
+      url="http://www.crummy.com/software/BeautifulSoup/bs4/",
+      download_url = "http://www.crummy.com/software/BeautifulSoup/bs4/download/",
+      long_description="""Beautiful Soup sits atop an HTML or XML parser, providing Pythonic idioms for iterating, searching, and modifying the parse tree.""",
+      license="MIT",
+      packages=['bs4', 'bs4.builder', 'bs4.tests'],
+      package_data={
+        "bs4": ["doc/source/*.jpg", "doc/source/*.rst",
+                "doc/source/*.py", "doc/Makefile"]
+        },
+      data_files=[
+        ('', ['COPYING.txt', 'NEWS.txt', 'AUTHORS.txt', 'README.txt'])],
+      cmdclass = {'build_py':build_py},
       classifiers=["Development Status :: 4 - Beta",
                    "Intended Audience :: Developers",
                    "License :: OSI Approved :: MIT License",