From 51fbe2a60d9c7ff3fe62688ad262ccda648f506d Mon Sep 17 00:00:00 2001 From: Marti Raudsepp Date: Tue, 25 Oct 2016 18:43:32 +0300 Subject: [PATCH] Updated postgresql.org links to https and made them canonical. --- django/db/backends/postgresql/operations.py | 8 ++++---- docs/faq/general.txt | 2 +- docs/faq/install.txt | 2 +- docs/howto/custom-model-fields.txt | 2 +- docs/ref/contrib/postgres/aggregates.txt | 2 +- docs/ref/contrib/postgres/lookups.txt | 4 ++-- docs/ref/contrib/postgres/search.txt | 8 ++++---- docs/ref/databases.txt | 8 ++++---- docs/ref/models/querysets.txt | 2 +- docs/ref/settings.txt | 2 +- docs/ref/unicode.txt | 2 +- docs/topics/db/sql.txt | 2 +- docs/topics/install.txt | 2 +- 13 files changed, 23 insertions(+), 23 deletions(-) diff --git a/django/db/backends/postgresql/operations.py b/django/db/backends/postgresql/operations.py index a30d24a0eb..20f60ab5ae 100644 --- a/django/db/backends/postgresql/operations.py +++ b/django/db/backends/postgresql/operations.py @@ -12,7 +12,7 @@ class DatabaseOperations(BaseDatabaseOperations): if internal_type in ("GenericIPAddressField", "IPAddressField", "TimeField", "UUIDField"): # PostgreSQL will resolve a union as type 'text' if input types are # 'unknown'. - # http://www.postgresql.org/docs/9.4/static/typeconv-union-case.html + # https://www.postgresql.org/docs/current/static/typeconv-union-case.html # These fields cannot be implicitly cast back in the default # PostgreSQL configuration so we need to explicitly cast them. # We must also remove components of the type within brackets: @@ -21,7 +21,7 @@ class DatabaseOperations(BaseDatabaseOperations): return '%s' def date_extract_sql(self, lookup_type, field_name): - # http://www.postgresql.org/docs/current/static/functions-datetime.html#FUNCTIONS-DATETIME-EXTRACT + # https://www.postgresql.org/docs/current/static/functions-datetime.html#FUNCTIONS-DATETIME-EXTRACT if lookup_type == 'week_day': # For consistency across backends, we return Sunday=1, Saturday=7. return "EXTRACT('dow' FROM %s) + 1" % field_name @@ -29,7 +29,7 @@ class DatabaseOperations(BaseDatabaseOperations): return "EXTRACT('%s' FROM %s)" % (lookup_type, field_name) def date_trunc_sql(self, lookup_type, field_name): - # http://www.postgresql.org/docs/current/static/functions-datetime.html#FUNCTIONS-DATETIME-TRUNC + # https://www.postgresql.org/docs/current/static/functions-datetime.html#FUNCTIONS-DATETIME-TRUNC return "DATE_TRUNC('%s', %s)" % (lookup_type, field_name) def _convert_field_to_tz(self, field_name, tzname): @@ -57,7 +57,7 @@ class DatabaseOperations(BaseDatabaseOperations): def datetime_trunc_sql(self, lookup_type, field_name, tzname): field_name, params = self._convert_field_to_tz(field_name, tzname) - # http://www.postgresql.org/docs/current/static/functions-datetime.html#FUNCTIONS-DATETIME-TRUNC + # https://www.postgresql.org/docs/current/static/functions-datetime.html#FUNCTIONS-DATETIME-TRUNC sql = "DATE_TRUNC('%s', %s)" % (lookup_type, field_name) return sql, params diff --git a/docs/faq/general.txt b/docs/faq/general.txt index 22d37fe7db..c201551781 100644 --- a/docs/faq/general.txt +++ b/docs/faq/general.txt @@ -27,7 +27,7 @@ thrilled to be able to give something back to the open-source community. .. _Apache: https://httpd.apache.org/ .. _Python: https://www.python.org/ -.. _PostgreSQL: http://www.postgresql.org/ +.. _PostgreSQL: https://www.postgresql.org/ What does "Django" mean, and how do you pronounce it? ===================================================== diff --git a/docs/faq/install.txt b/docs/faq/install.txt index 359ed7a06c..ea27b11db8 100644 --- a/docs/faq/install.txt +++ b/docs/faq/install.txt @@ -33,7 +33,7 @@ also need a database engine. PostgreSQL_ is recommended, because we're PostgreSQL fans, and MySQL_, `SQLite 3`_, and Oracle_ are also supported. .. _Python: https://www.python.org/ -.. _PostgreSQL: http://www.postgresql.org/ +.. _PostgreSQL: https://www.postgresql.org/ .. _MySQL: https://www.mysql.com/ .. _`SQLite 3`: https://www.sqlite.org/ .. _Oracle: http://www.oracle.com/ diff --git a/docs/howto/custom-model-fields.txt b/docs/howto/custom-model-fields.txt index 0c26d2ca5d..3c71f8f004 100644 --- a/docs/howto/custom-model-fields.txt +++ b/docs/howto/custom-model-fields.txt @@ -19,7 +19,7 @@ only the common types, such as ``VARCHAR`` and ``INTEGER``. For more obscure column types, such as geographic polygons or even user-created types such as `PostgreSQL custom types`_, you can define your own Django ``Field`` subclasses. -.. _PostgreSQL custom types: http://www.postgresql.org/docs/current/interactive/sql-createtype.html +.. _PostgreSQL custom types: https://www.postgresql.org/docs/current/static/sql-createtype.html Alternatively, you may have a complex Python object that can somehow be serialized to fit into a standard database column type. This is another case diff --git a/docs/ref/contrib/postgres/aggregates.txt b/docs/ref/contrib/postgres/aggregates.txt index 38b876c664..6b5e827ab2 100644 --- a/docs/ref/contrib/postgres/aggregates.txt +++ b/docs/ref/contrib/postgres/aggregates.txt @@ -6,7 +6,7 @@ PostgreSQL specific aggregation functions :synopsis: PostgreSQL specific aggregation functions These functions are described in more detail in the `PostgreSQL docs -`_. +`_. .. note:: diff --git a/docs/ref/contrib/postgres/lookups.txt b/docs/ref/contrib/postgres/lookups.txt index daf784e221..0176dba547 100644 --- a/docs/ref/contrib/postgres/lookups.txt +++ b/docs/ref/contrib/postgres/lookups.txt @@ -17,7 +17,7 @@ similarity threshold. To use it, add ``'django.contrib.postgres'`` in your :setting:`INSTALLED_APPS` and activate the `pg_trgm extension -`_ on +`_ on PostgreSQL. You can install the extension using the :class:`~django.contrib.postgres.operations.TrigramExtension` migration operation. @@ -43,7 +43,7 @@ the `unaccent extension on PostgreSQL`_. The :class:`~django.contrib.postgres.operations.UnaccentExtension` migration operation is available if you want to perform this activation using migrations). -.. _unaccent extension on PostgreSQL: http://www.postgresql.org/docs/current/interactive/unaccent.html +.. _unaccent extension on PostgreSQL: https://www.postgresql.org/docs/current/static/unaccent.html The ``unaccent`` lookup can be used on :class:`~django.db.models.CharField` and :class:`~django.db.models.TextField`:: diff --git a/docs/ref/contrib/postgres/search.txt b/docs/ref/contrib/postgres/search.txt index 512b3f83ae..6d3022116a 100644 --- a/docs/ref/contrib/postgres/search.txt +++ b/docs/ref/contrib/postgres/search.txt @@ -6,7 +6,7 @@ Full text search The database functions in the ``django.contrib.postgres.search`` module ease the use of PostgreSQL's `full text search engine -`_. +`_. For the examples in this document, we'll use the models defined in :doc:`/topics/db/queries`. @@ -167,7 +167,7 @@ In the event that all the fields you're querying on are contained within one particular model, you can create a functional index which matches the search vector you wish to use. The PostgreSQL documentation has details on `creating indexes for full text search -`_. +`_. ``SearchVectorField`` --------------------- @@ -183,7 +183,7 @@ if it were an annotated ``SearchVector``:: >>> Entry.objects.filter(search_vector='cheese') [, ] -.. _PostgreSQL documentation: http://www.postgresql.org/docs/current/static/textsearch-features.html#TEXTSEARCH-UPDATE-TRIGGERS +.. _PostgreSQL documentation: https://www.postgresql.org/docs/current/static/textsearch-features.html#TEXTSEARCH-UPDATE-TRIGGERS Trigram similarity ================== @@ -193,7 +193,7 @@ three consecutive characters. In addition to the :lookup:`trigram_similar` lookup, you can use a couple of other expressions. To use them, you need to activate the `pg_trgm extension -`_ on +`_ on PostgreSQL. You can install it using the :class:`~django.contrib.postgres.operations.TrigramExtension` migration operation. diff --git a/docs/ref/databases.txt b/docs/ref/databases.txt index a238eeed62..e7dcff04b9 100644 --- a/docs/ref/databases.txt +++ b/docs/ref/databases.txt @@ -121,7 +121,7 @@ user with `ALTER ROLE`_. Django will work just fine without this optimization, but each new connection will do some additional queries to set these parameters. -.. _ALTER ROLE: http://www.postgresql.org/docs/current/interactive/sql-alterrole.html +.. _ALTER ROLE: https://www.postgresql.org/docs/current/static/sql-alterrole.html .. _database-isolation-level: @@ -148,7 +148,7 @@ configuration in :setting:`DATABASES`:: handle exceptions raised on serialization failures. This option is designed for advanced uses. -.. _isolation level: http://www.postgresql.org/docs/current/static/transaction-iso.html +.. _isolation level: https://www.postgresql.org/docs/current/static/transaction-iso.html Indexes for ``varchar`` and ``text`` columns -------------------------------------------- @@ -162,7 +162,7 @@ for the column. The extra index is necessary to correctly perform lookups that use the ``LIKE`` operator in their SQL, as is done with the ``contains`` and ``startswith`` lookup types. -.. _PostgreSQL operator class: http://www.postgresql.org/docs/current/static/indexes-opclass.html +.. _PostgreSQL operator class: https://www.postgresql.org/docs/current/static/indexes-opclass.html Migration operation for adding extensions ----------------------------------------- @@ -185,7 +185,7 @@ Speeding up test execution with non-durable settings ---------------------------------------------------- You can speed up test execution times by `configuring PostgreSQL to be -non-durable `_. +non-durable `_. .. warning:: diff --git a/docs/ref/models/querysets.txt b/docs/ref/models/querysets.txt index 05d6180b14..f1c3864377 100644 --- a/docs/ref/models/querysets.txt +++ b/docs/ref/models/querysets.txt @@ -765,7 +765,7 @@ object. If it's ``None``, Django uses the :ref:`current time zone `mysql_tzinfo_to_sql`_. .. _pytz: http://pytz.sourceforge.net/ - .. _Time Zones: http://www.postgresql.org/docs/current/static/datatype-datetime.html#DATATYPE-TIMEZONES + .. _Time Zones: https://www.postgresql.org/docs/current/static/datatype-datetime.html#DATATYPE-TIMEZONES .. _Choosing a Time Zone File: https://docs.oracle.com/cd/E11882_01/server.112/e10729/ch4datetime.htm#NLSPG258 .. _mysql_tzinfo_to_sql: https://dev.mysql.com/doc/refman/en/mysql-tzinfo-to-sql.html diff --git a/docs/ref/settings.txt b/docs/ref/settings.txt index 28240034e5..223362c0f6 100644 --- a/docs/ref/settings.txt +++ b/docs/ref/settings.txt @@ -667,7 +667,7 @@ backend-specific. Supported by the PostgreSQL_ (``postgresql``) and MySQL_ (``mysql``) backends. -.. _PostgreSQL: http://www.postgresql.org/docs/current/static/multibyte.html +.. _PostgreSQL: https://www.postgresql.org/docs/current/static/multibyte.html .. _MySQL: https://dev.mysql.com/doc/refman/en/charset-database.html .. setting:: TEST_COLLATION diff --git a/docs/ref/unicode.txt b/docs/ref/unicode.txt index 2bced64285..6d1b269a57 100644 --- a/docs/ref/unicode.txt +++ b/docs/ref/unicode.txt @@ -30,7 +30,7 @@ able to store certain characters in the database, and information will be lost. for internal encoding. .. _MySQL manual: https://dev.mysql.com/doc/refman/en/charset-database.html -.. _PostgreSQL manual: http://www.postgresql.org/docs/current/static/multibyte.html +.. _PostgreSQL manual: https://www.postgresql.org/docs/current/static/multibyte.html .. _Oracle manual: https://docs.oracle.com/cd/E11882_01/server.112/e10729/toc.htm .. _section 2: https://docs.oracle.com/cd/E11882_01/server.112/e10729/ch2charset.htm#NLSPG002 .. _section 11: https://docs.oracle.com/cd/E11882_01/server.112/e10729/ch11charsetmig.htm#NLSPG011 diff --git a/docs/topics/db/sql.txt b/docs/topics/db/sql.txt index 14bf7f9725..b5c45844cd 100644 --- a/docs/topics/db/sql.txt +++ b/docs/topics/db/sql.txt @@ -185,7 +185,7 @@ of people with their ages calculated by the database:: Jane is 42. ... -__ http://www.postgresql.org/docs/current/static/functions-datetime.html +__ https://www.postgresql.org/docs/current/static/functions-datetime.html Passing parameters into ``raw()`` --------------------------------- diff --git a/docs/topics/install.txt b/docs/topics/install.txt index e42ff7c6da..2fd5931080 100644 --- a/docs/topics/install.txt +++ b/docs/topics/install.txt @@ -115,7 +115,7 @@ see :setting:`DATABASES` for details. If you're using Django's :doc:`testing framework` to test database queries, Django will need permission to create a test database. -.. _PostgreSQL: http://www.postgresql.org/ +.. _PostgreSQL: https://www.postgresql.org/ .. _MySQL: https://www.mysql.com/ .. _psycopg2: http://initd.org/psycopg/ .. _SQLite: https://www.sqlite.org/