setup: update some docs, metadata, and docstrings

diff --git a/Makefile b/Makefile
index 60c84ab3ba183ea0b3fbf2abe5a3702a193f12f9..286d4bd79a81e80581822d44459f185404d17c57 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -129,8 +129,8 @@ endif
 signal-error-deps:
        @echo
        @echo
-       @echo "ERROR: Not all of Tahoe's dependencies are in place.  Please \
-see the README for help on installing dependencies."
+       @echo "ERROR: Not all of Tahoe's dependencies are in place.  Please see\
+docs/install.html for help on installing dependencies."
        @echo
        @echo
        exit 1
@@ -138,10 +138,7 @@ see the README for help on installing dependencies."
 signal-error-twisted-dep:
        @echo
        @echo
-       @echo "ERROR: Before running \"make build-auto-deps\" you have to ensure that \
-Twisted is installed (including its zope.interface dependency).  Twisted and \
-zope.interface are required for the automatic installation of certain other \
-libraries that Tahoe requires).  Please see the README for details."
+       @echo "ERROR: Twisted is not installed.  Please see docs/install.html for details."
        @echo
        @echo
        exit 1
@@ -149,8 +146,8 @@ libraries that Tahoe requires).  Please see the README for details."
 signal-error-pywin32-dep:
        @echo
        @echo
-       @echo "ERROR: the pywin32 dependency is not in place.  Please see the README \
-for help on installing dependencies."
+       @echo "ERROR: the pywin32 dependency is not in place.  Please see docs/install.html for\
+help on installing dependencies."
        @echo
        @echo
        exit 1
@@ -158,8 +155,7 @@ for help on installing dependencies."
 signal-error-pyopenssl-dep:
        @echo
        @echo
-       @echo "ERROR: the pyOpenSSL dependency is not in place (note that pyOpenSSL required \
-OpenSSL).  Please see the README for help on installing dependencies."
+       @echo "ERROR: the pyOpenSSL dependency is not in place (note that pyOpenSSL required OpenSSL).  Please see docs/install.html for help on installing dependencies."
        @echo
        @echo
        exit 1

diff --git a/setup.py b/setup.py
index 044605d4f4c4464eff99b67588b6f5eb31bbc857..d995a9f697261a5e10490511654f84129a138510 100644 (file)
--- a/setup.py
+++ b/setup.py
@@ -2,7 +2,7 @@
 
 # Allmydata Tahoe -- secure, distributed storage grid
 # 
-# Copyright (C) 2007 Allmydata, Inc.
+# Copyright (C) 2008 Allmydata, Inc.
 # 
 # This file is part of tahoe.
 # 
@@ -24,7 +24,7 @@ else:
 from setuptools import Extension, find_packages, setup
 
 trove_classifiers=[
-    "Development Status :: 3 - Alpha", 
+    "Development Status :: 4 - Beta", 
     "Environment :: Console",
     "Environment :: Web Environment",
     "License :: OSI Approved :: GNU General Public License (GPL)", 
@@ -113,7 +113,7 @@ install_requires=["zfec >= 1.3.0",
 
 setup(name='allmydata-tahoe',
       version=verstr,
-      description='secure, distributed storage grid',
+      description='secure, decentralized, fault-tolerant filesystem',
       long_description=LONG_DESCRIPTION,
       author='Allmydata, Inc.',
       author_email='tahoe-dev@allmydata.org',

diff --git a/src/allmydata/__init__.py b/src/allmydata/__init__.py
index ba3f840a0a808bae3f190c8f63ede8ac71c74e51..e40a304355097e5a9e4caeaa9db2588c7510abce 100644 (file)
--- a/src/allmydata/__init__.py
+++ b/src/allmydata/__init__.py
@@ -11,9 +11,9 @@ __version__ = "unknown"
 try:
     from _version import __version__
 except ImportError:
-    # We're running in a tree that hasn't run darcsver from the pyutil library,
-    # and didn't come with a _version.py, so we don't know what our version
-    # is. This should not happen very often.
+    # We're running in a tree that hasn't run "./setup.py darcsver", and didn't
+    # come with a _version.py, so we don't know what our version is. This should
+    # not happen very often.
     pass
 
 hush_pyflakes = __version__