diff --git a/django/contrib/admin/static/admin/img/README.txt b/django/contrib/admin/static/admin/img/README.txt index 4eb2e492a9be..bf81f35beea0 100644 --- a/django/contrib/admin/static/admin/img/README.txt +++ b/django/contrib/admin/static/admin/img/README.txt @@ -1,4 +1,4 @@ -All icons are taken from Font Awesome (http://fontawesome.io/) project. +All icons are taken from Font Awesome (https://fontawesome.com/) project. The Font Awesome font is licensed under the SIL OFL 1.1: - https://scripts.sil.org/OFL diff --git a/docs/howto/outputting-pdf.txt b/docs/howto/outputting-pdf.txt index bcdfa6acc49c..bb23affff46a 100644 --- a/docs/howto/outputting-pdf.txt +++ b/docs/howto/outputting-pdf.txt @@ -15,7 +15,7 @@ printer-friendly NCAA tournament brackets, as PDF files, for people participating in a March Madness contest. .. _ReportLab: https://docs.reportlab.com/ -.. _kusports.com: http://www2.kusports.com/ +.. _kusports.com: https://www2.kusports.com/ Install ReportLab ================= diff --git a/docs/misc/design-philosophies.txt b/docs/misc/design-philosophies.txt index 207685d5569b..99d01b413fd8 100644 --- a/docs/misc/design-philosophies.txt +++ b/docs/misc/design-philosophies.txt @@ -27,7 +27,7 @@ template system a programmer uses. Although Django comes with a full stack for convenience, the pieces of the stack are independent of another wherever possible. -.. _`loose coupling and tight cohesion`: http://wiki.c2.com/?CouplingAndCohesion +.. _`loose coupling and tight cohesion`: https://wiki.c2.com/?CouplingAndCohesion .. _less-code: @@ -66,7 +66,7 @@ as possible. The `discussion of DRY on the Portland Pattern Repository`__ - __ http://wiki.c2.com/?DontRepeatYourself + __ https://wiki.c2.com/?DontRepeatYourself .. _explicit-is-better-than-implicit: diff --git a/docs/ref/contrib/gis/gdal.txt b/docs/ref/contrib/gis/gdal.txt index 2b8f6d29da19..c0221a17a939 100644 --- a/docs/ref/contrib/gis/gdal.txt +++ b/docs/ref/contrib/gis/gdal.txt @@ -1980,7 +1980,7 @@ For instance: # Read a raster as a file object from a remote source. >>> from urllib.request import urlopen - >>> dat = urlopen("http://example.com/raster.tif").read() + >>> dat = urlopen("https://example.com/raster.tif").read() # Instantiate a raster from the bytes object. >>> rst = GDALRaster(dat) # The name starts with /vsimem/, indicating that the raster lives in the diff --git a/docs/ref/contrib/sitemaps.txt b/docs/ref/contrib/sitemaps.txt index de8d53218013..4f32c06bd97f 100644 --- a/docs/ref/contrib/sitemaps.txt +++ b/docs/ref/contrib/sitemaps.txt @@ -568,7 +568,7 @@ generate a Google News compatible sitemap: + xmlns:news="https://www.google.com/schemas/sitemap-news/0.9"> {% spaceless %} {% for url in urlset %} diff --git a/docs/ref/contrib/sites.txt b/docs/ref/contrib/sites.txt index 17f81948144f..d69e4c8e81ca 100644 --- a/docs/ref/contrib/sites.txt +++ b/docs/ref/contrib/sites.txt @@ -246,7 +246,7 @@ Getting the current domain for full URLs Django's ``get_absolute_url()`` convention is nice for getting your objects' URL without the domain name, but in some cases you might want to display the -full URL -- with ``http://`` and the domain and everything -- for an object. +full URL -- with ``https://`` and the domain and everything -- for an object. To do this, you can use the sites framework. An example: .. code-block:: pycon diff --git a/docs/ref/contrib/syndication.txt b/docs/ref/contrib/syndication.txt index a3f678b1f093..d9672c5b0006 100644 --- a/docs/ref/contrib/syndication.txt +++ b/docs/ref/contrib/syndication.txt @@ -532,7 +532,7 @@ This example illustrates all possible attributes and methods for a # AUTHOR LINK --One of the following three is optional. The framework # looks for them in this order. In each case, the URL should include - # the "http://" and domain name. + # the scheme (such as "https://") and domain name. def author_link(self, obj): """ @@ -735,7 +735,7 @@ This example illustrates all possible attributes and methods for a # ITEM AUTHOR LINK -- One of the following three is optional. The # framework looks for them in this order. In each case, the URL should - # include the "http://" and domain name. + # include the scheme (such as "https://") and domain name. # # If you specify this, you must specify item_author_name. diff --git a/docs/ref/forms/fields.txt b/docs/ref/forms/fields.txt index a3e0bf1aba8b..8b07c6e2b287 100644 --- a/docs/ref/forms/fields.txt +++ b/docs/ref/forms/fields.txt @@ -173,13 +173,13 @@ field is initialized to a particular value. For example: >>> from django import forms >>> class CommentForm(forms.Form): ... name = forms.CharField(initial="Your name") - ... url = forms.URLField(initial="http://") + ... url = forms.URLField(initial="https://") ... comment = forms.CharField() ... >>> f = CommentForm(auto_id=False) >>> print(f)
Name:
-
Url:
+
Url:
Comment:
You may be thinking, why not just pass a dictionary of the initial values as @@ -193,7 +193,7 @@ and the HTML output will include any validation errors: ... url = forms.URLField() ... comment = forms.CharField() ... - >>> default_data = {"name": "Your name", "url": "http://"} + >>> default_data = {"name": "Your name", "url": "https://"} >>> f = CommentForm(default_data, auto_id=False) >>> print(f)
Name: @@ -201,7 +201,7 @@ and the HTML output will include any validation errors:
Url:
  • Enter a valid URL.
- +
Comment:
  • This field is required.
@@ -219,7 +219,7 @@ validation if a particular field's value is not given. ``initial`` values are >>> class CommentForm(forms.Form): ... name = forms.CharField(initial="Your name") - ... url = forms.URLField(initial="http://") + ... url = forms.URLField(initial="https://") ... comment = forms.CharField() ... >>> data = {"name": "", "url": "", "comment": "Foo"} diff --git a/docs/ref/settings.txt b/docs/ref/settings.txt index 5d3e893cc78b..2aa2beb1becf 100644 --- a/docs/ref/settings.txt +++ b/docs/ref/settings.txt @@ -2096,7 +2096,7 @@ If you want to use ``{{ MEDIA_URL }}`` in your templates, add ``'django.template.context_processors.media'`` in the ``'context_processors'`` option of :setting:`TEMPLATES`. -Example: ``"http://media.example.com/"`` +Example: ``"https://media.example.com/"`` .. warning:: @@ -3478,7 +3478,7 @@ Default: ``None`` URL to use when referring to static files located in :setting:`STATIC_ROOT`. -Example: ``"static/"`` or ``"http://static.example.com/"`` +Example: ``"static/"`` or ``"https://static.example.com/"`` If not ``None``, this will be used as the base path for :ref:`asset definitions` (the ``Media`` class) and the diff --git a/docs/ref/utils.txt b/docs/ref/utils.txt index 4e28690f44ac..8ebb4f511669 100644 --- a/docs/ref/utils.txt +++ b/docs/ref/utils.txt @@ -306,13 +306,13 @@ Sample usage: >>> from django.utils import feedgenerator >>> feed = feedgenerator.Rss201rev2Feed( ... title="Poynter E-Media Tidbits", - ... link="http://www.poynter.org/column.asp?id=31", + ... link="https://www.poynter.org/tag/e-media-tidbits/", ... description="A group blog by the sharpest minds in online media/journalism/publishing.", ... language="en", ... ) >>> feed.add_item( ... title="Hello", - ... link="http://www.holovaty.com/test/", + ... link="https://www.holovaty.com/test/", ... description="Testing.", ... ) >>> with open("test.rss", "w") as fp: diff --git a/docs/topics/files.txt b/docs/topics/files.txt index 6ae1603f07ef..0a983b6cd3a0 100644 --- a/docs/topics/files.txt +++ b/docs/topics/files.txt @@ -49,7 +49,7 @@ the details of the attached photo: >>> car.photo.path '/media/cars/chevy.jpg' >>> car.photo.url - 'http://media.example.com/cars/chevy.jpg' + 'https://media.example.com/cars/chevy.jpg' This object -- ``car.photo`` in the example -- is a ``File`` object, which means it has all the methods and attributes described below. diff --git a/docs/topics/forms/media.txt b/docs/topics/forms/media.txt index 5fdd37437ea5..6e7bfdcbd416 100644 --- a/docs/topics/forms/media.txt +++ b/docs/topics/forms/media.txt @@ -74,9 +74,9 @@ can be retrieved through this property: >>> w = CalendarWidget() >>> print(w.media) - - - + + + Here's a list of all possible ``Media`` options. There are no required options. @@ -119,9 +119,9 @@ If this last CSS definition were to be rendered, it would become the following H .. code-block:: html+django - - - + + + ``js`` ------ @@ -153,11 +153,11 @@ example above: >>> w = FancyCalendarWidget() >>> print(w.media) - - - - - + + + + + The FancyCalendar widget inherits all the assets from its parent widget. If you don't want ``Media`` to be inherited in this way, add @@ -176,8 +176,8 @@ an ``extend=False`` declaration to the ``Media`` declaration: >>> w = FancyCalendarWidget() >>> print(w.media) - - + + If you require even more control over inheritance, define your assets using a :ref:`dynamic property `. Dynamic properties give you @@ -230,7 +230,7 @@ render a complete web page. To find the appropriate prefix to use, Django will check if the :setting:`STATIC_URL` setting is not ``None`` and automatically fall back to using :setting:`MEDIA_URL`. For example, if the :setting:`MEDIA_URL` for -your site was ``'http://uploads.example.com/'`` and :setting:`STATIC_URL` +your site was ``'https://uploads.example.com/'`` and :setting:`STATIC_URL` was ``None``: .. code-block:: pycon @@ -241,24 +241,24 @@ was ``None``: ... css = { ... "all": ["/css/pretty.css"], ... } - ... js = ["animations.js", "http://othersite.com/actions.js"] + ... js = ["animations.js", "https://othersite.com/actions.js"] ... >>> w = CalendarWidget() >>> print(w.media) - - + + -But if :setting:`STATIC_URL` is ``'http://static.example.com/'``: +But if :setting:`STATIC_URL` is ``'https://static.example.com/'``: .. code-block:: pycon >>> w = CalendarWidget() >>> print(w.media) - - + + Or if :mod:`~django.contrib.staticfiles` is configured using the :class:`~django.contrib.staticfiles.storage.ManifestStaticFilesStorage`: @@ -269,7 +269,7 @@ Or if :mod:`~django.contrib.staticfiles` is configured using the >>> print(w.media) - + Paths as objects ---------------- @@ -316,12 +316,12 @@ operator to filter out a medium of interest. For example: >>> w = CalendarWidget() >>> print(w.media) - - - + + + >>> print(w.media["css"]) - + When you use the subscript operator, the value that is returned is a new ``Media`` object -- but one that only contains the media of interest. @@ -352,10 +352,10 @@ specified by both: >>> w1 = CalendarWidget() >>> w2 = OtherWidget() >>> print(w1.media + w2.media) - - - - + + + + .. _form-media-asset-order: @@ -383,10 +383,10 @@ For example: >>> w1 = CalendarWidget() >>> w2 = TimeWidget() >>> print(w1.media + w2.media) - - - - + + + + Combining ``Media`` objects with assets in a conflicting order results in a ``MediaOrderConflictWarning``. @@ -415,10 +415,10 @@ are part of the form: >>> f = ContactForm() >>> f.media - - - - + + + + If you want to associate additional assets with a form -- for example, CSS for form layout -- add a ``Media`` declaration to the form: @@ -436,8 +436,8 @@ CSS for form layout -- add a ``Media`` declaration to the form: >>> f = ContactForm() >>> f.media - - - - - + + + + + diff --git a/docs/topics/performance.txt b/docs/topics/performance.txt index 4ba71880c4f4..a346dc7385d2 100644 --- a/docs/topics/performance.txt +++ b/docs/topics/performance.txt @@ -75,7 +75,7 @@ These can't report on the internals of your code, but can provide a useful insight into your site's overall performance, including aspects that can't be adequately measured from within Django environment. Examples include: -* `Yahoo's Yslow `_ +* `Yahoo's Yslow `_ * `Google PageSpeed `_ There are also several paid-for services that perform a similar analysis,