updating docs and CHANGELOG

jazzband · Jul 14, 2024 · 1641737 · 1641737
1 parent 49e99ad
commit 1641737
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 0 deletions.
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
@@ -10,6 +10,7 @@ Changelog
   We believe that this should not cause a noticable performance change, and the number of queries involved should not change.
 * 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
@@ -39,3 +39,19 @@ method to the :class:`~django.contrib.admin.ModelAdmin`, using
 
         def tag_list(self, obj):
             return u", ".join(o.name for o in obj.tags.all())
+
+
+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.
+
+To merge your tags follow these steps:
+
+1. Navigate to the Tags page inside of the Taggit app
+2. Select the tags that you want to merge
+3. Use the dropdown action list and select `Merge selected tags` and then click `Go`
+4. This will redirect you onto a new page where you can insert the new tag name.
+5. Click `Merge Tags`
+6. This will redirect you back to the tag list