diff --git a/doc/advanced.rst b/doc/advanced.rst index 3dbd73a4..4460ce38 100644 --- a/doc/advanced.rst +++ b/doc/advanced.rst @@ -234,7 +234,7 @@ Program code can initiate an asynchronous query by passing an ``async=1`` flag to the :meth:`cursor.execute` or :meth:`cursor.callproc` methods. A very simple example, from the connection to the query:: - conn = psycopg.connect(database='test') + conn = psycopg2.connect(database='test') curs = conn.cursor() curs.execute("SELECT * from test WHERE fielda > %s", (1971,), async=1) @@ -275,10 +275,10 @@ asynchronous queries: A code snippet that shows how to use the cursor object in a :func:`select()` call:: - import psycopg + import psycopg2 import select - conn = psycopg.connect(database='test') + conn = psycopg2.connect(database='test') curs = conn.cursor() curs.execute("SELECT * from test WHERE fielda > %s", (1971,), async=1) diff --git a/doc/cursor.rst b/doc/cursor.rst index a3c6855e..309e4469 100644 --- a/doc/cursor.rst +++ b/doc/cursor.rst @@ -276,7 +276,7 @@ The ``cursor`` class a single row at a time. It may also be used in the implementation of :meth:`executemany()`. - .. todo:: copied from dbapi: better specify what psycopg does with + .. todo:: copied from dbapi: better specify what psycopg2 does with arraysize .. attribute:: rowcount diff --git a/doc/index.rst b/doc/index.rst index 6a0b09e8..db9e0913 100644 --- a/doc/index.rst +++ b/doc/index.rst @@ -11,7 +11,7 @@ heavily multi-threaded applications that create and destroy lots of cursors and make a conspicuous number of concurrent INSERTs or UPDATEs. The psycopg distribution includes ZPsycopgDA, a Zope_ Database Adapter. -Psycopg 2 is an almost complete rewrite of the psycopg 1.1.x branch. Psycopg 2 +Psycopg 2 is an almost complete rewrite of the Psycopg 1.1.x branch. Psycopg 2 features complete libpq_ v3 protocol, `COPY TO/COPY FROM`__ and full object adaptation for all basic Python 2.3 types: strings (including unicode), ints, longs, floats, buffers (binary objects), booleans, `mx.DateTime`_ and builtin diff --git a/doc/usage.rst b/doc/usage.rst index 29c5b672..17f755c6 100644 --- a/doc/usage.rst +++ b/doc/usage.rst @@ -6,7 +6,7 @@ Basic module usage .. index:: pair: Example; Usage -The basic psycopg usage is common to all the database adapters implementing +The basic Psycopg usage is common to all the database adapters implementing the |DBAPI 2.0| protocol. Here is an interactive session showing some of the basic commands:: @@ -21,7 +21,7 @@ basic commands:: # Execute a command: this creates a new table >>> cur.execute("CREATE TABLE test (id serial PRIMARY KEY, num integer, data varchar);") - # Pass data to fill a query placeholders and let psycopg perform + # Pass data to fill a query placeholders and let Psycopg perform # the correct conversion (no more SQL injections!) >>> cur.execute("INSERT INTO test (num, data) VALUES (%s, %s)", ... (100, "abc'def"))