From 34d87090000b919a00f8949cdb865ee36b2c6c1c Mon Sep 17 00:00:00 2001 From: Steve Barnes Date: Mon, 14 May 2018 06:11:47 +0100 Subject: [PATCH] #704 Minor changes to documentation & fix typo in LICENCE --- LICENSE | 2 +- doc/src/install.rst | 17 ++++++++++++++++- 2 files changed, 17 insertions(+), 2 deletions(-) diff --git a/LICENSE b/LICENSE index 360a44f6..fd2b2f06 100644 --- a/LICENSE +++ b/LICENSE @@ -32,7 +32,7 @@ Alternative licenses ==================== If you prefer you can use the Zope Database Adapter ZPsycopgDA (i.e., -every file inside the ZPsycopgDA directory) user the ZPL license as +every file inside the ZPsycopgDA directory) using the ZPL license as published on the Zope web site, http://www.zope.org/Resources/ZPL. Also, the following BSD-like license applies (at your option) to the diff --git a/doc/src/install.rst b/doc/src/install.rst index a858cbe3..3861b063 100644 --- a/doc/src/install.rst +++ b/doc/src/install.rst @@ -24,6 +24,16 @@ mature as the C implementation yet. .. index:: single: Prerequisites +License & Warranty +------------------ +Psycopg is psycopg2 is free software, distributed under the terms of the GNU Lesser +General Public License with a run time linking exception or under the the ZPL license +- see the LICENCE file in the source code distribution for details. + +psycopg2 is distributed in the hope that it will be useful, but WITHOUT +ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +FITNESS FOR A PARTICULAR PURPOSE. + Prerequisites ------------- @@ -45,7 +55,9 @@ Build prerequisites ^^^^^^^^^^^^^^^^^^^ The build prerequisites are to be met in order to install Psycopg from source -code, either from a source distribution package or from PyPI. +code, from a source distribution package, GitHub_ or from PyPI. + +.. _GitHub: https://github.com/psycopg/psycopg2 Psycopg is a C wrapper around the libpq_ PostgreSQL client library. To install it from sources you will need: @@ -304,8 +316,11 @@ Try the following. *In order:* - Write to the `Mailing List`__. +- If you think that you have discovered a bug, test failure or missing feature please raise a ticket in the bug tracker_. + - Complain on your blog or on Twitter that `!psycopg2` is the worst package ever and about the quality time you have wasted figuring out the correct :envvar:`ARCHFLAGS`. Especially useful from the Starbucks near you. .. __: https://lists.postgresql.org/mj/mj_wwwusr?func=lists-long-full&extra=psycopg +.. _tracker: https://github.com/psycopg/psycopg2/issues