Merged in [17493] from mahoney@nostrum.com:

    Changed awkward IESG/IAB Nominating Committee names to just NomCom, updated a ref. Fixes ietf-tools#2860.
 - Legacy-Id: 17515
Note: SVN reference [17493] has been migrated to Git commit cf98a64

Author: levkowetz

ietf/nomcom/factories.py

@@ -1,4 +1,4 @@
-# Copyright The IETF Trust 2015-2019, All Rights Reserved
+# Copyright The IETF Trust 2015-2020, All Rights Reserved
 # -*- coding: utf-8 -*-
 
 
@@ -77,7 +77,7 @@ def nomcom_kwargs_for_year(year=None, *args, **kwargs):
     if 'group__acronym' not in kwargs:
         kwargs['group__acronym'] = 'nomcom%d'%year
     if 'group__name' not in kwargs:
-        kwargs['group__name'] = 'TEST VERSION of IAB/IESG Nominating Committee %d/%d'%(year,year+1)
+        kwargs['group__name'] = 'TEST VERSION of NomCom %d/%d'%(year,year+1)
     return kwargs
 
 

ietf/templates/nomcom/announcements.html

@@ -1,5 +1,5 @@
 {% extends "base.html" %}
-{# Copyright The IETF Trust 2015, All Rights Reserved #}
+{# Copyright The IETF Trust 2015-2020, All Rights Reserved #}
 {% load origin %}
 {% load ietf_filters staticfiles %}
 
@@ -9,15 +9,15 @@
 
 {% block bodyAttrs %}data-spy="scroll" data-target="#affix"{% endblock %}
 
-{% block title %}IAB/IESG Nominating Committee{% endblock %}
+{% block title %}NomCom{% endblock %}
 
 {% block content %}
   {% origin %}
   <div class="row">
     <div class="col-md-10">
 
 
-      <h1>IAB/IESG Nominating Committee</h1>
+      <h1>NomCom</h1>
 
       <p>
 	<b>Current committee chair:</b>
@@ -56,15 +56,15 @@ <h2 class="anchor-target" id="{{ regime.group.start_year }}">Messages from {{ re
 
       <h2 class="anchor-target" id="historical">Historical information</h2>
       <ul>
-	<li><a href="https://www.ietf.org/nomcom/committee.html">IAB/IESG Nominating Committee Members (by year)</a></li>
+	<li><a href="https://www.ietf.org/nomcom/committee.html">NomCom Members (by year)</a></li>
       </ul>
 
 
       <h2 class="anchor-target" id="references">References</h2>
       <ul>
-	<li><a href="https://www.ietf.org/rfc/rfc2026.txt">The Internet Standards Process (RFC 2026)</a></li>
-	<li><a href="https://www.ietf.org/rfc/rfc3777.txt">IAB and IESG Selection, Confirmation, and Recall Process: Operation of the Nominating and Recall </a>Committees (RFC 3777) (Also BCP10)
-	  <li><a href="https://www.ietf.org/rfc/rfc3797.txt">Publicly Verifiable Nominations Committee (NomCom) Random Selection (RFC 3797)</a></li>
+	<li><a href="https://datatracker.ietf.org/doc/rfc2026/">The Internet Standards Process (RFC 2026)</a></li>
+	<li><a href="https://datatracker.ietf.org/doc/rfc8713/">IAB, IESG, IETF Trust, and IETF LLC Selection, Confirmation, and Recall Process: Operation of the IETF Nominating and Recall Committees (RFC 8713) (Also BCP10)
+        <li><a href="https://datatracker.ietf.org/doc/rfc3797/">Publicly Verifiable Nominations Committee (NomCom) Random Selection (RFC 3797)</a></li>
       </ul>
 
 

ietf/templates/nomcom/index.html

@@ -1,17 +1,17 @@
 {% extends "base.html" %}
-{# Copyright The IETF Trust 2015, All Rights Reserved #}
+{# Copyright The IETF Trust 2015-2020, All Rights Reserved #}
 {% load origin %}
 {% load ietf_filters staticfiles %}
 
 {% block pagehead %}
 <link rel="stylesheet" href="{% static "jquery.tablesorter/css/theme.bootstrap.min.css" %}">
 {% endblock %}
 
-{% block title %}IAB/IESG NomComs{% endblock %}
+{% block title %}NomComs{% endblock %}
 
 {% block content %}
   {% origin %}
-  <h1>IAB/IESG NomComs</h1>
+  <h1>NomComs</h1>
 
   <table class="table table-condensed table-striped tablesorter">
     <thead>
@@ -49,4 +49,4 @@ <h1>IAB/IESG NomComs</h1>
 
 {% block js %}
 <script src="{% static "jquery.tablesorter/js/jquery.tablesorter.combined.min.js" %}"></script>
-{% endblock %}
+{% endblock %}