https://github.com/python/cpython/commit/6e0fe1ad49e970d6a4e47a40e4f7d602da2146ab
commit: 6e0fe1ad49e970d6a4e47a40e4f7d602da2146ab
branch: 3.14
author: Miss Islington (bot) <[email protected]>
committer: hugovk <[email protected]>
date: 2026-08-06T12:20:34Z
summary:

[3.14] gh-150693: Combine docs sections for external resources (GH-150694) 
(#155275)

Co-authored-by: Mia Albert <[email protected]>

files:
M Doc/tools/templates/indexcontent.html
M Doc/tools/templates/indexsidebar.html

diff --git a/Doc/tools/templates/indexcontent.html 
b/Doc/tools/templates/indexcontent.html
index 4982bcbfe3673c1..4366da69d1b2d09 100644
--- a/Doc/tools/templates/indexcontent.html
+++ b/Doc/tools/templates/indexcontent.html
@@ -82,10 +82,16 @@ <h1>{{ docstitle|e }}</h1>
   <p><strong>{% trans %}Other resources:{% endtrans %}</strong></p>
   <div class="contentstable">
     <ul>
+      <li class="biglink"><a class="biglink" 
href="https://devguide.python.org";>{% trans %}Python developer's guide{% 
endtrans %}</a><br>
+         <span class="linkdescr">{% trans %}Information on contributing to 
Python{% endtrans %}</span></li>
       <li class="biglink"><a class="biglink" 
href="https://packaging.python.org";>{% trans %}Python Packaging User Guide{% 
endtrans %}</a><br>
          <span class="linkdescr">{% trans %}Resources relating to Python 
packaging{% endtrans %}</span></li>
+      <li class="biglink"><a class="biglink" 
href="https://www.python.org/doc/av/";>{% trans %}Audio/visual talks{% endtrans 
%}</a><br>
+         <span class="linkdescr">{% trans %}Podcasts, talks, and video 
presentations from the community{% endtrans %}</span></li>
     </ul>
     <ul>
+      <li class="biglink"><a class="biglink" 
href="https://peps.python.org/";>{% trans %}Python Enhancement Proposals{% 
endtrans %}</a><br>
+         <span class="linkdescr">{% trans %}Index of proposed improvements to 
Python{% endtrans %}</span></li>
       <li class="biglink"><a class="biglink" 
href="https://typing.python.org";>{% trans %}Static Typing with Python{% 
endtrans %}</a><br>
          <span class="linkdescr">{% trans %}Information and guides about 
Python type safety{% endtrans %}</span></li>
     </ul>
diff --git a/Doc/tools/templates/indexsidebar.html 
b/Doc/tools/templates/indexsidebar.html
index 086f15662cf87be..5e7f03cd024ef7f 100644
--- a/Doc/tools/templates/indexsidebar.html
+++ b/Doc/tools/templates/indexsidebar.html
@@ -6,12 +6,3 @@ <h3>{% trans %}Docs by version{% endtrans %}</h3>
   {% include "_docs_by_version.html" without context %}
   <li><a href="https://www.python.org/doc/versions/";>{% trans %}All versions{% 
endtrans %}</a></li>
 </ul>
-<h3>{% trans %}Other resources{% endtrans %}</h3>
-<ul>
-  {# XXX: many of these should probably be merged in the main docs #}
-  <li><a href="https://peps.python.org/";>{% trans %}PEP index{% endtrans 
%}</a></li>
-  <li><a href="https://wiki.python.org/moin/BeginnersGuide";>{% trans 
%}Beginner's guide{% endtrans %}</a></li>
-  <li><a href="https://wiki.python.org/moin/PythonBooks";>{% trans %}Book 
list{% endtrans %}</a></li>
-  <li><a href="https://www.python.org/doc/av/";>{% trans %}Audio/visual talks{% 
endtrans %}</a></li>
-  <li><a href="https://devguide.python.org/";>{% trans %}Python developer’s 
guide{% endtrans %}</a></li>
-</ul>

_______________________________________________
Python-checkins mailing list -- [email protected]
To unsubscribe send an email to [email protected]
https://mail.python.org/mailman3//lists/python-checkins.python.org
Member address: [email protected]

Reply via email to