11 files changed, 33 insertions, 23 deletions
diff --git a/app/views/help/_sidebar.rhtml b/app/views/help/_sidebar.html.erb
index 2b7ed5647..2b7ed5647 100644
--- a/app/views/help/_sidebar.rhtml
+++ b/app/views/help/_sidebar.html.erb
diff --git a/app/views/help/_why_they_should_reply_by_email.rhtml b/app/views/help/_why_they_should_reply_by_email.html.erb
index faaa2b2e2..faaa2b2e2 100644
--- a/app/views/help/_why_they_should_reply_by_email.rhtml
+++ b/app/views/help/_why_they_should_reply_by_email.html.erb
diff --git a/app/views/help/about.rhtml b/app/views/help/about.html.erb
index 477f0e750..477f0e750 100644
--- a/app/views/help/about.rhtml
+++ b/app/views/help/about.html.erb
diff --git a/app/views/help/alaveteli.rhtml b/app/views/help/alaveteli.html.erb
index 6210f9f24..6210f9f24 100644
--- a/app/views/help/alaveteli.rhtml
+++ b/app/views/help/alaveteli.html.erb
diff --git a/app/views/help/api.rhtml b/app/views/help/api.html.erb
index da6253f87..c6488f93e 100644
--- a/app/views/help/api.rhtml
+++ b/app/views/help/api.html.erb
@@ -19,7 +19,7 @@
     <dt>Linking to new requests</dt>
     <dd>
       <p>To encourage your users to make links to a particular public authority, use URLs of the form
-      <%= link_to new_request_to_body_url(:url_name => "liverpool_city_council") , new_request_to_body_url(:url_name => "liverpool_city_council") %>.
+      <%= link_to new_request_to_body_path(:url_name => "liverpool_city_council") , new_request_to_body_path(:url_name => "liverpool_city_council") %>.
       These are the parameters you can add to those URLs, either in the URL or from a form.
 
       <ul>
@@ -30,15 +30,15 @@
       </ul>
     </dd>
 
-    <dt>RSS (actually, Atom) feeds</h2>
+    <dt>RSS (actually, Atom) feeds</dt>
     <dd>
       <p>There are Atom feeds on most pages which list FOI requests, which you can
       use to get updates and links in XML format. Find the URL of the Atom feed in
       one of these ways:
       <ul>
-          <li>Look for the <img src="/images/feed-16.png" alt=""> RSS feed links.</li>
-          <li>Examine the <tt>&lt;link rel="alternate" type="application/atom+xml"&gt;</tt> tag in the head of the HTML. </li>
-          <li>Add <tt>/feed</tt> to the start of another URL.
+          <li>Look for the <%= image_tag "feed-16.png", :alt => "RSS icon" %> RSS feed links.</li>
+          <li>Examine the <code>&lt;link rel="alternate" type="application/atom+xml"&gt;</code> tag in the head of the HTML. </li>
+          <li>Add <code>/feed</code> to the start of another URL.
       </ul>
 
       <p>In particular, even complicated search queries have Atom feeds.
@@ -53,8 +53,8 @@
       objects in a structured form. Find them by:
       </p>
       <ul>
-          <li>Adding <tt>.json</tt> to the end of the URL. </li>
-          <li>Look for the <tt>&lt;link rel="alternate" type="application/json"&gt;</tt> tag in the head of the HTML. </li>
+          <li>Adding <code>.json</code> to the end of the URL. </li>
+          <li>Look for the <code>&lt;link rel="alternate" type="application/json"&gt;</code> tag in the head of the HTML. </li>
       </ul>
 
       <p>Requests, users and authorities all have JSON versions containing basic
@@ -67,11 +67,19 @@
     <dd>
       <p>
       A spreadsheet file listing every body in WhatDoTheyKnow is available:
-      <%= link_to "all-authorities.csv", all_public_bodies_csv_url() %>
+      <%= link_to "all-authorities.csv", all_public_bodies_csv_path %>
       </p>
 
     </dd>
-  </dl>
+
+
+  <dt> 5. Write API </dt>
+  <dd>
+      <p>
+      The write API is designed to be used by authorities to create their own requests in the system. The API is currently used by mySociety's <a href="https://github.com/mysociety/foi-register">FOI Register software</a> to support using Alaveteli as a disclosure log for all FOI activity at a particular public body. More technical information about the write API is available on the <a href="https://github.com/mysociety/alaveteli/wiki/API#write-api">Alaveteli wiki</a>.
+      </p>
+  </dd>
+</dl>
 
   <p>Please <a href="<%= help_contact_path %>">contact us</a> if you need an API feature that isn't there yet. It's
   very much a work in progress, and we do add things when people ask us to.</p>
