Merge updates to windows documents.

diff --combined setup.py
index 58d1958e89875814b1dea9bcd0d6bb6d90638a10,acaf60b3f201639636077746f682f00a942199b8..0c7aa9ff1ef23286787b71f4754444edfc115632
--- 1/setup.py
--- 2/setup.py
+++ b/setup.py
@@@ -52,8 -52,7 +52,8 @@@ def config_value(command, arg)
      for cmd in cmds:
          try:
              return run_cmd(cmd, arg)
 -        except CommandException, e:
 +        except CommandException:
 +            _, e, _ = sys.exc_info()
              if not e.not_found():
                  raise
      else:
@@@ -136,7 -135,7 +136,7 @@@ class VersionQuery(object)
  
      def __init__(self, filename):
          self.filename = filename
 -        f = file(filename, "rU")
 +        f = open(filename, "rU")
          try:
              self.text = f.read()
          finally:
@@@ -189,7 -188,7 +189,7 @@@ if os.name == "nt"
              raise Exception(
                  "Please set SVN_DEV to the location of the svn development "
                  "packages.\nThese can be downloaded from:\n"
-                 "http://subversion.tigris.org/servlets/ProjectDocumentList?folderID=91")
+                 "http://sourceforge.net/projects/win32svn/files/")
          svn_bdb_dir = os.environ.get("SVN_BDB")
          if not svn_bdb_dir or not os.path.isdir(svn_bdb_dir):
              raise Exception(
@@@ -233,13 -232,9 +233,13 @@@
                    libsvn_repos-1 libsvn_wc-1 libsvn_delta-1 libsvn_diff-1
                    libsvn_fs-1 libsvn_repos-1 libsvn_fs_fs-1 libsvn_fs_base-1
                    intl3_svn
 -                  libdb44 xml
 +                  xml
                    advapi32 shell32 ws2_32 zlibstat
                 """.split()
 +        if svn_version >= (1,7,0):
 +            libs += ["libdb48"]
 +        else:
 +            libs += ["libdb44"]
          if svn_version >= (1,5,0):
              # Since 1.5.0 libsvn_ra_dav-1 was removed
              libs.remove("libsvn_ra_dav-1")
@@@ -289,11 -284,7 +289,11 @@@ class install_lib_with_dlls(install_lib
              apr_bins += """libsvn_client-1.dll libsvn_delta-1.dll libsvn_diff-1.dll
                             libsvn_fs-1.dll libsvn_ra-1.dll libsvn_repos-1.dll
                             libsvn_subr-1.dll libsvn_wc-1.dll libsasl.dll""".split()
 -        apr_bins += """intl3_svn.dll libdb44.dll libeay32.dll ssleay32.dll""".split()
 +        if get_svn_version() >= (1,7,0):
 +            apr_bins += ["libdb48.dll"]
 +        else:
 +            apr_bins += ["libdb44.dll"]
 +        apr_bins += """intl3_svn.dll libeay32.dll ssleay32.dll""".split()
          look_dirs = os.environ.get("PATH","").split(os.pathsep)
          look_dirs.insert(0, os.path.join(os.environ["SVN_DEV"], "bin"))