Bundles are groups of related patches. You can create bundles by
-selecting patches from a project, then using the 'create bundle' form
-to give your bundle a name. Each bundle can be public or private; public
-bundles are given a persistent URL, based you your username and the name
-of the bundle. Private bundles are only visible to you.
+
+ Bundles are groups of related patches. You can create bundles by
+ selecting patches from a project, then using the 'create bundle' form
+ to give your bundle a name. Each bundle can be public or private; public
+ bundles are given a persistent URL, based you your username and the name
+ of the bundle. Private bundles are only visible to you.
+
{% if not bundles %}
You have no bundles.
diff --git patchwork/templates/patchwork/confirm-error.html patchwork/templates/patchwork/confirm-error.html
index 81292e27..b1ce42ee 100644
--- patchwork/templates/patchwork/confirm-error.html
+++ patchwork/templates/patchwork/confirm-error.html
@@ -7,13 +7,17 @@
{% block body %}
{% if error == 'inactive' %}
-
This confirmation has already been processed; you've probably visited this
-page before.
+
+ This confirmation has already been processed; you've probably visited this
+ page before.
+
{% endif %}
{% if error == 'expired' %}
-
The confirmation has expired. If you'd still like to perform the
-{{conf.get_type_display}} process, you'll need to resubmit the request.
+
+ The confirmation has expired. If you'd still like to perform the
+ {{ conf.get_type_display }} process, you'll need to resubmit the request.
+
You can configure Patchwork to send you mail on certain events,
-or block automated mail altogether. Enter your email address to
-view or change your email settings.
+
+ You can configure Patchwork to send you mail on certain events,
+ or block automated mail altogether. Enter your email address to
+ view or change your email settings.
+
-
-
{% endblock %}
diff --git patchwork/templates/patchwork/optin-request.html patchwork/templates/patchwork/optin-request.html
index 90963e65..3384c462 100644
--- patchwork/templates/patchwork/optin-request.html
+++ patchwork/templates/patchwork/optin-request.html
@@ -6,44 +6,50 @@
{% block body %}
{% if confirmation %}
Opt-in confirmation email sent
-
An opt-in confirmation mail has been sent to
-{{confirmation.email}}, containing a link. Please click on
-that link to confirm your opt-in.
+
+ An opt-in confirmation mail has been sent to
+ {{ confirmation.email }}, containing a link. Please click on
+ that link to confirm your opt-in.
+
{% else %}
{% if error %}
-
{{error}}
+
{{ error }}
{% endif %}
{% if form %}
-
This form allows you to opt-in to automated email from Patchwork. Use
-this if you have previously opted-out of Patchwork mail, but now want to
-received notifications from Patchwork.
-When you submit it, an email will be sent to your address with a link to click
-to finalise the opt-in. Patchwork does this to prevent someone opting you in
-without your consent.
+
+ This form allows you to opt-in to automated email from Patchwork. Use
+ this if you have previously opted-out of Patchwork mail, but now want to
+ received notifications from Patchwork.
+
+
+ When you submit it, an email will be sent to your address with a link to
+ click to finalise the opt-in. Patchwork does this to prevent someone opting
+ you in without your consent.
+
+
{% endif %}
{% if error and admins %}
-
If you are having trouble opting in, please email
+
+ If you are having trouble opting in, please email
{% for admin in admins %}
{% if admins|length > 1 and forloop.last %} or {% endif %}
-{{admin.0}} <{{admin.1}}>{% if admins|length > 2 and not forloop.last %}, {% endif %}
+{{ admin.0 }} <{{ admin.1 }}>{% if admins|length > 2 and not forloop.last %}, {% endif %}
{% endfor %}
+
Opt-in complete. You have successfully opted back in to
-automated email from this Patchwork system, using the address
-{{email}}.
-
If you later decide that you no longer want to receive automated mail from
-Patchwork, just visit http://{{site.domain}}{% url 'mail-settings' %}, or
-visit the main Patchwork page and navigate from there.
+
+ Opt-in complete. You have successfully opted back in to
+ automated email from this Patchwork system, using the address
+ {{ email }}.
+
+
+ If you later decide that you no longer want to receive automated mail from
+ Patchwork, just visit
+ http://{{ site.domain }}{% url 'mail-settings' %},
+ or visit the main Patchwork page and navigate from there.
+
{% endif %}
{% endblock %}
diff --git patchwork/templates/patchwork/optout-request.html patchwork/templates/patchwork/optout-request.html
index 659af773..7396fd36 100644
--- patchwork/templates/patchwork/optout-request.html
+++ patchwork/templates/patchwork/optout-request.html
@@ -6,45 +6,53 @@
{% block body %}
{% if confirmation %}
Opt-out confirmation email sent
-
An opt-out confirmation mail has been sent to
-{{confirmation.email}}, containing a link. Please click on
-that link to confirm your opt-out.
+
+ An opt-out confirmation mail has been sent to
+ {{ confirmation.email }}, containing a link. Please click on
+ that link to confirm your opt-out.
+
{% else %}
{% if error %}
-
{{error}}
+
{{ error }}
{% endif %}
{% if form %}
-
This form allows you to opt-out of automated email from Patchwork.
-
If you opt-out of email, Patchwork may still email you if you do certain
-actions yourself (such as create a new Patchwork account), but will not send
-you unsolicited email.
-When you submit it, one email will be sent to your address with a link to click
-to finalise the opt-out. Patchwork does this to prevent someone opting you out
-without your consent.
+
+ This form allows you to opt-out of automated email from Patchwork.
+
+
+ If you opt-out of email, Patchwork may still email you if you do certain
+ actions yourself (such as create a new Patchwork account), but will not
+ send you unsolicited email.
+
+
+ When you submit it, one email will be sent to your address with a link to
+ click to finalise the opt-out. Patchwork does this to prevent someone
+ opting you out without your consent.
+
{% endif %}
{% if error and admins %}
-
If you are having trouble opting out, please email
+
+ If you are having trouble opting out, please email
{% for admin in admins %}
{% if admins|length > 1 and forloop.last %} or {% endif %}
-{{admin.0}} <{{admin.1}}>{% if admins|length > 2 and not forloop.last %}, {% endif %}
+{{ admin.0 }} <{{ admin.1 }}>{% if admins|length > 2 and not forloop.last %}, {% endif %}
{% endfor %}
+
Opt-out complete. You have successfully opted-out of
-automated notifications from this Patchwork system, from the address
-{{email}}
-
Please note that you may still receive email from other Patchwork setups at
-different sites, as they are run independently. You may need to opt-out of
-those separately.
+ Opt-out complete. You have successfully opted-out of
+ automated notifications from this Patchwork system, from the address
+ {{ email }}
+
+
+ Please note that you may still receive email from other Patchwork setups at
+ different sites, as they are run independently. You may need to opt-out of
+ those separately.
+