Merge branch 'release/0.6.4'0.6.4

1 files changed, 5 insertions, 5 deletions

diff --git a/app/views/admin_request/edit.rhtml b/app/views/admin_request/edit.rhtml
index 4026ee712..808028b47 100644
--- a/app/views/admin_request/edit.rhtml
+++ b/app/views/admin_request/edit.rhtml
@@ -7,21 +7,21 @@
    <p><label for="info_request_title"><strong>Title</strong></label> (warning: editing this will break URLs right now)<br/>
    <%= text_field 'info_request', 'title', :size => 50  %></p>
 
-   <p><label for="info_request_prominence"><strong>Prominence</strong></label> 
+   <p><label for="info_request_prominence"><strong>Prominence</strong></label>
    <%= select( 'info_request', "prominence", [ "normal", "backpage", "requester_only", "hidden" ]) %>
    (backpage means hidden from lists/search; hidden means completely hidden; super users can see anything)
    </p>
 
    <p>
-   <label for="info_request_allow_new_responses_from"><strong>Allow new responses</strong> from</label> 
+   <label for="info_request_allow_new_responses_from"><strong>Allow new responses</strong> from</label>
    <%= select( 'info_request', "allow_new_responses_from", [ "anybody", "authority_only", "nobody" ] ) %>;
-   <label for="info_request_handle_rejected_responses"><strong>Handle rejected responses</strong> with</label> 
+   <label for="info_request_handle_rejected_responses"><strong>Handle rejected responses</strong> with</label>
    <%= select( 'info_request', "handle_rejected_responses", [ "bounce", "holding_pen", "blackhole" ] ) %>
    <br>
    ('authority_only' means email From: domain of authority request email or any domain that has previously sent a response; 'nobody' also stops requester making followups; take care when using 'blackhole' which just drops mail)
    </p>
 
-   <p><label for="info_request_described_state"><strong>Described state</strong></label> 
+   <p><label for="info_request_described_state"><strong>Described state</strong></label>
    <%= select( 'info_request', "described_state", InfoRequest.enumerate_states ) %>;
     <label for="info_request_awaiting_description"><strong>Awaiting description</strong></label>
    <%= select('info_request', "awaiting_description", [["Yes - needs state updating",true],["No - state is up to date",false]]) %>
@@ -49,7 +49,7 @@
 
 <% form_tag '../destroy/' + @info_request.id.to_s do %>
     <p>
-    <strong>This is permanent and irreversible!</strong> <%= submit_tag 'Destory request entirely' %>
+    <strong>This is permanent and irreversible!</strong> <%= submit_tag 'Destroy request entirely' %>
     <br>Use it mainly if someone posts private information, e.g. made a Data Protection request. It
     destroys all responses and tracks as well.
     </p>