diff --git a/app/views/help/contact.rhtml b/app/views/help/contact.html.erb
index fab5017b8..ad89db9ec 100644
--- a/app/views/help/contact.rhtml
+++ b/app/views/help/contact.html.erb
@@ -40,13 +40,13 @@
     <% end %>
 </div>
 
-<% form_for :contact do |f| %>
+<%= form_for :contact do |f| %>
 
     <% if not @user %>
         <p>
             <label class="form_label" for="contact_name">Your name:</label>
             <%= f.text_field :name, :size => 20 %>
-            (or <%= link_to "sign in", signin_url(:r => request.request_uri) %>)
+            (or <%= link_to "sign in", signin_path(:r => request.fullpath) %>)
         </p>
 
         <p>
diff --git a/app/views/help/credits.rhtml b/app/views/help/credits.html.erb
index 02f1e40e8..02f1e40e8 100644
--- a/app/views/help/credits.rhtml
+++ b/app/views/help/credits.html.erb
diff --git a/app/views/help/officers.rhtml b/app/views/help/officers.html.erb
index b13e225fe..a227b01c5 100644
--- a/app/views/help/officers.rhtml
+++ b/app/views/help/officers.html.erb
@@ -52,7 +52,7 @@
   <dt id="email_only">An email isn't a sufficient address for an FOI request! <a href="#email_only">#</a> </dt>
 
   <dd>Yes it is. This
-  <a href="http://www.whatdotheyknow.com/request/1142/response/2894/attach/5/20080806100741260.pdf">letter from the ICO to Rother District Council</a> gives guidance on the matter, specifically
+  <a href="https://www.whatdotheyknow.com/request/1142/response/2894/attach/5/20080806100741260.pdf">letter from the ICO to Rother District Council</a> gives guidance on the matter, specifically
   in the context of requests made via WhatDoTheyKnow.
   </dd>
 
@@ -66,7 +66,7 @@
   via WhatDoTheyKnow. Moreover, since all requests are public it is much easier
   for you to see if one of our users is making vexatious requests. </p>
   <p>If that isn't enough for you, the
-  <a href="http://www.whatdotheyknow.com/request/1142/response/2894/attach/5/20080806100741260.pdf">letter from the ICO to Rother District Council</a> gives some guidance on the matter.</p>
+  <a href="https://www.whatdotheyknow.com/request/1142/response/2894/attach/5/20080806100741260.pdf">letter from the ICO to Rother District Council</a> gives some guidance on the matter.</p>
   </dd>
 
   <dt id="spam_problems">I can see a request on WhatDoTheyKnow, but we never got it by email!<a href="#spam_problems">#</a> </dt>
@@ -135,7 +135,7 @@
 
   <li>If the day the request email was delivered was a non-working day, we count
   the next working day as "day one". Delivery is delivery, even if it happened on
-  the weekend. Some authorities <a href="http://www.whatdotheyknow.com/request/policy_regarding_body_scans#incoming-1100">disagree with this</a>, our lawyer disagrees with them. </li>
+  the weekend. Some authorities <a href="https://www.whatdotheyknow.com/request/policy_regarding_body_scans#incoming-1100">disagree with this</a>, our lawyer disagrees with them. </li>
 
   <li>Requesters are encouraged to mark when they have <strong>clarified</strong>
   their request so the clock resets, but sometimes they get this wrong. If you
@@ -222,7 +222,7 @@
   form in an annotation.
   </dd>
 
-  <dt id="copyright"><a name="commercial"></a>What is your policy on copyright of documents?<a href="#copyright">#</a> </dt>
+  <dt id="copyright"><a id="commercial"></a>What is your policy on copyright of documents?<a href="#copyright">#</a> </dt>
 
   <dd>Our Freedom of Information law is "applicant blind", so anyone in the
   world can request the same document and get a copy of it.
@@ -235,9 +235,6 @@
 
   </dl>
 
-
-  </dl>
-
   <p><strong>If you haven't already</strong>, read <a href="<%= help_about_path %>">the introduction</a> --&gt;
   <br><strong>Otherwise</strong>, the <a href="<%= help_credits_path %>">credits</a> or the <a href="<%= help_api_path %>">programmers API</a> --&gt;
 
