From b1f88476dbd738bdcc20466efd5ffcb83ab25093 Mon Sep 17 00:00:00 2001 From: Carlton Gibson Date: Wed, 1 Apr 2020 14:48:52 +0200 Subject: [PATCH] Corrected docs spelling of PgBouncer. --- docs/ref/databases.txt | 4 ++-- docs/releases/1.11.1.txt | 2 +- docs/releases/1.11.txt | 2 +- docs/spelling_wordlist | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/docs/ref/databases.txt b/docs/ref/databases.txt index 2358310e8d4..b594618bb1d 100644 --- a/docs/ref/databases.txt +++ b/docs/ref/databases.txt @@ -206,7 +206,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 @@ -232,7 +232,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: diff --git a/docs/releases/1.11.1.txt b/docs/releases/1.11.1.txt index 076691be7da..c356a0ed5e2 100644 --- a/docs/releases/1.11.1.txt +++ b/docs/releases/1.11.1.txt @@ -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 ` setting in :setting:`DATABASES`. diff --git a/docs/releases/1.11.txt b/docs/releases/1.11.txt index 1b65cc3e283..b198ebdf437 100644 --- a/docs/releases/1.11.txt +++ b/docs/releases/1.11.txt @@ -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 ` setting (added in Django 1.11.1) in :setting:`DATABASES`. diff --git a/docs/spelling_wordlist b/docs/spelling_wordlist index b240006e2bd..63e7c3dbb47 100644 --- a/docs/spelling_wordlist +++ b/docs/spelling_wordlist @@ -446,7 +446,7 @@ permalink pessimization Peucker pgAdmin -pgBouncer +PgBouncer PGRaster phishing php