Merge remote-tracking branch 'upstream/master'

Keep the latex and tag-specific feeds in bootstrap3

Conflicts:
	pelican-bootstrap3/templates/base.html

3 files changed, 8 insertions, 2 deletions

diff --git a/mnmlist/README.rst b/mnmlist/README.rst
index c863513..08f7100 100644
--- a/mnmlist/README.rst
+++ b/mnmlist/README.rst
@@ -20,3 +20,9 @@ Compass
 ~~~~~~~
 
 The ``main.css`` file is generated from the ``compass/src/main.scss`` sass file, using http://compass-style.org/.
+
+Screenshot
+----------
+
+.. image:: screenshot.png
+   :alt: Screenshot of the theme
diff --git a/mnmlist/templates/index.html b/mnmlist/templates/index.html
index 1505418..d29eb44 100644
--- a/mnmlist/templates/index.html
+++ b/mnmlist/templates/index.html
@@ -21,7 +21,7 @@
             {% endif %}
         {# other items #}
         {% else %} 
-            <li><a href="{{ SITEURL }}/{{ article.url }}" rel="bookmark" title="Permalink to {{ article.title}}">{{ article.title }}</a></li>
+            <li><a href="{{ SITEURL }}/{{ article.url }}" rel="bookmark" title="Permalink to {{ article.title|striptags }}">{{ article.title }}</a></li>
         {% endif %}
 {% endfor %}
     {% if loop.length > 1 %}
diff --git a/mnmlist/templates/page.html b/mnmlist/templates/page.html
index 0fad5fe..8b16fa7 100644
--- a/mnmlist/templates/page.html
+++ b/mnmlist/templates/page.html
@@ -3,7 +3,7 @@
 {% block content %}        
 <header>
     <h1><a href="{{ SITEURL }}" id="site-title">{{ SITENAME }} {% if SITESUBTITLE %} <strong>{{ SITESUBTITLE }}</strong>{% endif %}</a> :
-        <a href="{{ SITEURL }}/{{ page.slug }}" id="page-title">{{ page.title }}</a></h1>
+        <a href="{{ SITEURL }}/{{ page.url }}" id="page-title">{{ page.title }}</a></h1>
 </header>
 <article>    
     {{ page.content }}