Remove some clutter from I-D upload page. The information was mived to the Instructions tab, but a higligh to the Note Well and BCP 78 was added. Fixes ietf-tools#2057. Commit ready for merge.

 - Legacy-Id: 16144

Author: russhousley

ietf/templates/submit/tool_instructions.html

@@ -12,14 +12,46 @@ <h2>I-D submission tool instructions</h2>
 
   <p>
     This page will explain the purpose and content of each screen in the I-D Submission Tool, and the actions that result by clicking the form buttons on each screen.
-    The specification for this tool can be found in <a href="https://www.ietf.org/rfc/rfc4228.txt?number=4228">RFC 4228</a>.
+  </p>
+
+  <p>
+    Internet-Drafts are working documents of the Internet Engineering
+    Task Force (IETF), its areas, and its working groups. Note that other
+    groups may also distribute working documents as Internet-Drafts.
+  </p>
+
+  <p>
+    Internet-Drafts are draft documents, and are valid for a maximum of
+    six months. They may be updated, replaced, or obsoleted by other
+    documents at any time.
+  </p>
+
+  <p>
+    The list of current Internet-Drafts can be accessed at
+    <a href="https://www.ietf.org/ietf/1id-abstracts.txt">https://www.ietf.org/ietf/1id-abstracts.txt</a>.
+  </p>
+
+  <p>
+    An API for automated draft submission is available as an alternative to this webpage at
+    <a href="https://datatracker.ietf.org/api/submit/">https://datatracker.ietf.org/api/submit/</a>.
   </p>
 
   <h3>Upload screen</h3>
   <p>
     The Upload screen is the first screen that a user will see when he or she starts the I-D submission process. A user can submit four different formats of an I-D, plain text, XML, PDF, and postscript, at the same time. Failure to submit at least one of a plain-text or xml version will cause an error, and an error screen will be displayed.
   </p>
 
+  <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="https://tools.ietf.org/html/bcp78">BCP 78</a>,
+    "Rights Contributors Provide to the IETF Trust".
+  </p>
+
+  <p>
+    Before you submit your I-D, it is recommended that you check it for nits
+    using the <b><a href="https://tools.ietf.org/tools/idnits/">idnits tool</a></b>.
+  </p>
+
   <p>
     <b>Form buttons and resulting actions</b>:
   </p>
@@ -133,4 +165,9 @@ <h3>Problem report</h3>
   <p>
     Please send problem reports to <a href="mailto:ietf-action@ietf.org">ietf-action@ietf.org</a>.
   </p>
+
+  <p>
+    The specification for this tool can be found in <a href="https://www.ietf.org/rfc/rfc4228.txt?number=4228">RFC 4228</a>.
+  </p>
+
 {% endblock %}

ietf/templates/submit/upload_submission.html

@@ -12,27 +12,14 @@
   <p class="bg-warning">WARNING: currently in draft submission blackout period</p>
   {% endif %}
 
+  <p>This page is used to submit Internet-Drafts to the Internet-Draft repository.</p>
+  
   {% if form.cutoff_warning %}
     <div class="cutoff-warning">
       {{ form.cutoff_warning|safe }}
     </div>
   {% endif %}
 
-  <p>This page is used to submit Internet-Drafts to the
-    Internet-Draft repository. The list of current Internet-Drafts can be
-    accessed at <a href="https://www.ietf.org/ietf/1id-abstracts.txt">https://www.ietf.org/ietf/1id-abstracts.txt</a>.
-    An API for automated draft submission is available at
-    <a href="https://datatracker.ietf.org/api/submit/">https://datatracker.ietf.org/api/submit/</a>.
-  </p>
-
-  <p>Internet-Drafts are working documents of the Internet Engineering
-    Task Force (IETF), its areas, and its working groups. Note that other
-    groups may also distribute working documents as Internet-Drafts.</p>
-
-  <p>Internet-Drafts are draft documents, and are valid for a maximum of
-    six months. They may be updated, replaced, or obsoleted by other
-    documents at any time.</p>
-
   {% if not form.shutdown or user|has_role:"Secretariat" %}
     <p>If you run into problems when submitting an Internet-Draft
       using this and the following pages, you may alternatively submit
@@ -42,7 +29,13 @@
     </p>
 
     <p>
-      Before you submit your draft, it is recommended that you check it for nits
+      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="https://tools.ietf.org/html/bcp78">BCP 78</a>,
+      "Rights Contributors Provide to the IETF Trust".
+    </p>
+
+    <p>
+      Before you submit your I-D, it is recommended that you check it for nits
       using the <b><a href="https://tools.ietf.org/tools/idnits/">idnits tool</a></b>.
     </p>