diff options
| author | Jon Dufresne <jon.dufresne@gmail.com> | 2020-01-28 16:58:39 -0800 |
|---|---|---|
| committer | Mariusz Felisiak <felisiak.mariusz@gmail.com> | 2020-01-29 06:53:43 +0100 |
| commit | 21cc09740343e89c951fa7fd9532a4eb62e1c8d7 (patch) | |
| tree | 4490ed8676aade50c13dd02acd3ae877a2109318 /docs/topics | |
| parent | d346f075d06aeb501ddbc3f6a0870c78bea1a9e9 (diff) | |
[3.0.x] Fixed #31212 -- Updated psycopg links to HTTPS and new location.
Backport of 958977f662d878c299b3599282f005c3469dbef9 from master
Diffstat (limited to 'docs/topics')
| -rw-r--r-- | docs/topics/db/transactions.txt | 7 | ||||
| -rw-r--r-- | docs/topics/install.txt | 2 |
2 files changed, 4 insertions, 5 deletions
diff --git a/docs/topics/db/transactions.txt b/docs/topics/db/transactions.txt index aab61807cb..12e695b2f6 100644 --- a/docs/topics/db/transactions.txt +++ b/docs/topics/db/transactions.txt @@ -368,9 +368,9 @@ the transaction. For the intended use cases (mail notifications, Celery tasks, etc.), this should be fine. If it's not (if your follow-up action is so critical that its failure should mean the failure of the transaction itself), then you don't want to use the :func:`on_commit` hook. Instead, you may want -`two-phase commit`_ such as the `psycopg Two-Phase Commit protocol support`_ -and the `optional Two-Phase Commit Extensions in the Python DB-API -specification`_. +`two-phase commit`_ such as the :ref:`psycopg Two-Phase Commit protocol support +<psycopg2:tpc>` and the `optional Two-Phase Commit Extensions in the Python +DB-API specification`_. Callbacks are not run until autocommit is restored on the connection following the commit (because otherwise any queries done in a callback would open an @@ -387,7 +387,6 @@ autocommit is disabled and you are not within an atomic block will result in an error. .. _two-phase commit: https://en.wikipedia.org/wiki/Two-phase_commit_protocol -.. _psycopg Two-Phase Commit protocol support: http://initd.org/psycopg/docs/usage.html#tpc .. _optional Two-Phase Commit Extensions in the Python DB-API specification: https://www.python.org/dev/peps/pep-0249/#optional-two-phase-commit-extensions Use in tests diff --git a/docs/topics/install.txt b/docs/topics/install.txt index ee6d51e7db..3ce3dc2f1c 100644 --- a/docs/topics/install.txt +++ b/docs/topics/install.txt @@ -111,7 +111,7 @@ database queries, Django will need permission to create a test database. .. _PostgreSQL: https://www.postgresql.org/ .. _MariaDB: https://mariadb.org/ .. _MySQL: https://www.mysql.com/ -.. _psycopg2: http://initd.org/psycopg/ +.. _psycopg2: https://www.psycopg.org/ .. _SQLite: https://www.sqlite.org/ .. _cx_Oracle: https://oracle.github.io/python-cx_Oracle/ .. _Oracle: https://www.oracle.com/ |