From aafc24a873a58c8a2a37719045bfbe286b51aa57 Mon Sep 17 00:00:00 2001
From: RogerHaase <haaserd@gmail.com>
Date: Wed, 21 Feb 2024 08:29:23 -0700
Subject: [PATCH 1/2] add admonition classes defined in common.css but not in
 moinwiki.rst

---
 docs/user/moinwiki.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/user/moinwiki.rst b/docs/user/moinwiki.rst
index 6bcf32504..a965102b6 100644
--- a/docs/user/moinwiki.rst
+++ b/docs/user/moinwiki.rst
@@ -713,7 +713,7 @@ CSS classes for use with the wiki parser, tables, comments, and links
  - Background colors: red, green, blue, yellow, or orange
  - Borders: solid, dashed, or dotted
  - Text-alignment: left, center, right, or justify
- - Admonitions: caution, important, note, tip, warning
+ - Admonitions: attention, caution, danger, error, hint, important, note, tip, warning
  - Tables: moin-sortable, no-borders
  - Comments: comment
  - Position parsers and tables: float-left, float-right, inline, middle, clear-right, clear-left or clear-both

From b71ada8721f3ab4aff227f0296691789a745e999 Mon Sep 17 00:00:00 2001
From: RogerHaase <haaserd@gmail.com>
Date: Wed, 21 Feb 2024 08:54:28 -0700
Subject: [PATCH 2/2] add docs for new ShowUserGroup and ShowWikiDict macros;
 #1595

---
 docs/user/moinwiki.rst | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/docs/user/moinwiki.rst b/docs/user/moinwiki.rst
index a965102b6..ae900444d 100644
--- a/docs/user/moinwiki.rst
+++ b/docs/user/moinwiki.rst
@@ -822,6 +822,10 @@ extra features. The following is a table of MoinMoin's macros.
 +-------------------------------------------+------------------------------------------------------------+
 | ``<<ShowSmileys()>>``                     | Displays available smileys and the corresponding markup    |
 +-------------------------------------------+------------------------------------------------------------+
+| ``<<ShowUserGroup()>>``                   | Displays metadata defined in usergroup attribute           |
++-------------------------------------------+------------------------------------------------------------+
+| ``<<ShowWikiDict()>>``                    | Displays metadata defined in wikidict attribute            |
++-------------------------------------------+------------------------------------------------------------+
 | ``<<TableOfContents(2)>>``                | Shows a table of contents up to level 2                    |
 +-------------------------------------------+------------------------------------------------------------+
 | ``<<TitleIndex()>>``                      | Lists all itemnames for the namespace of the current item, |