fixup! Hyphenate versioning admonitions

Author: stephenfin

sphinx/builders/changes.py

@@ -44,13 +44,12 @@ def get_outdated_docs(self) -> str:
 
     typemap = {
         'version-added': 'added',
-        'version-changed': 'changed',
-        'version-deprecated': 'deprecated',
-        'version-removed': 'removed',
-        # deprecated aliases
         'versionadded': 'added',
+        'version-changed': 'changed',
         'versionchanged': 'changed',
+        'version-deprecated': 'deprecated',
         'deprecated': 'deprecated',
+        'version-removed': 'removed',
         'versionremoved': 'removed',
     }
 
@@ -118,13 +117,12 @@ def write_documents(self, _docnames: Set[str]) -> None:
 
         hltext = [
             f'.. version-added:: {version}',
-            f'.. version-changed:: {version}',
-            f'.. version-deprecated:: {version}',
-            f'.. version-removed:: {version}',
-            # deprecated alises
             f'.. versionadded:: {version}',
+            f'.. version-changed:: {version}',
             f'.. versionchanged:: {version}',
+            f'.. version-deprecated:: {version}',
             f'.. deprecated:: {version}',
+            f'.. version-removed:: {version}',
             f'.. versionremoved:: {version}',
         ]
 

sphinx/domains/changeset.py

@@ -175,13 +175,13 @@ def get_changesets_for(self, version: str) -> list[ChangeSet]:
 
 def setup(app: Sphinx) -> ExtensionMetadata:
     app.add_domain(ChangeSetDomain)
-    app.add_directive('version-added', VersionChange)
-    app.add_directive('version-changed', VersionChange)
     app.add_directive('version-deprecated', VersionChange)
-    app.add_directive('version-removed', VersionChange)
     app.add_directive('deprecated', VersionChange)
+    app.add_directive('version-added', VersionChange)
     app.add_directive('versionadded', VersionChange)
+    app.add_directive('version-changed', VersionChange)
     app.add_directive('versionchanged', VersionChange)
+    app.add_directive('version-removed', VersionChange)
     app.add_directive('versionremoved', VersionChange)
 
     return {