Merge branch 'master' into platform-admin

Conflicts:
	tests/app/main/views/test_dashboard.py

app/templates/views/documentation.html

@@ -1,15 +1,15 @@
-{% extends "withnav_template.html" %}
+{% extends "withoutnav_template.html" %}
 {% from "components/page-footer.html" import page_footer %}
 {% from "components/api-key.html" import api_key %}
 
 {% block page_title %}
-  Developer documentation – GOV.UK Notify
+  API documentation – GOV.UK Notify
 {% endblock %}
 
 {% block maincolumn_content %}
 
 <h1 class="heading-large">
-    Set up API integration
+    Developer documentation
 </h1>
 
 <div class="grid-row">
@@ -81,7 +81,7 @@
         {{
           """
 {
-  'to': '+441234123123',
+  'to': '+447700900404',
   'template': 1
 }
           """|syntax_highlight_json
@@ -164,10 +164,6 @@
             https://api.notify.works
         </p>
 
-        <p>
-            <a href="{{ url_for('.api_keys', service_id=service_id) }}">API keys for your service</a>
-        </p>
-
     </div>
 </div>
 

app/templates/views/verification-not-received.html

@@ -16,7 +16,7 @@
 
 
       <p>
-      <a class="button" href="send-new-code" role="button">Resend verification code</a>
+      <a class="button" href="{{url_for('main.check_and_resend_verification_code')}}" role="button">Resend verification code</a>
       </p>
   </div>
 </div>