Merge pull request #97 from pllim/ape-proposal-number-fifo

APE 1: Number is gone once reserved (naming chaos fix 2)

APE1.rst

@@ -5,15 +5,18 @@ author: Perry Greenfield
 
 date-created: 2013 October 11
 
-date-last-revised: 2021 February 26
+date-last-revised: 2024 February 5
 
 date-accepted: 2013 November 8
 
 type: Process
 
 status: Accepted
 
-revised-by: Lia Corrales, Thomas Robitaille, Erik Tollerud - 2021 February 26 - Added APE modification process
+revised-by:
+
+* Lia Corrales, Thomas Robitaille, Erik Tollerud - 2021 February 26 - Added APE modification process
+* Pey Lian Lim - 2024 February 5 - Added APE numbering process
 
 Abstract
 --------
@@ -84,7 +87,8 @@ doing this.
 
 Following a discussion on astropy-dev, the proposal should be submitted as a
 pull request to astropy-APEs with the name APE<n>.rst where <n> is an
-appropriately assigned number. The draft must use the APEtemplate.rst file.
+appropriately assigned number (i.e., not already an accepted/proposed/rejected APE).
+The draft must use the APEtemplate.rst file.
 That a formal proposal has been submitted as a PR should be announced to the
 astropy-dev list.
 
@@ -191,4 +195,5 @@ The coordinating committee thought it was a honking great idea.
 Previous versions of this APE
 -----------------------------
 
-* 2013-11-08 [`DOI <http://doi.org/10.5281/zenodo.1043886>`_] [`GitHub <https://github.com/astropy/astropy-APEs/blob/42951733ac42c0ea178d8df30705274a43c93091/APE1.rst>`_]
+* 2013-11-08 [`DOI <http://doi.org/10.5281/zenodo.1043886>`_] [`GitHub <https://github.com/astropy/astropy-APEs/blob/42951733ac42c0ea178d8df30705274a43c93091/APE1.rst>`_]
+* 2021-03-09 [`GitHub <https://github.com/astropy/astropy-APEs/commit/f2afc2ec72575d3c592b3a5c6257117b07b5b755>`_]

README.rst

@@ -148,7 +148,7 @@ Finalizing APEs
 ^^^^^^^^^^^^^^^
 
 The final decision on accepting or rejecting APEs lies with the Astropy
-Coordination Committee.  Once the community discussion on the APE has wound
+Coordination Committee (CoCo).  Once the community discussion on the APE has wound
 down, the committee discusses the APE and makes a final decision on acceptance
 or rejection.  One of the committee members should then:
 
@@ -158,7 +158,7 @@ or rejection.  One of the committee members should then:
 #. Update the "date-last-revised" to the day of merging and "status" to
    "Accepted" or "Rejected".
 #. If necessary, rename the APE file to be ``APE##.rst``, where ## is the next
-   free number on the list of APEs.
+   free number on the list of APEs. Only do this if there is a conflict.
 #. Leave a brief comment in the PR indicating the result.
 #. Merge the PR with the above changes.
 #. If the APE was accepted then continue with the remaining steps, otherwise 
@@ -198,7 +198,7 @@ or rejection.  One of the committee members should then:
 Updating APEs
 ^^^^^^^^^^^^^
 
-In the cases where an updated APE requires updating (e.g. references to a  new
+In the cases where an updated APE requires updating (e.g., references to a new
 APE that supercedes it, clarifying information that emerges after the APE is
 accepted, etc.), changes can be made directly via PR, but the
 "date-last-revised" should be updated in the APE. Additionally, the Zenodo entry