Merge /home/brettp/sommitrealweird

diff --git a/sommitrealweird/blog/templates/blog/blog_index.html b/sommitrealweird/blog/templates/blog/blog_index.html
index 8a38afb8744e24eb136091e41cefc13735e3dd6f..950e4cd94acfc41e5516b7a2559ac0f794868410 100644 (file)
--- a/sommitrealweird/blog/templates/blog/blog_index.html
+++ b/sommitrealweird/blog/templates/blog/blog_index.html
@@ -3,8 +3,8 @@
 {% load comments %}
 
 {% block extrahead %}
-<link rel="alternate" type="application/atom+xml" title="iDunno's Blog - Atom Feed" href="{{ BLOG_FEED_ROOT }}/blog/" />
-<link rel="alternate" type="application/rss+xml" title="iDunno's Blog - RSS Feed" href="{{ BLOG_FEED_ROOT }}/blog/rss/" />
+<link rel="alternate" type="application/atom+xml" title="iDunno's Blog - Atom Feed" href="{{ BLOG_FEED_ROOT }}" />
+<link rel="alternate" type="application/rss+xml" title="iDunno's Blog - RSS Feed" href="{{ BLOG_FEED_ROOT }}rss/" />
 {% endblock %}
 
 {% block content %}

diff --git a/sommitrealweird/blog/templates/blog/single_entry_rst.html b/sommitrealweird/blog/templates/blog/single_entry_rst.html
index 2536c7521e440da47980beb867cfd125bc0e17fd..5dd425887808e143ac15ada4595dd57c1a31a650 100644 (file)
--- a/sommitrealweird/blog/templates/blog/single_entry_rst.html
+++ b/sommitrealweird/blog/templates/blog/single_entry_rst.html
@@ -3,6 +3,8 @@
 {% load xhtml11rst %}
 {% load comments %}
 
+{%block title %}{{ entry.title }}{% endblock %}
+
 {% block content %}
 <h1>{{ entry.title }}</h1>
 <div class="blogentry">