diff --git a/ietf/secr/templates/drafts/message_new.txt b/ietf/secr/templates/drafts/message_new.txt index 55bd6f058..69b70497c 100644 --- a/ietf/secr/templates/drafts/message_new.txt +++ b/ietf/secr/templates/drafts/message_new.txt @@ -12,7 +12,7 @@ A new Internet-Draft is available from the on-line Internet-Drafts directories. {{ draft.abstract }} A URL for this Internet-Draft is: -http://www.ietf.org/internet-drafts/{{ draft.filename_with_rev }} +https://www.ietf.org/internet-drafts/{{ draft.filename_with_rev }} Internet-Drafts are also available by anonymous FTP at: ftp://ftp.ietf.org/internet-drafts/ diff --git a/ietf/secr/templates/drafts/message_revision.txt b/ietf/secr/templates/drafts/message_revision.txt index 496d5c9e9..65e4dd7f1 100644 --- a/ietf/secr/templates/drafts/message_revision.txt +++ b/ietf/secr/templates/drafts/message_revision.txt @@ -1,7 +1,7 @@ -New version (-{{ rev }}) has been submitted for {{ doc }}. -http://www.ietf.org/internet-drafts/{{ doc }} +A new version (-{{ rev }}) has been submitted for {{ doc }}: +https://www.ietf.org/internet-drafts/{{ doc }} Diff from previous version: -http://tools.ietf.org/rfcdiff?url2={{ doc_base }} +https://tools.ietf.org/rfcdiff?url2={{ doc_base }} -IETF Secretariat. +The IETF Secretariat. diff --git a/ietf/secr/templates/drafts/view.html b/ietf/secr/templates/drafts/view.html index 01653666c..256e69ff9 100644 --- a/ietf/secr/templates/drafts/view.html +++ b/ietf/secr/templates/drafts/view.html @@ -33,7 +33,7 @@ {% if draft.expired_tombstone %} {{ draft.filename }}
This is a last active version - the tombstone was expired.
- {% else %}{{ draft.name }} + {% else %}{{ draft.name }} {% endif %} Document Aliases: diff --git a/ietf/secr/templates/includes/proceeding_footer.html b/ietf/secr/templates/includes/proceeding_footer.html index 84ba76f72..7c93ac210 100644 --- a/ietf/secr/templates/includes/proceeding_footer.html +++ b/ietf/secr/templates/includes/proceeding_footer.html @@ -1,14 +1,14 @@ - -
-

Internet SocietyAMSHome - Tools - Team - Datatracker - Web Site Usage Statistics - IASA - IAB - RFC Editor - IANA - IRTF - IETF Trust - ISOC - Store - Contact Us
- Secretariat services provided by Association Management Solutions, LLC (AMS).
- Please send problem reports to: ietf-action@ietf.org.
-  

-
- - - - - - + +
+

Internet SocietyAMSHome - Tools + Team - Datatracker - Web Site Usage Statistics - IASA - IAB - RFC Editor - IANA - IRTF - IETF Trust - ISOC - Store - Contact Us
+ Secretariat services provided by Association Management Solutions, LLC (AMS).
+ Please send problem reports to: ietf-action@ietf.org.
+  

