diff options
author | Adolfo Fitoria <adolfo.fitoria@gmail.com> | 2013-01-02 09:03:16 -0600 |
---|---|---|
committer | Adolfo Fitoria <adolfo.fitoria@gmail.com> | 2013-01-02 09:03:16 -0600 |
commit | 86d6ddf0dd005c7d87c4d70122f839e1289e4d18 (patch) | |
tree | 8e2845711a7a514560a7a1a8bb56217269a601db | |
parent | 8cbcd73d19e58f023435f7d081555ec7b395c024 (diff) | |
parent | e0cd15e8f2d5a5fbb426e6131bf0b3654f2416d4 (diff) | |
download | askbot-86d6ddf0dd005c7d87c4d70122f839e1289e4d18.tar.gz askbot-86d6ddf0dd005c7d87c4d70122f839e1289e4d18.tar.bz2 askbot-86d6ddf0dd005c7d87c4d70122f839e1289e4d18.zip |
Merge branch 'master' of github.com:ASKBOT/askbot-devel
-rw-r--r-- | askbot/doc/source/changelog.rst | 4 | ||||
-rw-r--r-- | askbot/templates/base.html | 6 |
2 files changed, 10 insertions, 0 deletions
diff --git a/askbot/doc/source/changelog.rst b/askbot/doc/source/changelog.rst index 1a7bb367..c1d06cd3 100644 --- a/askbot/doc/source/changelog.rst +++ b/askbot/doc/source/changelog.rst @@ -1,6 +1,10 @@ Changes in Askbot ================= +Development version +------------------- +* added RSS auto-discovery link + 0.7.47 (Dec 13, 2012) --------------------- * Bugfix release diff --git a/askbot/templates/base.html b/askbot/templates/base.html index 4646a3a0..c65d690e 100644 --- a/askbot/templates/base.html +++ b/askbot/templates/base.html @@ -12,6 +12,12 @@ {% endif %} <meta name="viewport" content="width=device-width, initial-scale=1, user-scalable=no" /> <link rel="shortcut icon" href="{{ settings.SITE_FAVICON|media }}" /> + <link + rel="alternate" + type="application/rss+xml" + title="{% trans site_title=settings.APP_SHORT_NAME %}RSS feed from {{ site_title }}{% endtrans %}" + href="{{ settings.APP_URL }}{% url "latest_questions_feed" %}" + /> {% block before_css %}{% endblock %} {% include "meta/html_head_stylesheets.html" %} {% include "meta/fonts.html" %} |