diff options
| author | Peter Eisentraut | 2010-09-08 20:35:51 +0000 |
|---|---|---|
| committer | Peter Eisentraut | 2010-09-08 20:35:51 +0000 |
| commit | 85863060488ec2ae5fddc66cf72752e5f1f0ffb6 (patch) | |
| tree | 830eab4c0dd93fbf86c9dd3697b3f4d8644f5a85 /doc/src | |
| parent | 7cd082f907814f0fe90918399cbb95fd83f161c9 (diff) | |
Add tip about building plpython 2 and 3. Fix link to Python docs.
Diffstat (limited to 'doc/src')
| -rw-r--r-- | doc/src/sgml/installation.sgml | 11 | ||||
| -rw-r--r-- | doc/src/sgml/plpython.sgml | 15 |
2 files changed, 22 insertions, 4 deletions
diff --git a/doc/src/sgml/installation.sgml b/doc/src/sgml/installation.sgml index 523d9846f45..434855267ea 100644 --- a/doc/src/sgml/installation.sgml +++ b/doc/src/sgml/installation.sgml @@ -1,4 +1,4 @@ -<!-- $PostgreSQL: pgsql/doc/src/sgml/installation.sgml,v 1.351 2010/08/17 04:37:20 petere Exp $ --> +<!-- $PostgreSQL: pgsql/doc/src/sgml/installation.sgml,v 1.352 2010/09/08 20:35:51 petere Exp $ --> <chapter id="installation"> <title><![%standalone-include[<productname>PostgreSQL</>]]> @@ -1515,7 +1515,14 @@ su - postgres <listitem> <para> Full path to the Python interpreter. This will be used to - determine the dependencies for building PL/Python. + determine the dependencies for building PL/Python. Also, + whether Python 2 or 3 is specified here (or otherwise + implicitly chosen) determines which variant of the PL/Python + language becomes available. See + <![%standalone-include[the <application>PL/Python</> + documentation]]> + <![%standalone-ignore[<xref linkend="plpython-python23">]]> + for more information. </para> </listitem> </varlistentry> diff --git a/doc/src/sgml/plpython.sgml b/doc/src/sgml/plpython.sgml index 988234ce8a9..62673724cf2 100644 --- a/doc/src/sgml/plpython.sgml +++ b/doc/src/sgml/plpython.sgml @@ -1,4 +1,4 @@ -<!-- $PostgreSQL: pgsql/doc/src/sgml/plpython.sgml,v 1.52 2010/08/05 18:36:33 petere Exp $ --> +<!-- $PostgreSQL: pgsql/doc/src/sgml/plpython.sgml,v 1.53 2010/09/08 20:35:51 petere Exp $ --> <chapter id="plpython"> <title>PL/Python - Python Procedural Language</title> @@ -93,6 +93,17 @@ whether PL/Python for Python 2 or Python 3 or both are available. </para> + <tip> + <para> + The built variant depends on which Python version was found during + the installation or which version was explicitly set using + the <envar>PYTHON</envar> environment variable; + see <xref linkend="install-procedure">. To make both variants of + PL/Python available in one installation, the source tree has to be + configured and built twice. + </para> + </tip> + <para> This results in the following usage and migration strategy: @@ -148,7 +159,7 @@ <para> See also the - document <ulink url="http://docs.python.org/dev/3.0/whatsnew/3.0.html">What's + document <ulink url="http://docs.python.org/py3k/whatsnew/3.0.html">What's New In Python 3.0</ulink> for more information about porting to Python 3. </para> |