mirror of
https://github.com/psycopg/psycopg2.git
synced 2025-03-03 23:55:46 +03:00
Added license to the docs
Includes other docs improvements, such as the ones proposed in #711.
This commit is contained in:
parent
85ec17a313
commit
dbae84ee29
10
LICENSE
10
LICENSE
|
@ -1,5 +1,5 @@
|
||||||
psycopg2 and the LGPL
|
psycopg2 and the LGPL
|
||||||
=====================
|
---------------------
|
||||||
|
|
||||||
psycopg2 is free software: you can redistribute it and/or modify it
|
psycopg2 is free software: you can redistribute it and/or modify it
|
||||||
under the terms of the GNU Lesser General Public License as published
|
under the terms of the GNU Lesser General Public License as published
|
||||||
|
@ -29,15 +29,15 @@ If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
|
||||||
|
|
||||||
Alternative licenses
|
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
|
||||||
files following the pattern psycopg/adapter*.{h,c} and
|
files following the pattern ``psycopg/adapter*.{h,c}`` and
|
||||||
psycopg/microprotocol*.{h,c}:
|
``psycopg/microprotocol*.{h,c}``:
|
||||||
|
|
||||||
Permission is granted to anyone to use this software for any purpose,
|
Permission is granted to anyone to use this software for any purpose,
|
||||||
including commercial applications, and to alter it and redistribute it
|
including commercial applications, and to alter it and redistribute it
|
||||||
|
|
2
NEWS
2
NEWS
|
@ -5,7 +5,7 @@ What's new in psycopg 2.7.5
|
||||||
^^^^^^^^^^^^^^^^^^^^^^^^^^^
|
^^^^^^^^^^^^^^^^^^^^^^^^^^^
|
||||||
|
|
||||||
- Allow non-ascii chars in namedtuple fields (regression introduced fixing
|
- Allow non-ascii chars in namedtuple fields (regression introduced fixing
|
||||||
:ticket':`#211`).
|
:ticket:`#211`).
|
||||||
- Fixed adaptation of arrays of arrays of nulls (:ticket:`#325`).
|
- Fixed adaptation of arrays of arrays of nulls (:ticket:`#325`).
|
||||||
- Fixed building on Solaris 11 and derivatives such as SmartOS and illumos
|
- Fixed building on Solaris 11 and derivatives such as SmartOS and illumos
|
||||||
(:ticket:`#677`).
|
(:ticket:`#677`).
|
||||||
|
|
|
@ -48,6 +48,7 @@ Psycopg 2 is both Unicode and Python 3 friendly.
|
||||||
errorcodes
|
errorcodes
|
||||||
faq
|
faq
|
||||||
news
|
news
|
||||||
|
license
|
||||||
|
|
||||||
|
|
||||||
.. ifconfig:: builder != 'text'
|
.. ifconfig:: builder != 'text'
|
||||||
|
|
|
@ -45,7 +45,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:
|
||||||
|
@ -302,10 +304,14 @@ Try the following. *In order:*
|
||||||
- Google for `!psycopg2` *your error message*. Especially useful the week
|
- Google for `!psycopg2` *your error message*. Especially useful the week
|
||||||
after the release of a new OS X version.
|
after the release of a new OS X version.
|
||||||
|
|
||||||
- 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
|
.. _mailing list: https://lists.postgresql.org/mj/mj_wwwusr?func=lists-long-full&extra=psycopg
|
||||||
|
.. _bug tracker: https://github.com/psycopg/psycopg2/issues
|
||||||
|
|
7
doc/src/license.rst
Normal file
7
doc/src/license.rst
Normal file
|
@ -0,0 +1,7 @@
|
||||||
|
.. index::
|
||||||
|
single: License
|
||||||
|
|
||||||
|
License
|
||||||
|
=======
|
||||||
|
|
||||||
|
.. include:: ../../LICENSE
|
|
@ -1,3 +1,7 @@
|
||||||
|
.. index::
|
||||||
|
single: Release notes
|
||||||
|
single: News
|
||||||
|
|
||||||
Release notes
|
Release notes
|
||||||
=============
|
=============
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue
Block a user