Clean up documentation

jazzband · Jul 25, 2024 · 15ed6e5 · 15ed6e5
1 parent 4437d48
commit 15ed6e5
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
@@ -8,9 +8,9 @@ Changelog
   The previous behavior for this was that by default tag items were not ordered. In practice tag items often end up ordered by creation date anyways, just due to how databases work, but this was not a guarantee.
   If you wish to have the old behavior, set ``ordering=[]`` to your ``TaggableManager`` instance.
   We believe that this should not cause a noticable performance change, and the number of queries involved should not change.
+* Added the ability to merge tags via the admin
 * Add Django 5.0 support (no code changes were needed, but now we test this release).
 * Add Python 3.12 support
-* Added functionality for tag merging
 
 5.0.1 (2023-10-26)
 ~~~~~~~~~~~~~~~~~~

diff --git a/docs/admin.rst b/docs/admin.rst
@@ -42,10 +42,9 @@ method to the :class:`~django.contrib.admin.ModelAdmin`, using
 
 
 Merging tags in the admin
-=========================
+~~~~~~~~~~~~~~~~~~~~~~~~~
 
-Functionality has been added to the admin app to allow for tag "merging".
-Really what is happening is a "find and replace" where the selected tags are being used.
+Functionality has been added to the admin app to allow for tag "merging". Multiple tags can be selected, and all of their usages will be replaced by the tag that you choose to use.
 
 To merge your tags follow these steps: