diff options
| author | Aymeric Augustin <aymeric.augustin@m4x.org> | 2012-01-29 19:24:32 +0000 |
|---|---|---|
| committer | Aymeric Augustin <aymeric.augustin@m4x.org> | 2012-01-29 19:24:32 +0000 |
| commit | a4b472dd809c8a696d1488a54dcaf3870ec9e661 (patch) | |
| tree | 1338453f7de1c9802a571cabf353af364559370f /docs | |
| parent | 123f567093eb3bd2f9cb295f4553eb62433c2962 (diff) | |
Fixed #8995 -- Added support for HTTPS in sitemaps.
Modularized tests and did a bit of cleanup while I was in the area.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17409 bcc190cf-cafb-0310-a4f2-bffc1f526a37
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/ref/contrib/sitemaps.txt | 17 | ||||
| -rw-r--r-- | docs/releases/1.4.txt | 4 |
2 files changed, 20 insertions, 1 deletions
diff --git a/docs/ref/contrib/sitemaps.txt b/docs/ref/contrib/sitemaps.txt index f4ae417666..ac9f8abac4 100644 --- a/docs/ref/contrib/sitemaps.txt +++ b/docs/ref/contrib/sitemaps.txt @@ -161,6 +161,9 @@ Sitemap class reference the ``get_absolute_url()`` method on each object as returned by :attr:`~Sitemap.items()`. + To specify a protocol other than ``'http'``, use + :attr:`~Sitemap.protocol`. + .. attribute:: Sitemap.lastmod **Optional.** Either a method or attribute. @@ -193,7 +196,7 @@ Sitemap class reference * ``'yearly'`` * ``'never'`` - .. method:: Sitemap.priority + .. attribute:: Sitemap.priority **Optional.** Either a method or attribute. @@ -208,6 +211,18 @@ Sitemap class reference .. _sitemaps.org documentation: http://www.sitemaps.org/protocol.html#prioritydef + .. attribute:: Sitemap.protocol + + .. versionadded:: 1.4 + + **Optional.** + + This attribute defines the protocol (``'http'`` or ``'https'``) of the + URLs in the sitemap. If it isn't set, the protocol with which the + sitemap was requested is used. If the sitemap is built outside the + context of a request, the default is ``'http'``. + + Shortcuts ========= diff --git a/docs/releases/1.4.txt b/docs/releases/1.4.txt index 9b3c219d31..c5128b10f2 100644 --- a/docs/releases/1.4.txt +++ b/docs/releases/1.4.txt @@ -562,6 +562,10 @@ Django 1.4 also includes several smaller improvements worth noting: just like with regular formsets. However, initial values only apply to extra forms i.e. those which are not bound to an existing model instance. +* The sitemaps framework can now handle HTTPS links using the new + :attr:`Sitemap.protocol <django.contrib.sitemaps.Sitemap.protocol>` class + attribute. + Backwards incompatible changes in 1.4 ===================================== |