From 51440fbc37ac89b46c386642732123a2c3a39ebb Mon Sep 17 00:00:00 2001
From: Go MAEDA <maeda@farend.jp>
Date: Sun, 5 Apr 2026 00:39:53 +0000
Subject: [PATCH] Merged r24555 from trunk to 6.1-stable (#43920).

git-svn-id: https://svn.redmine.org/redmine/branches/6.1-stable@24558 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 .../wiki_syntax_detailed_common_mark.html.erb | 48 +++++++++++++++++++
 .../wiki_syntax_detailed_common_mark.html.erb | 48 +++++++++++++++++++
 2 files changed, 96 insertions(+)

diff --git a/app/views/help/wiki_syntax/common_mark/de/wiki_syntax_detailed_common_mark.html.erb b/app/views/help/wiki_syntax/common_mark/de/wiki_syntax_detailed_common_mark.html.erb
index a182e8c79..bb875af7b 100644
--- a/app/views/help/wiki_syntax/common_mark/de/wiki_syntax_detailed_common_mark.html.erb
+++ b/app/views/help/wiki_syntax/common_mark/de/wiki_syntax_detailed_common_mark.html.erb
@@ -27,6 +27,7 @@
         <li><a href='#12'>Makros</a></li>
         <li><a href='#13'>Hervorgehobener Programmcode</a></li>
         <li><a href='#15'>Roh HTML</a></li>
+        <li><a href='#16'>Alerts</a></li>
     </ul>
 
     <h2><a name="2" class="wiki-page"></a>Links</h2>
@@ -368,5 +369,52 @@ Es kann durch Klicken auf einen Link erweitert werden.
 <tr><td align="center" colspan="2">bar</td></tr>
 </table>
 
+    <h2><a name="16" class="wiki-page"></a>Alerts</h2>
+
+    <p>
+    <dl>
+      <dt><code>NOTE</code></dt>
+      <dd>
+        <pre><code>> [!NOTE]<br>> Wiki page edits are preserved as history, allowing you to restore previous versions if needed.</code></pre>
+        <div class="markdown-alert markdown-alert-note">
+        <p class="markdown-alert-title">Note</p>
+        <p>Wiki page edits are preserved as history, allowing you to restore previous versions if needed.</p>
+        </div>
+      </dd>
+      <dt><code>TIP</code></dt>
+      <dd>
+      <pre><code>> [!TIP]<br>> To quickly review the update history of an issue, use the "History" tab for convenient access.</code></pre>
+      <div class="markdown-alert markdown-alert-tip">
+          <p class="markdown-alert-title">Tip</p>
+          <p>To quickly review the update history of an issue, use the "History" tab for convenient access.</p>
+      </div>
+      </dd>
+      <dt><code>IMPORTANT</code></dt>
+      <dd>
+      <pre><code>> [!IMPORTANT]<br>> Changing role permissions can affect user access across all projects, so be mindful of potential impacts.</code></pre>
+      <div class="markdown-alert markdown-alert-important">
+          <p class="markdown-alert-title">Important</p>
+          <p>Changing role permissions can affect user access across all projects, so be mindful of potential impacts.</p>
+      </div>
+      </dd>
+      <dt><code>CAUTION</code></dt>
+      <dd>
+      <pre><code>> [!CAUTION]<br>> When installing plugins, make sure to verify compatibility. Version differences can cause unexpected behavior.</code></pre>
+      <div class="markdown-alert markdown-alert-caution">
+          <p class="markdown-alert-title">Caution</p>
+          <p>When installing plugins, make sure to verify compatibility. Version differences can cause unexpected behavior.</p>
+      </div>
+      </dd>
+      <dt><code>WARNING</code></dt>
+      <dd>
+      <pre><code>> [!WARNING]<br>> Deleting an issue is a permanent action. Be certain it is truly necessary before proceeding.</code></pre>
+      <div class="markdown-alert markdown-alert-warning">
+          <p class="markdown-alert-title">Warning</p>
+          <p>Deleting an issue is a permanent action. Be certain it is truly necessary before proceeding.</p>
+      </div>
+      </dd>
+    </dl>
+    </p>
+
 </body>
 </html>
diff --git a/app/views/help/wiki_syntax/common_mark/ta-in/wiki_syntax_detailed_common_mark.html.erb b/app/views/help/wiki_syntax/common_mark/ta-in/wiki_syntax_detailed_common_mark.html.erb
index a39cb821c..8bfee1d21 100644
--- a/app/views/help/wiki_syntax/common_mark/ta-in/wiki_syntax_detailed_common_mark.html.erb
+++ b/app/views/help/wiki_syntax/common_mark/ta-in/wiki_syntax_detailed_common_mark.html.erb
@@ -27,6 +27,7 @@
   <li><a href='#12'>குறுநிரல்கள்</a></li>
   <li><a href='#13'>சிறப்பம்ச குறியீடு</a></li>
   <li><a href='#15'>Raw HTML</a></li>
+  <li><a href='#16'>Alerts</a></li>
 </ul>
 
 <h2><a name="2" class="wiki-page"></a>இணைப்புகள்</h2>
@@ -377,5 +378,52 @@ https://www.redmine.org, someone@foo.bar
   மிதவை
 </code></pre>
 
+    <h2><a name="16" class="wiki-page"></a>Alerts</h2>
+
+    <p>
+    <dl>
+      <dt><code>NOTE</code></dt>
+      <dd>
+        <pre><code>> [!NOTE]<br>> Wiki page edits are preserved as history, allowing you to restore previous versions if needed.</code></pre>
+        <div class="markdown-alert markdown-alert-note">
+        <p class="markdown-alert-title">Note</p>
+        <p>Wiki page edits are preserved as history, allowing you to restore previous versions if needed.</p>
+        </div>
+      </dd>
+      <dt><code>TIP</code></dt>
+      <dd>
+      <pre><code>> [!TIP]<br>> To quickly review the update history of an issue, use the "History" tab for convenient access.</code></pre>
+      <div class="markdown-alert markdown-alert-tip">
+          <p class="markdown-alert-title">Tip</p>
+          <p>To quickly review the update history of an issue, use the "History" tab for convenient access.</p>
+      </div>
+      </dd>
+      <dt><code>IMPORTANT</code></dt>
+      <dd>
+      <pre><code>> [!IMPORTANT]<br>> Changing role permissions can affect user access across all projects, so be mindful of potential impacts.</code></pre>
+      <div class="markdown-alert markdown-alert-important">
+          <p class="markdown-alert-title">Important</p>
+          <p>Changing role permissions can affect user access across all projects, so be mindful of potential impacts.</p>
+      </div>
+      </dd>
+      <dt><code>CAUTION</code></dt>
+      <dd>
+      <pre><code>> [!CAUTION]<br>> When installing plugins, make sure to verify compatibility. Version differences can cause unexpected behavior.</code></pre>
+      <div class="markdown-alert markdown-alert-caution">
+          <p class="markdown-alert-title">Caution</p>
+          <p>When installing plugins, make sure to verify compatibility. Version differences can cause unexpected behavior.</p>
+      </div>
+      </dd>
+      <dt><code>WARNING</code></dt>
+      <dd>
+      <pre><code>> [!WARNING]<br>> Deleting an issue is a permanent action. Be certain it is truly necessary before proceeding.</code></pre>
+      <div class="markdown-alert markdown-alert-warning">
+          <p class="markdown-alert-title">Warning</p>
+          <p>Deleting an issue is a permanent action. Be certain it is truly necessary before proceeding.</p>
+      </div>
+      </dd>
+    </dl>
+    </p>
+
 </body>
 </html>