Location via proxy:   [ UP ]  
[Report a bug]   [Manage cookies]                
Skip to content

Commit 8586306

Browse files
committed
Add tip about building plpython 2 and 3. Fix link to Python docs.
1 parent 7cd082f commit 8586306

File tree

2 files changed

+22
-4
lines changed

2 files changed

+22
-4
lines changed

doc/src/sgml/installation.sgml

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<!-- $PostgreSQL: pgsql/doc/src/sgml/installation.sgml,v 1.351 2010/08/17 04:37:20 petere Exp $ -->
1+
<!-- $PostgreSQL: pgsql/doc/src/sgml/installation.sgml,v 1.352 2010/09/08 20:35:51 petere Exp $ -->
22

33
<chapter id="installation">
44
<title><![%standalone-include[<productname>PostgreSQL</>]]>
@@ -1515,7 +1515,14 @@ su - postgres
15151515
<listitem>
15161516
<para>
15171517
Full path to the Python interpreter. This will be used to
1518-
determine the dependencies for building PL/Python.
1518+
determine the dependencies for building PL/Python. Also,
1519+
whether Python 2 or 3 is specified here (or otherwise
1520+
implicitly chosen) determines which variant of the PL/Python
1521+
language becomes available. See
1522+
<![%standalone-include[the <application>PL/Python</>
1523+
documentation]]>
1524+
<![%standalone-ignore[<xref linkend="plpython-python23">]]>
1525+
for more information.
15191526
</para>
15201527
</listitem>
15211528
</varlistentry>

doc/src/sgml/plpython.sgml

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<!-- $PostgreSQL: pgsql/doc/src/sgml/plpython.sgml,v 1.52 2010/08/05 18:36:33 petere Exp $ -->
1+
<!-- $PostgreSQL: pgsql/doc/src/sgml/plpython.sgml,v 1.53 2010/09/08 20:35:51 petere Exp $ -->
22

33
<chapter id="plpython">
44
<title>PL/Python - Python Procedural Language</title>
@@ -93,6 +93,17 @@
9393
whether PL/Python for Python 2 or Python 3 or both are available.
9494
</para>
9595

96+
<tip>
97+
<para>
98+
The built variant depends on which Python version was found during
99+
the installation or which version was explicitly set using
100+
the <envar>PYTHON</envar> environment variable;
101+
see <xref linkend="install-procedure">. To make both variants of
102+
PL/Python available in one installation, the source tree has to be
103+
configured and built twice.
104+
</para>
105+
</tip>
106+
96107
<para>
97108
This results in the following usage and migration strategy:
98109

@@ -148,7 +159,7 @@
148159

149160
<para>
150161
See also the
151-
document <ulink url="http://docs.python.org/dev/3.0/whatsnew/3.0.html">What's
162+
document <ulink url="http://docs.python.org/py3k/whatsnew/3.0.html">What's
152163
New In Python 3.0</ulink> for more information about porting to
153164
Python 3.
154165
</para>

0 commit comments

Comments
 (0)