#704 Minor changes to documentation & fix typo in LICENCE

This commit is contained in:
Steve Barnes 2018-05-14 06:11:47 +01:00
parent 90b26c3e23
commit 34d8709000
2 changed files with 17 additions and 2 deletions

View File

@ -32,7 +32,7 @@ Alternative licenses
==================== ====================
If you prefer you can use the Zope Database Adapter ZPsycopgDA (i.e., 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. published on the Zope web site, http://www.zope.org/Resources/ZPL.
Also, the following BSD-like license applies (at your option) to the Also, the following BSD-like license applies (at your option) to the

View File

@ -24,6 +24,16 @@ mature as the C implementation yet.
.. index:: .. index::
single: Prerequisites 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 Prerequisites
------------- -------------
@ -45,7 +55,9 @@ Build prerequisites
^^^^^^^^^^^^^^^^^^^ ^^^^^^^^^^^^^^^^^^^
The build prerequisites are to be met in order to install Psycopg from source 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 Psycopg is a C wrapper around the libpq_ PostgreSQL client library. To install
it from sources you will need: it from sources you will need:
@ -304,8 +316,11 @@ Try the following. *In order:*
- Write to the `Mailing List`__. - 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 - 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 ever and about the quality time you have wasted figuring out the correct
:envvar:`ARCHFLAGS`. Especially useful from the Starbucks near you. :envvar:`ARCHFLAGS`. Especially useful from the Starbucks near you.
.. __: https://lists.postgresql.org/mj/mj_wwwusr?func=lists-long-full&extra=psycopg .. __: https://lists.postgresql.org/mj/mj_wwwusr?func=lists-long-full&extra=psycopg
.. _tracker: https://github.com/psycopg/psycopg2/issues