diff --git a/app/views/help/privacy.rhtml b/app/views/help/privacy.html.erb
index 8e5293892..f0e82ab13 100644
--- a/app/views/help/privacy.rhtml
+++ b/app/views/help/privacy.html.erb
@@ -84,6 +84,11 @@ ask a friend to. We don't have the resources to do this for everyone.
 
 </dd>
 
+<dt id="anonymous">Why are there anonymous requests on the site? <a href="#anonymous">#</a> </dt>
+<dd>
+Some public authorities are using mySociety's <a href="https://github.com/mysociety/foi-register">FOI Register</a> software in order to use WhatDoTheyKnow as a disclosure log for all their FOI activity.   When people make requests to the authority their names will usually be withheld from publication just as they would in an authority disclosure log on an authority website.
+</dd>
+
 <dt id="full_address">They've asked for my postal address! <a href="#full_address">#</a> </dt>
 
 <dd>
@@ -111,7 +116,7 @@ address should be treated as the return address."
 <dd>
 <p>If an authority only has a paper copy of the information that you want,
 they may ask you for a postal address. To start with, try persuading them
-to scan in the documents for you. You can even <a href="http://www.whatdotheyknow.com/request/car_parking_charges_policy_and_a#outgoing-532">offer to gift them a scanner</a>, which in that particular case
+to scan in the documents for you. You can even <a href="https://www.whatdotheyknow.com/request/car_parking_charges_policy_and_a#outgoing-532">offer to gift them a scanner</a>, which in that particular case
 embarrassed the authority into finding one they had already.</p>
 
 <p>If that doesn't work, and you want to provide your postal address privately
diff --git a/app/views/help/requesting.rhtml b/app/views/help/requesting.html.erb
index e7cfdd199..51358c6d9 100644
--- a/app/views/help/requesting.rhtml
+++ b/app/views/help/requesting.html.erb
@@ -30,7 +30,7 @@
   <dt id="missing_body">You're missing the public authority that I want to request from! <a href="#missing_body">#</a> </dt>
 
   <dd>
-  <p>Please <a href="<%= help_contact_path %>">contact us</a> with the name of the public authority and,
+  <p>Please <a href="<%= new_change_request_path %>">contact us</a> with the name of the public authority and,
   if you can find it, their contact email address for Freedom of Information requests.
   </p>
   <p>If you'd like to help add a whole category of public authority to the site, we'd love
@@ -235,7 +235,7 @@
   <dt id="eir">Why can I only request information about the environment from some authorities? <a href="#eir">#</a> </dt>
 
   <dd>
-  <p>Some public authorities, such as <a href="http://www.whatdotheyknow.com/body/south_east_water">South East Water</a>,
+  <p>Some public authorities, such as <a href="https://www.whatdotheyknow.com/body/south_east_water">South East Water</a>,
   don't come under the Freedom of Information Act, but do come under another law called
   the Environmental Information Regulations (EIR).
   </p>
diff --git a/app/views/help/unhappy.rhtml b/app/views/help/unhappy.html.erb
index 2b00341c2..79e3f8273 100644
--- a/app/views/help/unhappy.rhtml
+++ b/app/views/help/unhappy.html.erb
@@ -29,7 +29,7 @@ to your request '<%=request_link(@info_request) %>'?
 
 <p>
 <% if !@info_request.nil? %>
-    <%= link_to "Request an internal review", show_response_no_followup_url(:id => @info_request.id, :incoming_message_id => nil) + "?internal_review=1#followup", :class => 'link_button_green' %> and then write a message asking the authority to review your request.
+    <%= link_to "Request an internal review", show_response_no_followup_path(:id => @info_request.id, :incoming_message_id => nil) + "?internal_review=1#followup", :class => 'link_button_green' %> and then write a message asking the authority to review your request.
 <% else %>
     At the bottom of the relevant request page on <%= site_name %> choose
     "request an internal review". Then write a message asking for an internal
@@ -62,7 +62,7 @@ to the Scottish Information Commissioner</a>.
 Information Commissioner, either
 <% if !@info_request.nil? %>
     include a link to your request
-    <strong><%=h main_url(request_url(@info_request)) %></strong>
+    <strong><%=h request_url(@info_request) %></strong>
 <% else %>
     include a link to your request on <%= site_name %>
 <% end %>