gh-150693: Combine docs sections for external resources (#150694)

diff --git a/Doc/tools/templates/indexcontent.html b/Doc/tools/templates/indexcontent.html
index 4982bcbfe3673c1b9cd7e4683e60d3bf54683ce7..4366da69d1b2d09987e26f073cf9777ab9b3d042 100644 (file)
--- a/Doc/tools/templates/indexcontent.html
+++ b/Doc/tools/templates/indexcontent.html
@@ -82,10 +82,16 @@
   <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 086f15662cf87be6748a238e27b0c895fc355917..5e7f03cd024ef7fc85f9308d5b189ecf2e0c1836 100644 (file)
--- a/Doc/tools/templates/indexsidebar.html
+++ b/Doc/tools/templates/indexsidebar.html
@@ -6,12 +6,3 @@
   {% 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>