Skip to content

Commit

Permalink
[3.0.x] Corrected docs spelling of PgBouncer.
Browse files Browse the repository at this point in the history
Backport of b1f8847 from master
  • Loading branch information
carltongibson committed Apr 1, 2020
1 parent 0342d47 commit 2c34979
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 5 deletions.
4 changes: 2 additions & 2 deletions docs/ref/databases.txt
Original file line number Diff line number Diff line change
Expand Up @@ -203,7 +203,7 @@ cursor query is controlled with the `cursor_tuple_fraction`_ option.
Transaction pooling and server-side cursors
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

Using a connection pooler in transaction pooling mode (e.g. `pgBouncer`_)
Using a connection pooler in transaction pooling mode (e.g. `PgBouncer`_)
requires disabling server-side cursors for that connection.

Server-side cursors are local to a connection and remain open at the end of a
Expand All @@ -229,7 +229,7 @@ Another option is to wrap each ``QuerySet`` using server-side cursors in an
for the duration of the transaction. This way, the server-side cursor will only
live for the duration of the transaction.

.. _pgBouncer: https://pgbouncer.github.io/
.. _PgBouncer: https://pgbouncer.github.io/

.. _manually-specified-autoincrement-pk:

Expand Down
2 changes: 1 addition & 1 deletion docs/releases/1.11.1.txt
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ Allowed disabling server-side cursors on PostgreSQL
===================================================

The change in Django 1.11 to make :meth:`.QuerySet.iterator()` use server-side
cursors on PostgreSQL prevents running Django with pgBouncer in transaction
cursors on PostgreSQL prevents running Django with PgBouncer in transaction
pooling mode. To reallow that, use the :setting:`DISABLE_SERVER_SIDE_CURSORS
<DATABASE-DISABLE_SERVER_SIDE_CURSORS>` setting in :setting:`DATABASES`.

Expand Down
2 changes: 1 addition & 1 deletion docs/releases/1.11.txt
Original file line number Diff line number Diff line change
Expand Up @@ -644,7 +644,7 @@ Server-side cursors on PostgreSQL
---------------------------------

The change to make :meth:`.QuerySet.iterator()` use server-side cursors on
PostgreSQL prevents running Django with pgBouncer in transaction pooling mode.
PostgreSQL prevents running Django with PgBouncer in transaction pooling mode.
To reallow that, use the :setting:`DISABLE_SERVER_SIDE_CURSORS
<DATABASE-DISABLE_SERVER_SIDE_CURSORS>` setting (added in Django 1.11.1) in
:setting:`DATABASES`.
Expand Down
2 changes: 1 addition & 1 deletion docs/spelling_wordlist
Original file line number Diff line number Diff line change
Expand Up @@ -445,7 +445,7 @@ permalink
pessimization
Peucker
pgAdmin
pgBouncer
PgBouncer
PGRaster
phishing
php
Expand Down

0 comments on commit 2c34979

Please sign in to comment.