Merged in [19484] from lars@eggert.org:

    Remove the Note Well from the datatracker and point to the IETF web site.
One less thing to keep in sync if the Note Well changes.
 - Legacy-Id: 19520
Note: SVN reference [19484] has been migrated to Git commit 962253f

Author: rjsparks

ietf/submit/tests.py

@@ -1534,9 +1534,6 @@ def test_expire_submissions(self):
         self.assertEqual(s.state_id, "cancel")
 
     def test_help_pages(self):
-        r = self.client.get(urlreverse("ietf.submit.views.note_well"))
-        self.assertEqual(r.status_code, 200)
-
         r = self.client.get(urlreverse("ietf.submit.views.tool_instructions"))
         self.assertEqual(r.status_code, 200)
 
@@ -2916,4 +2913,4 @@ def test_draft_refs_identification(self):
         self.assertEqual(refs['rfc8174'], 'norm')
         self.assertEqual(refs['rfc8126'], 'info')
         self.assertEqual(refs['rfc8175'], 'info')
-        
+        

ietf/submit/urls.py

@@ -10,7 +10,6 @@
     url(r'^status/(?P<submission_id>\d+)/confirm/(?P<auth_token>[a-f\d]+)/$', views.confirm_submission),
     url(r'^status/(?P<submission_id>\d+)/edit/$', views.edit_submission),
     url(r'^status/(?P<submission_id>\d+)/(?P<access_token>[a-f\d]+)/edit/$', views.edit_submission),
-    url(r'^note-well/$', views.note_well),
     url(r'^tool-instructions/$', views.tool_instructions),
 
     url(r'^approvals/$', views.approvals),
@@ -26,4 +25,4 @@
     url(r'^manualpost/email/(?P<submission_id>\d+)/(?P<message_id>\d+)/(?P<access_token>[a-f\d]*)/$', views.show_submission_email_message),
     url(r'^manualpost/replyemail/(?P<submission_id>\d+)/(?P<message_id>\d+)/$', views.send_submission_email),
     url(r'^manualpost/sendemail/(?P<submission_id>\d+)/$', views.send_submission_email),
-]
+]

ietf/submit/views.py

@@ -199,9 +199,6 @@ def err(code, text):
     else:
         return err(405, "Method not allowed")
 
-def note_well(request):
-    return render(request, 'submit/note_well.html', {'selected': 'notewell'})
-
 def tool_instructions(request):
     return render(request, 'submit/tool_instructions.html', {'selected': 'instructions'})
 
@@ -926,4 +923,4 @@ def get_submission_or_404(submission_id, access_token=None):
     if access_token and not key_matched:
         raise Http404
 
-    return submission
+    return submission

ietf/templates/submit/note_well.html

@@ -20,9 +20,6 @@ <h1>Internet-Draft submission </h1>
     <li {% if selected == "instructions" %}class="active"{% endif %}>
       <a href="{% url "ietf.submit.views.tool_instructions" %}">Instructions</a>
     </li>
-    <li {% if selected == "notewell" %}class="active"{% endif %}>
-      <a href="{% url "ietf.submit.views.note_well" %}">Note Well</a>
-    </li>
     <li {% if selected == "approvals" %}class="active"{% endif %}>
       <a href="{% url "ietf.submit.views.approvals" %}">Approvals</a>
     </li>
@@ -34,4 +31,4 @@ <h1>Internet-Draft submission </h1>
   {% block submit_content %}
   {% endblock %}
 
-{% endblock %}
+{% endblock %}

ietf/templates/submit/submit_base.html

@@ -43,7 +43,9 @@ <h3>Upload screen</h3>
 
   <p>
     By submitting your I-D, you are granting some rights to the IETF Trust.  Before you submit your I-D,
-    review the information on the NOTE WELL tab and <a href="{% url 'ietf.doc.views_doc.document_html' name='rfc5378' %}">BCP 78</a>,
+    review the information in the
+    <a href="https://www.ietf.org/about/note-well/">Note Well</a> and
+    <a href="{% url 'ietf.doc.views_doc.document_html' name='rfc5378' %}">BCP 78</a>,
     "Rights Contributors Provide to the IETF Trust".
   </p>
 
@@ -168,4 +170,4 @@ <h3>Problem report</h3>
     The specification for this tool can be found in <a href="{% url 'ietf.doc.views_doc.document_html' name='rfc4228' %}">RFC 4228</a>.
   </p>
 
-{% endblock %}
+{% endblock %}

ietf/templates/submit/tool_instructions.html

@@ -24,7 +24,8 @@
   {% if not form.shutdown or user|has_role:"Secretariat" %}
     <p class="alert alert-warning">
       By submitting your I-D, you are granting some rights to the IETF Trust.
-      Before you submit your I-D, review the information on the NOTE WELL tab and
+      Before you submit your I-D, review the information in the
+      <a href="https://www.ietf.org/about/note-well/">Note Well</a> and
       <a href="{% url 'ietf.doc.views_doc.document_html' name='rfc5378' %}">BCP 78</a>,
       "Rights Contributors Provide to the IETF Trust".
     </p>