add titles to two pages and fix a typo in docs

diff --git a/docs/source/siteadmin/theming.rst b/docs/source/siteadmin/theming.rst
index b21e2743bf65e5285bef190771948dd6c51001f0..98ec6de7fc9dcf23b3400a30a2674acfb5731e48 100644 (file)
--- a/docs/source/siteadmin/theming.rst
+++ b/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

diff --git a/mediagoblin/templates/mediagoblin/404.html b/mediagoblin/templates/mediagoblin/404.html
index 5e58d1916b5e639435f4bf18d728c6f6af7841c2..c0fe8b62d81f8926c1d2e13302595ccf1d63c9c7 100644 (file)
--- a/mediagoblin/templates/mediagoblin/404.html
+++ b/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 %}" />

diff --git a/mediagoblin/templates/mediagoblin/auth/change_fp.html b/mediagoblin/templates/mediagoblin/auth/change_fp.html
index d95516e8250eff293be8e47cc4c425395ac42980..1f7d9aca4fc82a253d04c8c6ecc1f3c93df286a3 100644 (file)
--- a/mediagoblin/templates/mediagoblin/auth/change_fp.html
+++ b/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">