Skip to content

Commit 4298cf0

Browse files
rjsparksrjsparks
committed
Merged in [18995] from rjsparks@nostrum.com:
 Link only to datatracker htmlization. Adjust mail-to-authors and mail-to-list. Fixes ietf-tools#3261. - Legacy-Id: 19005 Note: SVN reference [18995] has been migrated to Git commit 06a4656
1 parent 11551c8 commit 4298cf0

9 files changed

Lines changed: 14 additions & 24 deletions

File tree

‎ietf/doc/templatetags/ietf_filters.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -216,7 +216,7 @@ def rfclink(string):
216216
URL for that RFC.
217217
"""
218218
string = str(string);
219-
return "https://tools.ietf.org/html/rfc" + string;
219+
return "https://datatracker.ietf.org/doc/html/rfc" + string;
220220

221221
@register.filter(name='urlize_ietf_docs', is_safe=True, needs_autoescape=True)
222222
def urlize_ietf_docs(string, autoescape=None):

‎ietf/doc/utils.py‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1033,7 +1033,6 @@ def build_file_urls(doc):
10331033
file_urls.append(("pdf", base + "pdfrfc/" + name + ".txt.pdf"))
10341034

10351035
if "txt" in found_types:
1036-
file_urls.append(("htmlized (tools)", settings.TOOLS_ID_HTML_URL + name))
10371036
file_urls.append(("htmlized", urlreverse('ietf.doc.views_doc.document_html', kwargs=dict(name=name))))
10381037
if doc.tags.filter(slug="verified-errata").exists():
10391038
file_urls.append(("with errata", settings.RFC_EDITOR_INLINE_ERRATA_URL.format(rfc_number=doc.rfc_number())))
@@ -1050,7 +1049,6 @@ def build_file_urls(doc):
10501049

10511050
if "pdf" not in found_types:
10521051
file_urls.append(("pdf", settings.TOOLS_ID_PDF_URL + doc.name + "-" + doc.rev + ".pdf"))
1053-
file_urls.append(("htmlized (tools)", settings.TOOLS_ID_HTML_URL + doc.name + "-" + doc.rev))
10541052
file_urls.append(("htmlized", urlreverse('ietf.doc.views_doc.document_html', kwargs=dict(name=doc.name, rev=doc.rev))))
10551053
file_urls.append(("bibtex", urlreverse('ietf.doc.views_doc.document_main',kwargs=dict(name=doc.name,rev=doc.rev))+"bibtex"))
10561054

‎ietf/templates/api/index.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -330,7 +330,7 @@ <h3 id="signing-keys" class="anchor-target">Signing Keys</h3>
330330
<p>
331331

332332
When sending notifications to other APIs, the datatracker may sign
333-
information with a <a href="https://tools.ietf.org/html/rfc7515">RFC
333+
information with a <a href="https://datatracker.ietf.org/doc/html/rfc7515">RFC
334334
7515: JSON Web Signature (JWS)</a>, using a public/private keypair with
335335
this public key:
336336

‎ietf/templates/help/personal-information.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
<h1>Personal Information in the Datatracker</h1>
1111
<p>
1212

13-
<a href="https://tools.ietf.org/html/rfc3935">RFC 3935, "A Mission Statement for the IETF"</a> lays out
13+
<a href="https://datatracker.ietf.org/doc/html/rfc3935">RFC 3935, "A Mission Statement for the IETF"</a> lays out
1414
the goal and the mission of the IETF as follows:
1515
</p>
1616

‎ietf/templates/submit/announce_to_authors.txt‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,18 +11,14 @@ Group: {{ group }}
1111
Pages: {{ submission.pages }}
1212
URL: {{ settings.IETF_ID_ARCHIVE_URL }}{{ submission.name }}-{{ submission.rev }}.txt
1313
Status: https://datatracker.ietf.org/doc/{{ submission.name }}/{% if submission.xml_version == "3" %}
14-
Html: {{ settings.IETF_ID_ARCHIVE_URL }}{{ submission.name }}-{{ submission.rev }}.html{% else %}
15-
Htmlized: https://datatracker.ietf.org/doc/html/{{ submission.name }}{% endif %}
16-
Htmlized: https://tools.ietf.org/html/{{ submission.name }}-{{ submission.rev }}
14+
Html: {{ settings.IETF_ID_ARCHIVE_URL }}{{ submission.name }}-{{ submission.rev }}.html{% endif %}
15+
Htmlized: https://datatracker.ietf.org/doc/html/{{ submission.name }}
1716
{% if submission.rev != "00" %}Diff: {{rfcdiff_base_url}}?url2={{ submission.name }}-{{ submission.rev }}{% endif %}
1817

1918
Abstract:
2019
{{ submission.abstract }}
2120

2221
{{ submission.note|default:"" }}
2322

24-
Please note that it may take a couple of minutes from the time of submission
25-
until the htmlized version and diff are available at tools.ietf.org.
26-
2723
The IETF Secretariat
2824
{% endautoescape %}

‎ietf/templates/submit/announce_to_lists.txt‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,17 +17,13 @@ https://datatracker.ietf.org/doc/{{ submission.name }}/
1717
{% if submission.xml_version == "3" %}
1818
There is also an HTML version available at:
1919
{{ settings.IETF_ID_ARCHIVE_URL }}{{ submission.name }}-{{ submission.rev }}.html{% else %}
20-
There are also htmlized versions available at:
21-
https://tools.ietf.org/html/{{ submission.name }}-{{ submission.rev }}
20+
There is also an htmlized version available at:
2221
https://datatracker.ietf.org/doc/html/{{ submission.name }}-{{ submission.rev }}{% endif %}
2322
{% if submission.rev != "00" %}
2423
A diff from the previous version is available at:
2524
{{settings.RFCDIFF_BASE_URL}}?url2={{ submission.name }}-{{ submission.rev }}
2625
{% endif %}
2726

28-
Please note that it may take a couple of minutes from the time of submission
29-
until the htmlized version and diff are available at tools.ietf.org.
30-
3127
Internet-Drafts are also available by anonymous FTP at:
3228
ftp://ftp.ietf.org/internet-drafts/
3329
{% endautoescape %}

‎ietf/templates/submit/note_well.html‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -64,30 +64,30 @@ <h2>Note Well</h2>
6464
</p>
6565
<ul>
6666
<li>
67-
<a href="https://tools.ietf.org/html/bcp9">BCP 9</a>
67+
<a href="https://datatracker.ietf.org/doc/html/bcp9">BCP 9</a>
6868
(Internet Standards Process)
6969
</li>
7070
<li>
71-
<a href="https://tools.ietf.org/html/bcp25"> BCP 25 </a>
71+
<a href="https://datatracker.ietf.org/doc/html/bcp25"> BCP 25 </a>
7272
(Working Group processes)
7373

7474
</li>
7575
<li>
76-
<a href="https://tools.ietf.org/html/bcp25"> BCP 25 </a>
76+
<a href="https://datatracker.ietf.org/doc/html/bcp25"> BCP 25 </a>
7777
(Anti-Harassment Procedures)
7878

7979
</li>
8080
<li>
81-
<a href="https://tools.ietf.org/html/bcp54"> BCP 54 </a>
81+
<a href="https://datatracker.ietf.org/doc/html/bcp54"> BCP 54 </a>
8282
(Code of Conduct)
8383

8484
</li>
8585
<li>
86-
<a href="https://tools.ietf.org/html/bcp78"> BCP 78 </a>
86+
<a href="https://datatracker.ietf.org/doc/html/bcp78"> BCP 78 </a>
8787
(Copyright)
8888
</li>
8989
<li>
90-
<a href="https://tools.ietf.org/html/bcp79"> BCP 79 </a>
90+
<a href="https://datatracker.ietf.org/doc/html/bcp79"> BCP 79 </a>
9191
(Patents, Participation)
9292

9393
</li>

‎ietf/templates/submit/submission_status.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ <h2>Submission checks</h2>
4949
under normal circumstances.</b> If you plan to request publication as an RFC, this
5050
will require additional consideration by the stream manager (for example, the
5151
IESG), and publication may be declined unless sufficient justification is
52-
provided. See <a href="https://tools.ietf.org/html/rfc7322#section-4.1.1">
52+
provided. See <a href="https://datatracker.ietf.org/doc/html/rfc7322#section-4.1.1">
5353
RFC 7322, section 4.1.1</a> for details.</p>
5454
{% endif %}
5555

‎ietf/templates/utils/wiki/InterMapTxt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ trac-dev http://thread.gmane.org/gmane.comp.version-control.subversion.trac.deve
4444

4545
Mercurial http://www.selenic.com/mercurial/wiki/index.cgi/ # the wiki for the Mercurial distributed SCM
4646

47-
RFC http://tools.ietf.org/html/rfc$1.html # IETF's RFC $1
47+
RFC http://datatracker.ietf.org/doc/html/rfc$1.html # IETF's RFC $1
4848
DataTracker https://datatracker.ietf.org/doc/
4949
dt https://datatracker.ietf.org/doc/
5050

0 commit comments

Comments
 (0)