aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--app/views/comment/_comment_form.rhtml2
-rw-r--r--app/views/help/officers.rhtml37
-rw-r--r--app/views/help/privacy.rhtml83
-rw-r--r--app/views/help/requesting.rhtml11
-rw-r--r--todo.txt9
5 files changed, 69 insertions, 73 deletions
diff --git a/app/views/comment/_comment_form.rhtml b/app/views/comment/_comment_form.rhtml
index 806dafecb..aae0c4638 100644
--- a/app/views/comment/_comment_form.rhtml
+++ b/app/views/comment/_comment_form.rhtml
@@ -14,7 +14,7 @@
<%= hidden_field_tag 'submitted_comment', 1 %>
<%= hidden_field_tag 'preview', 1 %>
<%= submit_tag "Preview your annotation" %>
- (<strong>no ranty</strong> politics, read our <a href="/help/privacy#moderation">moderation policy</a>)
+ (<strong>no ranty</strong> politics, read our <a href="/help/requesting#moderation">moderation policy</a>)
</p>
<% end %>
diff --git a/app/views/help/officers.rhtml b/app/views/help/officers.rhtml
index a976240e0..3b20ca31a 100644
--- a/app/views/help/officers.rhtml
+++ b/app/views/help/officers.rhtml
@@ -205,41 +205,8 @@ is too big for even that (more than, say, 50Mb).
<dt id="names">Why do you publish the names of civil servants and the text of emails? <a href="#names">#</a> </dt>
<dd>We consider what officers or servants do in the course of their employment
-to be public information.</dd>
-
-<dt id="takedown">Can you take down personal information about me? <a href="#takedown">#</a> </dt>
-
-<dd>
-
-<p>If you see any personal information about you on the site which you'd like
-us to remove or hide, then please <a href="/help/contact">let us know</a>,
-specifying exactly what information you believe to be problematic and why, and
-where it appears on the site.</p>
-
-<p>If it is sensitive personal information that has been accidentally
-posted, then we will usually remove it. Normally we will only consider
-requests to remove personal information which come from the individual
-concerned, but for sensitive information we would appreciate anyone
-pointing out anything they see.</p>
-
-<p>We consider for various reasons that there is a strong public interest in
-retaining the names of officers or servants of public authorities. We will only
-remove such names in exceptional circumstances, such as where the disclosure of
-a name and position of employment would substantially risk an individual's
-safety. If you are such an official and you wish to have your name removed for
-such an urgent reason, you must supply us with a request to do so from your
-line manager. This request must demonstrate that a risk has been perceived
-which outweighs the public interest, and must demonstrate that efforts have
-been made to conceal the name on the organisation's own website.</p>
-
-<p>For all other requests we apply a public interest test to decide
-whether information should be removed.
-<a href="http://www.statutelaw.gov.uk/content.aspx?ActiveTextDocId=3190650"> Section 32</a>
-of the Data Protection Act 1998 permits us to do this, as the material we
-publish is journalistic. We cannot easily edit many types of attachments (such
-as PDFs, or Microsoft Word or Excel files), so we will usually ask
-that authorities resend these with the personal information removed.</p>
-
+to be public information. We will only remove content in exceptional
+circumstances, see our <a href="/help/privacy#takedown">take down policy</a>.
</dd>
<dt id="mobiles">Do you publish email addresses or mobile phone numbers? <a href="#mobiles">#</a> </dt>
diff --git a/app/views/help/privacy.rhtml b/app/views/help/privacy.rhtml
index 416587fe9..001427181 100644
--- a/app/views/help/privacy.rhtml
+++ b/app/views/help/privacy.rhtml
@@ -84,28 +84,6 @@ ask a friend to. We don't have the resources to do this for everyone.
</dd>
-<dt id="delete_requests">Can you delete my requests, or alter my name? <a href="#delete_requests">#</a> </dt>
-
-<dd>
-
-<p>WhatDoTheyKnow is a permanent, public archive of Freedom of
-Information requests. Even though you may not find the response to
-a request useful any more, it may be of interest to others. For this
-reason, we will not delete requests.
-</p>
-
-<p>Under exceptional circumstances we may remove or change your name
-on the website, following similar policy as for the names of
-public servants (<a href="/help/officers#takedown">see here</a>).
-Similarly, we may also remove other personal information.
-</p>
-
-<p>If you're worried about this before you make your request,
-see the section on <a href="#real_name">pseudonyms</a>.</p>
-
-</dd>
-
-
<dt id="full_address">They've asked for my postal address! <a href="#full_address">#</a> </dt>
<dd>
@@ -141,17 +119,62 @@ in order to receive the documents, mark your request as "They are going to reply
give you an email address to use for that purpose.</p>
</dd>
-<dt id="moderation">How do you moderate request annotations? <a href="#moderation">#</a> </dt>
+<dt id="delete_requests">Can you delete my requests, or alter my name? <a href="#delete_requests">#</a> </dt>
-<dd>
-<p>Annotations on WhatDoTheyKnow are to help
-people get the information they want, or to give them pointers to places they
-can go to help them act on it. We reserve the right to remove anything else.
-</p>
-<p>Endless, political discussions are not allowed.
-Post a link to a suitable forum or campaign site elsewhere.</p>
<dd>
+<p>WhatDoTheyKnow is a permanent, public archive of Freedom of
+Information requests. Even though you may not find the response to
+a request useful any more, it may be of interest to others. For this
+reason, we will not delete requests.
+</p>
+
+<p>Under exceptional circumstances we may remove or change your name
+on the website, <a href="#takedown">see the next question</a>.
+Similarly, we may also remove other personal information.
+</p>
+
+<p>If you're worried about this before you make your request,
+see the section on <a href="#real_name">pseudonyms</a>.</p>
+
+</dd>
+
+<dt id="takedown">Can you take down personal information about me? <a href="#takedown">#</a> </dt>
+
+<dd>
+
+<p>If you see any personal information about you on the site which you'd like
+us to remove or hide, then please <a href="/help/contact">let us know</a>.
+Specify exactly what information you believe to be problematic and why, and
+where it appears on the site.</p>
+
+<p>If it is sensitive personal information that has been accidentally
+posted, then we will usually remove it. Normally we will only consider
+requests to remove personal information which come from the individual
+concerned, but for sensitive information we would appreciate anyone
+pointing out anything they see.</p>
+
+<p>We consider that there is a strong public interest in
+retaining the names of officers or servants of public authorities. We will only
+remove such names in exceptional circumstances, such as where the disclosure of
+a name and position of employment would substantially risk an individual's
+safety. If you are such an official and you wish to have your name removed for
+such an urgent reason, you must supply us with a request to do so from your
+line manager. This request must demonstrate that a risk has been perceived
+which outweighs the public interest, and must demonstrate that efforts have
+been made to conceal the name on the organisation's own website.</p>
+
+<p>For all other requests we apply a public interest test to decide
+whether information should be removed.
+<a href="http://www.statutelaw.gov.uk/content.aspx?ActiveTextDocId=3190650"> Section 32</a>
+of the Data Protection Act 1998 permits us to do this, as the material we
+publish is journalistic. We cannot easily edit many types of attachments (such
+as PDFs, or Microsoft Word or Excel files), so we will usually ask
+that authorities resend these with the personal information removed.</p>
+
+</dd>
+
+
</dl>
<p><strong>Learn more</strong> from the help for <a href="/help/officers">FOI officers</a> --&gt;
diff --git a/app/views/help/requesting.rhtml b/app/views/help/requesting.rhtml
index ff93cdaa6..034bb31e5 100644
--- a/app/views/help/requesting.rhtml
+++ b/app/views/help/requesting.rhtml
@@ -265,6 +265,17 @@ responses actually came from the authority. If this really matters to you,
you can always make the same request again via WhatDoTheyKnow.
</dd>
+<dt id="moderation">How do you moderate request annotations? <a href="#moderation">#</a> </dt>
+
+<dd>
+<p>Annotations on WhatDoTheyKnow are to help
+people get the information they want, or to give them pointers to places they
+can go to help them act on it. We reserve the right to remove anything else.
+</p>
+<p>Endless, political discussions are not allowed.
+Post a link to a suitable forum or campaign site elsewhere.</p>
+<dd>
+
</dl>
<p><strong>Next</strong>, read about <a href="/help/privacy">your privacy</a> --&gt;
diff --git a/todo.txt b/todo.txt
index c1220a009..7ccb53a77 100644
--- a/todo.txt
+++ b/todo.txt
@@ -1,12 +1,5 @@
-
-Link to API help
- "Can I help out" a bit invisible
-Clear all caches to upgrade mobile phone help links
-
-Keep URL through funnel for Louise
-
-
Tag search
@@ -14,6 +7,8 @@ Tag search
Next (things that will reduce admin time mainly)
====
+Keep URL through funnel for Louise
+
Destroy request - does it remove the tags?
Richard says he wants the internationalisation to be so it could be one site