Changed docs to point to psycopg.org

INSTALL

@@ -1,4 +1,4 @@
 Installation instructions are included in the docs.
 
 Please check the 'doc/src/install.rst' file or online at
-<http://initd.org/psycopg/docs/install.html>.
+<http://www.psycopg.org/docs/install.html>.

README.rst

@@ -23,11 +23,13 @@ Documentation
 
 Documentation is included in the ``doc`` directory and is `available online`__.
 
-.. __: http://initd.org/psycopg/docs/
+.. __: http://www.psycopg.org/docs/
 
 For any other resource (source code repository, bug tracker, mailing list)
 please check the `project homepage`__.
 
+.. __: http://psycopg.org/
+
 
 Installation
 ------------
@@ -56,11 +58,8 @@ production it is advised to use the package built from sources.
 
 .. _PyPI: https://pypi.org/project/psycopg2/
 .. _psycopg2-binary: https://pypi.org/project/psycopg2-binary/
-.. _install: http://initd.org/psycopg/docs/install.html#install-from-source
+.. _install: http://www.psycopg.org/docs/install.html#install-from-source
-.. _faq: http://initd.org/psycopg/docs/faq.html#faq-compile
+.. _faq: http://www.psycopg.org/docs/faq.html#faq-compile
-
-.. __: http://initd.org/psycopg/
-
 
 :Linux/OSX: |travis|
 :Windows: |appveyor|

doc/README.rst

@@ -6,7 +6,7 @@ introspection, so you will need the same prerequisites_.  The only extra
 prerequisite is virtualenv_: the packages needed to build the docs will be
 installed when building the env.
 
-.. _prerequisites: http://initd.org/psycopg/docs/install.html#install-from-source
+.. _prerequisites: http://www.psycopg.org/docs/install.html#install-from-source
 .. _virtualenv: https://virtualenv.pypa.io/en/latest/
 
 Build the env once with::

doc/src/faq.rst

@@ -292,7 +292,7 @@ How do I interrupt a long-running query in an interactive shell?
     can handle a :kbd:`Ctrl-C` correctly. For previous versions, you can use
     `this implementation`__.
 
-    .. __: http://initd.org/psycopg/articles/2014/07/20/cancelling-postgresql-statements-python/
+    .. __: http://www.psycopg.org/articles/2014/07/20/cancelling-postgresql-statements-python/
 
     .. code-block:: pycon
 

doc/src/index.rst

@@ -23,7 +23,7 @@ extended and customized thanks to a flexible :ref:`objects adaptation system
 Psycopg 2 is both Unicode and Python 3 friendly.
 
 
-.. _Psycopg: http://initd.org/psycopg/
+.. _Psycopg: http://psycopg.org/
 .. _PostgreSQL: https://www.postgresql.org/
 .. _Python: https://www.python.org/
 .. _libpq: https://www.postgresql.org/docs/current/static/libpq.html

doc/src/install.rst

@@ -257,7 +257,8 @@ In case of problems, Psycopg can be configured to emit detailed debug
 messages, which can be very useful for diagnostics and to report a bug. In
 order to create a debug package:
 
-- `Download`__ and unpack the Psycopg source package.
+- `Download`__ and unpack the Psycopg *source package* (the ``.tar.gz``
+  package).
 
 - Edit the ``setup.cfg`` file adding the ``PSYCOPG_DEBUG`` flag to the
   ``define`` option.
@@ -274,7 +275,7 @@ order to create a debug package:
   one you just compiled and not e.g. the system one): you will have a copious
   stream of informations printed on stderr.
 
-.. __: http://initd.org/psycopg/download/
+.. __: https://pypi.org/project/psycopg2/#files
 
 
 

lib/__init__.py

@@ -6,7 +6,7 @@ provide new-style classes for connection and cursor objects and other sweet
 candies. Like the original, psycopg 2 was written with the aim of being very
 small and fast, and stable as a rock.
 
-Homepage: http://initd.org/projects/psycopg2
+Homepage: http://psycopg.org/
 
 .. _PostgreSQL: https://www.postgresql.org/
 .. _Python: https://www.python.org/

setup.py

@@ -104,7 +104,7 @@ If you prefer to avoid building psycopg2 from source, please install the PyPI
 'psycopg2-binary' package instead.
 
 For further information please check the 'doc/src/install.rst' file (also at
-<http://initd.org/psycopg/docs/install.html>).
+<http://www.psycopg.org/docs/install.html>).
 
 """)
             sys.exit(1)
@@ -303,7 +303,7 @@ If you want to install psycopg2 from source, please install the packages
 required for the build and try again.
 
 For further information please check the 'doc/src/install.rst' file (also at
-<http://initd.org/psycopg/docs/install.html>).
+<http://www.psycopg.org/docs/install.html>).
 
 """)
             raise
@@ -590,12 +590,12 @@ except Exception:
 
 setup(name="psycopg2",
       version=PSYCOPG_VERSION,
-      maintainer="Federico Di Gregorio",
-      maintainer_email="fog@initd.org",
       author="Federico Di Gregorio",
       author_email="fog@initd.org",
-      url="http://initd.org/psycopg/",
+      maintainer="Daniele Varrazzo",
-      license="LGPL with exceptions or ZPL",
+      maintainer_email="daniele.varrazzo@gmail.org",
+      url="http://psycopg.org/",
+      license="LGPL with exceptions",
       platforms=["any"],
       python_requires='>=2.7,!=3.0.*,!=3.1.*,!=3.2.*,!=3.3.*',
       description=readme.split("\n")[0],
@@ -607,6 +607,9 @@ setup(name="psycopg2",
       cmdclass={'build_ext': psycopg_build_ext},
       ext_modules=ext,
       project_urls={
-          'Source': 'https://github.com/psycopg/psycopg2',
+          'Homepage': 'http://psycopg.org/',
-          'Documentation': 'http://initd.org/psycopg/docs/',
+          'Documentation': 'http://www.psycopg.org/docs/',
+          'Code': 'https://github.com/psycopg/psycopg2',
+          'Issue Tracker': 'https://github.com/psycopg/psycopg2/issues',
+          'Download': 'https://pypi.org/project/psycopg2/',
       })