+
+ + + + + + diff --git a/ietf/secr/templates/includes/proceeding_header.html b/ietf/secr/templates/includes/proceeding_header.html index 48bcc51fe..9b7e73a19 100644 --- a/ietf/secr/templates/includes/proceeding_header.html +++ b/ietf/secr/templates/includes/proceeding_header.html @@ -23,7 +23,7 @@ tr.time-title > td {
Logo
-
+

@@ -45,19 +45,19 @@ tr.time-title > td {

  • Search
  • Submit
  • RFC Pages
    • -
  • Search RFC Ed Index
    • -
  • RFC Editor Queue
    • +
  • Search RFC Ed Index
    • +
  • RFC Editor Queue
  • IANA Pages
  • Protocol Parameters
  • Working Groups
  • WG Charters
    • -
  • Email Lists
    • +
  • Email Lists
  • WG Chairs' Page
  • Resources
  • Community Tools
    • -
  • Tools Team Pages
    • +
  • Tools Team Pages
  • Edu Team Pages
    • -
  • Wikis
    • +
  • Wikis
  • Meetings
  • Upcoming Meetings
  • Past Meetings
    • @@ -82,7 +82,7 @@ tr.time-title > td {
  • Liaison Managers
  • Contact
  • IETF Secretariat®
    • -
  • Legal Matters
    • +
  • Legal Matters
  • Report Web Site Errors
  • Customize View
    • diff --git a/ietf/secr/templates/includes/sessions_footer.html b/ietf/secr/templates/includes/sessions_footer.html index 3d4953417..cd53e70b8 100755 --- a/ietf/secr/templates/includes/sessions_footer.html +++ b/ietf/secr/templates/includes/sessions_footer.html @@ -1,4 +1,4 @@ -
  • Instructions.
    • +
  • Instructions.
  • IETF Meeting Materials Management Tool.
  • If you require assistance in using this tool, or wish to report a bug, then please send a message to ietf-action@ietf.org.
  • To submit your request via email, please send your request to agenda@ietf.org.
    • diff --git a/ietf/secr/templates/includes/upload_footer.html b/ietf/secr/templates/includes/upload_footer.html index 67243a4aa..dfd49ed43 100755 --- a/ietf/secr/templates/includes/upload_footer.html +++ b/ietf/secr/templates/includes/upload_footer.html @@ -1,3 +1,3 @@ -
  • Instructions.
    • +
  • Instructions.
  • If you require assistance in using this tool, or wish to report a bug, then please send a message to ietf-action@ietf.org.
  • To submit your materials via email, please send agendas to agenda@ietf.org and minutes/presentation slides to proceedings@ietf.org.
    • diff --git a/ietf/secr/templates/proceedings/agenda.html b/ietf/secr/templates/proceedings/agenda.html index 9d4173a11..eaa4ce95b 100644 --- a/ietf/secr/templates/proceedings/agenda.html +++ b/ietf/secr/templates/proceedings/agenda.html @@ -37,10 +37,10 @@ {% if ss.timeslot.show_location %}{{ss.timeslot.get_location}}{% endif %} {{ss.session.group.parent.acronym|upper}} - {% if ss.session.group.charter %}{{ss.session.group.acronym}} + {% if ss.session.group.charter %}{{ss.session.group.acronym}} {% else %}{{ss.session.group.acronym}}{% endif %} - {% if ss.session.agenda %}{{ss.session.group.name}} + {% if ss.session.agenda %}{{ss.session.group.name}} {% else %}{{ss.session.group.name}}{% endif %} {% if ss.session.group.state.name = "BOF" %} BOF {% endif %} {% if ss.session.agenda_note %} @@ -53,7 +53,7 @@ {% if ss.timeslot.show_location %}{{ss.timeslot.get_location}}{% endif %} - {% if ss.session.agenda %}Agenda + {% if ss.session.agenda %}Agenda {% else %}{{ss.session.group.name}}{% endif %} diff --git a/ietf/secr/templates/proceedings/interim_directory.html b/ietf/secr/templates/proceedings/interim_directory.html index 5d478850c..28de209a6 100644 --- a/ietf/secr/templates/proceedings/interim_directory.html +++ b/ietf/secr/templates/proceedings/interim_directory.html @@ -5,15 +5,15 @@

    Interim Meeting Proceedings

    - - + + {% for meeting in meetings %} - + {% if meeting.agenda %} {% else %} diff --git a/ietf/secr/templates/proceedings/interim_select.html b/ietf/secr/templates/proceedings/interim_select.html index f463037fa..d1fcea0b9 100755 --- a/ietf/secr/templates/proceedings/interim_select.html +++ b/ietf/secr/templates/proceedings/interim_select.html @@ -12,7 +12,7 @@ {% endblock %} {% block instructions %} - Instructions + Instructions {% endblock %} {% block content %} diff --git a/ietf/secr/templates/proceedings/irtf.html b/ietf/secr/templates/proceedings/irtf.html index 9257bdae2..ad4288d70 100644 --- a/ietf/secr/templates/proceedings/irtf.html +++ b/ietf/secr/templates/proceedings/irtf.html @@ -9,16 +9,16 @@

    To promote research of importance to the evolution of the future Internet by creating focused, long-term and small Research Groups working on topics related to Internet protocols, applications, architecture and technology.

    -

    [Dividing Line Image]

    +

    [Dividing Line Image]

    IRTF Research Groups

    The Internet Research Task Force is composed of a number -of small Research Groups. Research Groups are usually focussed and long term, though short lived "task force" like Research Groups are possible.

    +of small Research Groups. Research Groups are usually focussed and long term, though short lived "task force" like Research Groups are possible.

    IRTF Overview

    - The Research Groups work on topics related to + The Research Groups work on topics related to Internet protocols, applications, architecture and technology. Research Groups are expected to have the stable long term (with respect to the lifetime of the Research Group) membership needed to promote the development of research collaboration and teamwork in exploring research issues. Participation is by @@ -29,7 +29,7 @@ of small Research Groups. Research Grou various Research Group and possibly other individuals ("members at large") from the research community.

    -

    The IRTF Chair is appointed by the Internet +

    The IRTF Chair is appointed by the Internet Architecture Board (IAB), the Research Group chairs are appointed as part of the formation of Research Groups and the IRSG members at large are chosen by the IRTF Chair in consultation with the rest of the IRSG and on approval of the IAB. In addition to managing @@ -46,7 +46,7 @@ of small Research Groups. Research Grou group's pages.

    The IRTF + href="https://www.ietf.org/mailman/listinfo/irtf-announce">IRTF Announce list receive notices of IRTF Research Group creation and termination, document publication, invitations for feedback and participation, and other IRTF activities.

    @@ -55,8 +55,8 @@ of small Research Groups. Research Grou

    Sponsors

    The IRTF gratefully acknowledges support from the following organizations:

    IRTF Chair

    diff --git a/ietf/secr/templates/proceedings/overview.html b/ietf/secr/templates/proceedings/overview.html index 0a5bec291..01e2848eb 100644 --- a/ietf/secr/templates/proceedings/overview.html +++ b/ietf/secr/templates/proceedings/overview.html @@ -114,7 +114,7 @@ Fremont, California.The IETF Executive Director is Alexa Morris
    DateGroupDateGroup
    {{ meeting.date }}{{ meeting.group.acronym }}{{ meeting.group.acronym }}Agenda

    To contact the Secretariat, please refer to the addresses and URLs provided on the -IETF Secretariat Web page.

    +IETF Secretariat Web page.

    The IETF also has a general Administrative Support Activity headed by the IETF Administrative Director, Ray Pelletier iad@ietf.org

    @@ -133,6 +133,6 @@ place since the previous IETF meeting.

    Meeting minutes, working group charters (including information about the working group mailing lists), and general information on current IETF activities are available on the IETF Web site at -http://www.ietf.org.

    +https://www.ietf.org.

    {% endblock %} diff --git a/ietf/secr/templates/proceedings/proceedings.html b/ietf/secr/templates/proceedings/proceedings.html index 21e2d2f61..9e96c1852 100644 --- a/ietf/secr/templates/proceedings/proceedings.html +++ b/ietf/secr/templates/proceedings/proceedings.html @@ -36,14 +36,14 @@ and end with Agenda {% endif %}  |   {% endif %} -Jabber Logs  |   +Jabber Logs  |   {% if group.list_archive %} Mailing List Archives {% endif %} {% if group.type.slug == "wg" %} -

    Additional information is available at tools.ietf.org/wg/{{ group.acronym }} +

    Additional information is available at tools.ietf.org/wg/{{ group.acronym }} {% endif %} diff --git a/ietf/secr/templates/proceedings/select.html b/ietf/secr/templates/proceedings/select.html index 355985951..db8d42ff8 100755 --- a/ietf/secr/templates/proceedings/select.html +++ b/ietf/secr/templates/proceedings/select.html @@ -32,7 +32,7 @@ {% endblock %} {% block instructions %} - Instructions + Instructions {% endblock %} {% block content %} @@ -49,7 +49,7 @@
    - To request a session slot for a BOF, please send a message to agenda@ietf.org. Additional information is available at - "Requesting Meeting Slots at IETF Meetings." + "Requesting Meeting Slots at IETF Meetings."
    - To upload meeting materials for a scheduled session, please select the session name below.

    {% csrf_token %} diff --git a/ietf/secr/templates/sreq/edit.html b/ietf/secr/templates/sreq/edit.html index f4432cdfa..1c80339fd 100755 --- a/ietf/secr/templates/sreq/edit.html +++ b/ietf/secr/templates/sreq/edit.html @@ -17,7 +17,7 @@ {% endblock %} {% block instructions %} - Instructions + Instructions {% endblock %} {% block content %} diff --git a/ietf/secr/templates/sreq/locked.html b/ietf/secr/templates/sreq/locked.html index 1fae9e1ad..4c9331a4a 100755 --- a/ietf/secr/templates/sreq/locked.html +++ b/ietf/secr/templates/sreq/locked.html @@ -11,7 +11,7 @@ {% endblock %} {% block content %} -

    » View list of timeslot requests

    +

    » View list of timeslot requests

    Sessions - Status

    diff --git a/ietf/secr/templates/sreq/main.1_2 b/ietf/secr/templates/sreq/main.1_2 index 0b9769c2d..dfde13cd1 100755 --- a/ietf/secr/templates/sreq/main.1_2 +++ b/ietf/secr/templates/sreq/main.1_2 @@ -10,7 +10,7 @@ » Sessions {% endblock %} {% block instructions %} - Instructions + Instructions {% endblock %} {% block content %} diff --git a/ietf/secr/templates/sreq/main.html b/ietf/secr/templates/sreq/main.html index e095c2cb8..8e4f328f8 100755 --- a/ietf/secr/templates/sreq/main.html +++ b/ietf/secr/templates/sreq/main.html @@ -10,7 +10,7 @@ » Sessions {% endblock %} {% block instructions %} - Instructions + Instructions {% endblock %} {% block content %} diff --git a/ietf/secr/templates/sreq/new.html b/ietf/secr/templates/sreq/new.html index 24ca758c2..c7af96eb0 100755 --- a/ietf/secr/templates/sreq/new.html +++ b/ietf/secr/templates/sreq/new.html @@ -16,7 +16,7 @@ {% endblock %} {% block instructions %} - Instructions + Instructions {% endblock %} {% block content %} diff --git a/ietf/secr/templates/sreq/view.html b/ietf/secr/templates/sreq/view.html index 4c4fdf97b..eb623741a 100644 --- a/ietf/secr/templates/sreq/view.html +++ b/ietf/secr/templates/sreq/view.html @@ -12,7 +12,7 @@ {% endblock %} {% block instructions %} - Instructions + Instructions {% endblock %} {% block content %}