pllim · Jul 1, 2024 · Mar 26, 2024 · Apr 20, 2024 · Apr 20, 2024 · Apr 20, 2024
diff --git a/docs/changes/16561.other.rst b/docs/changes/16561.other.rst
@@ -0,0 +1,4 @@
+The Contributor documentation has been significantly improved. It now includes a
+Quickstart Guide with concise instructions on setting up a development environment and
+making a pull request. In addition, the developer documentation was reorganized and
+simplified where possible to improve readability and accessibility.
diff --git a/docs/conf.py b/docs/conf.py
@@ -376,7 +376,7 @@ def rstjinja(app, docname, source):
     # Make sure we're outputting HTML
     if app.builder.format != "html":
         return
-    files_to_render = ["index_dev", "install"]
+    files_to_render = ["development/index", "install"]
     if docname in files_to_render:
         logger.info("Jinja rendering %s", docname)
         rendered = app.builder.templates.render_string(

diff --git a/.../development/workflow/branch_dropdown.png → docs/development/branch_dropdown.png b/.../development/workflow/branch_dropdown.png → docs/development/branch_dropdown.png
diff --git a/docs/development/building.rst b/docs/development/building.rst
diff --git a/docs/development/codeguide.rst b/docs/development/codeguide.rst
@@ -17,7 +17,7 @@ Interface and Dependencies
   <https://github.com/astropy/astropy/blob/main/pyproject.toml>`_ file of the
   core package.
 
-* Usage of ``six``, ``__future__``, and ``2to3`` is no longer acceptable.
+* Usage of ``six`` and ``2to3`` is no longer acceptable.
 
 * `f-strings <https://docs.python.org/3/reference/lexical_analysis.html#f-strings>`_
   should be used when possible, and if not, Python 3
@@ -188,8 +188,6 @@ Coding Style/Conventions
 
   .. note:: There are multiple options for testing PEP8 compliance of code,
             see :doc:`testguide` for more information.
-            See :doc:`codeguide_emacs` for some configuration options for Emacs
-            that helps in ensuring conformance to PEP8.
 
 * ``astropy`` source code should contain a comment at the beginning of the file
   pointing to the license for the ``astropy`` source code.  This line should say::
@@ -546,17 +544,6 @@ might read::
 This ensures that ``from submodule import *`` only imports ``foo`` and
 ``AClass``, but not `numpy.array` or `numpy.linspace`.
 
-
-Additional Resources
-====================
-
-Further tips and hints relating to the coding guidelines are included below.
-
-.. toctree::
-    :maxdepth: 1
-
-    codeguide_emacs
-
 .. _Numpy: https://numpy.org/
 .. _Scipy: https://www.scipy.org/
 .. _matplotlib: https://matplotlib.org/

diff --git a/docs/development/codeguide_emacs.rst b/docs/development/codeguide_emacs.rst