setup: update comments and URLs in setup.cfg

diff --git a/setup.cfg b/setup.cfg
index b6f549b8b96a514f04dcfef5ed5352e2a2f741e6..41e20daff874a87b2c1e5bde860a2fe64149e905 100644 (file)
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,47 +1,40 @@
 [easy_install]
-# allmydata-tahoe actually does work at least as well as any package
-# works when zipped, but zipping eggs causes various problems
-# (http://bugs.python.org/setuptools/issue33 ), and generally makes it
-# harder for people to get at the source code, and doesn't actually
-# provide any benefits that I am aware of.
+# Tahoe-LAFS actually does work at least as well as any package works when
+# zipped, but zipping eggs causes various problems
+# (http://bugs.python.org/setuptools/issue33 ), and generally makes it harder
+# for people to get at the source code, and doesn't actually provide any
+# benefits that I am aware of.
 zip_ok=False
 
-# Tahoe depends upon several libraries (foolscap, twisted, pycryptopp,
-# zfec, and others). Left to its own devices, setuptools will look on
-# PyPI for these and will download them at build time. The
-# 'find_links=' entry in setup.cfg causes setuptools to look for these
-# dependent tarballs in tahoe-deps/ and ../tahoe-deps/ before it
-# resorts to downloading them from PyPI.
+# Tahoe-LAFS depends upon several libraries (foolscap, twisted, pycryptopp,
+# zfec, and others). Left to its own devices, setuptools will look on PyPI for
+# these and will download them at build time. The 'find_links=' entry in
+# setup.cfg causes setuptools to look for these dependent tarballs in
+# tahoe-deps/ and ../tahoe-deps/ before it resorts to downloading them from
+# PyPI.
 
-# http://allmydata.org/source/tahoe/deps/tahoe-deps.tar.gz contains a bundle
-# of these dependencies (as Python source distributions or "sdists"). So it
-# you want to avoid the build-time download (say, if you're on an airplane,
+# http://tahoe-lafs.org/source/tahoe-lafs/deps/tahoe-deps.tar.gz contains a
+# bundle of these dependencies (as Python source distributions or "sdists"). So
+# it you want to avoid the build-time download (say, if you're on an airplane,
 # or a desert island), just grab a copy and unpack it in your tahoe darcs tree.
 
 # Alternatively, if you're building from a release/nightly tarball instead of
 # a darcs tree, the 'sumo' tarball variant will include all of these
 # dependencies in the tahoe-deps/ directory.
 
-# The directory on the allmydata.org testgrid named "tahoe-dep-sdists" is a
-# directory where tahoe developers host copies of upstream dependencies as
-# Python source distributions.  The one named "tahoe-dep-eggs" contains
-# Python binary distributions ("eggs").
-
 find_links=misc/dependencies tahoe-deps ../tahoe-deps
- http://allmydata.org/source/tahoe/deps/tahoe-dep-sdists/
- http://allmydata.org/source/tahoe/deps/tahoe-dep-eggs/
+ http://tahoe-lafs.org/source/tahoe-lafs/deps/tahoe-dep-sdists/
+ http://tahoe-lafs.org/source/tahoe-lafs/deps/tahoe-lafs-dep-eggs/
 
-# The following is a directory on the test grid which holds a bunch of packages of dependencies.
-# It is commented-out because unfortunately the test grid is currently (2009-03-05) too
-# unreliable -- it occasionally fails, and when it fails it usually does so by waiting a very
-# long time with no response to the HTTP GET.  This occasionally makes builds painfully slow.
-# There are several issues which might be responsible for this bad behavior of test grid: #193,
-# #253, #287, #651, #653.
+# The following is a directory on the test grid which holds a bunch of packages
+# of dependencies.  It is commented-out because the test grid has gone away and
+# a new one -- the Volunteer Test Grid -- is not yet publicly usable.
 # http://testgrid.allmydata.org:3567/uri/URI%3ADIR2-RO%3Asnrfwfxatrci35zdgjnzxxx2ke%3Aunarxv347edtku3xzmefy4mcdmfngxzeb72iyqcadbjzjpczjx5a/index.html
 
 # Other sites that we might want to list:
 # http://sourceforge.net/project/showfiles.php?group_id=78018&package_id=79063
 # http://pypi.python.org/pypi/pywin32
+# (See http://tahoe-lafs.org/trac/tahoe-lafs/ticket/142 .)
 
 [aliases]
 build = darcsver --count-all-patches develop --prefix=support make_executable build