Merge remote-tracking branch 'refs/remotes/merge-requests/42'

docs/source/siteadmin/theming.rst

@@ -111,7 +111,7 @@ Other variables you may consider setting:
 `theme_linked_assets_dir`
     Your web server needs to serve the theme files out of some directory,
     and MediaGoblin will symlink the current theme's assets here.  See
-    the "Link the assets" setp in :ref:`theming-installing-section`.
+    the "Link the assets" step in :ref:`theming-installing-section`.
 
 
 Making a theme

mediagoblin/templates/mediagoblin/404.html

@@ -17,6 +17,8 @@
 #}
 {% extends "mediagoblin/base.html" %}
 
+{% block title %}404 — {{ super() }}{% endblock %}
+
 {% block mediagoblin_content %}
   <img class="right_align" src="{{ request.staticdirect('/images/404.png') }}"
        alt="{% trans %}Image of 404 goblin stressing out{% endtrans %}" />

mediagoblin/templates/mediagoblin/auth/change_fp.html

@@ -24,6 +24,10 @@
           src="{{ request.staticdirect('/js/show_password.js') }}"></script>
 {% endblock mediagoblin_head %}
 
+{% block title -%}
+  {% trans %}Set your new password{% endtrans %} &mdash; {{ super() }}
+{%- endblock %}
+
 {% block mediagoblin_content %}
   <form action="{{ request.urlgen('mediagoblin.auth.verify_forgot_password') }}"
         method="POST" enctype="multipart/form-data">