Merged r12302 from trunk to 2.4-stable (#15391, #15401)

Fix wiki syntax "bold italic".

Contributed by Karel Pičman.

git-svn-id: http://svn.redmine.org/redmine/branches/2.4-stable@12307 e93f8b46-1217-0410-a6f0-8f06a7374b81

diff --git a/public/help/ar/wiki_syntax_detailed.html b/public/help/ar/wiki_syntax_detailed.html
index 2ddd2fdf5543e34e54670ff2636725355a8afb94..0da31866b20afff58db89a7030fa57393be10bbc 100644 (file)
--- a/public/help/ar/wiki_syntax_detailed.html
+++ b/public/help/ar/wiki_syntax_detailed.html
@@ -186,7 +186,7 @@ http://www.redmine.org, someone@foo.bar
         <ul>
             <li><strong>bold</strong></li>
             <li><em>italic</em></li>
-            <li><em>*bold italic*</em></li>
+            <li><em><strong>bold italic</strong></em></li>
             <li><ins>underline</ins></li>
             <li><del>strike-through</del></li>
         </ul>

diff --git a/public/help/az/wiki_syntax_detailed.html b/public/help/az/wiki_syntax_detailed.html
index 2ddd2fdf5543e34e54670ff2636725355a8afb94..0da31866b20afff58db89a7030fa57393be10bbc 100644 (file)
--- a/public/help/az/wiki_syntax_detailed.html
+++ b/public/help/az/wiki_syntax_detailed.html
@@ -186,7 +186,7 @@ http://www.redmine.org, someone@foo.bar
         <ul>
             <li><strong>bold</strong></li>
             <li><em>italic</em></li>
-            <li><em>*bold italic*</em></li>
+            <li><em><strong>bold italic</strong></em></li>
             <li><ins>underline</ins></li>
             <li><del>strike-through</del></li>
         </ul>

diff --git a/public/help/bg/wiki_syntax_detailed.html b/public/help/bg/wiki_syntax_detailed.html
index 2ddd2fdf5543e34e54670ff2636725355a8afb94..0da31866b20afff58db89a7030fa57393be10bbc 100644 (file)
--- a/public/help/bg/wiki_syntax_detailed.html
+++ b/public/help/bg/wiki_syntax_detailed.html
@@ -186,7 +186,7 @@ http://www.redmine.org, someone@foo.bar
         <ul>
             <li><strong>bold</strong></li>
             <li><em>italic</em></li>
-            <li><em>*bold italic*</em></li>
+            <li><em><strong>bold italic</strong></em></li>
             <li><ins>underline</ins></li>
             <li><del>strike-through</del></li>
         </ul>

diff --git a/public/help/bs/wiki_syntax_detailed.html b/public/help/bs/wiki_syntax_detailed.html
index 2ddd2fdf5543e34e54670ff2636725355a8afb94..0da31866b20afff58db89a7030fa57393be10bbc 100644 (file)
--- a/public/help/bs/wiki_syntax_detailed.html
+++ b/public/help/bs/wiki_syntax_detailed.html
@@ -186,7 +186,7 @@ http://www.redmine.org, someone@foo.bar
         <ul>
             <li><strong>bold</strong></li>
             <li><em>italic</em></li>
-            <li><em>*bold italic*</em></li>
+            <li><em><strong>bold italic</strong></em></li>
             <li><ins>underline</ins></li>
             <li><del>strike-through</del></li>
         </ul>

diff --git a/public/help/ca/wiki_syntax_detailed.html b/public/help/ca/wiki_syntax_detailed.html
index 2ddd2fdf5543e34e54670ff2636725355a8afb94..0da31866b20afff58db89a7030fa57393be10bbc 100644 (file)
--- a/public/help/ca/wiki_syntax_detailed.html
+++ b/public/help/ca/wiki_syntax_detailed.html
@@ -186,7 +186,7 @@ http://www.redmine.org, someone@foo.bar
         <ul>
             <li><strong>bold</strong></li>
             <li><em>italic</em></li>
-            <li><em>*bold italic*</em></li>
+            <li><em><strong>bold italic</strong></em></li>
             <li><ins>underline</ins></li>
             <li><del>strike-through</del></li>
         </ul>

diff --git a/public/help/da/wiki_syntax_detailed.html b/public/help/da/wiki_syntax_detailed.html
index 2ddd2fdf5543e34e54670ff2636725355a8afb94..0da31866b20afff58db89a7030fa57393be10bbc 100644 (file)
--- a/public/help/da/wiki_syntax_detailed.html
+++ b/public/help/da/wiki_syntax_detailed.html
@@ -186,7 +186,7 @@ http://www.redmine.org, someone@foo.bar
         <ul>
             <li><strong>bold</strong></li>
             <li><em>italic</em></li>
-            <li><em>*bold italic*</em></li>
+            <li><em><strong>bold italic</strong></em></li>
             <li><ins>underline</ins></li>
             <li><del>strike-through</del></li>
         </ul>

diff --git a/public/help/de/wiki_syntax_detailed.html b/public/help/de/wiki_syntax_detailed.html
index 2ddd2fdf5543e34e54670ff2636725355a8afb94..0da31866b20afff58db89a7030fa57393be10bbc 100644 (file)
--- a/public/help/de/wiki_syntax_detailed.html
+++ b/public/help/de/wiki_syntax_detailed.html
@@ -186,7 +186,7 @@ http://www.redmine.org, someone@foo.bar
         <ul>
             <li><strong>bold</strong></li>
             <li><em>italic</em></li>
-            <li><em>*bold italic*</em></li>
+            <li><em><strong>bold italic</strong></em></li>
             <li><ins>underline</ins></li>
             <li><del>strike-through</del></li>
         </ul>

diff --git a/public/help/el/wiki_syntax_detailed.html b/public/help/el/wiki_syntax_detailed.html
index 2ddd2fdf5543e34e54670ff2636725355a8afb94..0da31866b20afff58db89a7030fa57393be10bbc 100644 (file)
--- a/public/help/el/wiki_syntax_detailed.html
+++ b/public/help/el/wiki_syntax_detailed.html
@@ -186,7 +186,7 @@ http://www.redmine.org, someone@foo.bar
         <ul>
             <li><strong>bold</strong></li>
             <li><em>italic</em></li>
-            <li><em>*bold italic*</em></li>
+            <li><em><strong>bold italic</strong></em></li>
             <li><ins>underline</ins></li>
             <li><del>strike-through</del></li>
         </ul>

diff --git a/public/help/en-gb/wiki_syntax_detailed.html b/public/help/en-gb/wiki_syntax_detailed.html
index 2ddd2fdf5543e34e54670ff2636725355a8afb94..0da31866b20afff58db89a7030fa57393be10bbc 100644 (file)
--- a/public/help/en-gb/wiki_syntax_detailed.html
+++ b/public/help/en-gb/wiki_syntax_detailed.html
@@ -186,7 +186,7 @@ http://www.redmine.org, someone@foo.bar
         <ul>
             <li><strong>bold</strong></li>
             <li><em>italic</em></li>
-            <li><em>*bold italic*</em></li>
+            <li><em><strong>bold italic</strong></em></li>
             <li><ins>underline</ins></li>
             <li><del>strike-through</del></li>
         </ul>

diff --git a/public/help/en/wiki_syntax_detailed.html b/public/help/en/wiki_syntax_detailed.html
index 2ddd2fdf5543e34e54670ff2636725355a8afb94..0da31866b20afff58db89a7030fa57393be10bbc 100644 (file)
--- a/public/help/en/wiki_syntax_detailed.html
+++ b/public/help/en/wiki_syntax_detailed.html
@@ -186,7 +186,7 @@ http://www.redmine.org, someone@foo.bar
         <ul>
             <li><strong>bold</strong></li>
             <li><em>italic</em></li>
-            <li><em>*bold italic*</em></li>
+            <li><em><strong>bold italic</strong></em></li>
             <li><ins>underline</ins></li>
             <li><del>strike-through</del></li>
         </ul>

diff --git a/public/help/es/wiki_syntax_detailed.html b/public/help/es/wiki_syntax_detailed.html
index 2ddd2fdf5543e34e54670ff2636725355a8afb94..0da31866b20afff58db89a7030fa57393be10bbc 100644 (file)
--- a/public/help/es/wiki_syntax_detailed.html
+++ b/public/help/es/wiki_syntax_detailed.html
@@ -186,7 +186,7 @@ http://www.redmine.org, someone@foo.bar
         <ul>
             <li><strong>bold</strong></li>
             <li><em>italic</em></li>
-            <li><em>*bold italic*</em></li>
+            <li><em><strong>bold italic</strong></em></li>
             <li><ins>underline</ins></li>
             <li><del>strike-through</del></li>
         </ul>

diff --git a/public/help/et/wiki_syntax_detailed.html b/public/help/et/wiki_syntax_detailed.html
index 2ddd2fdf5543e34e54670ff2636725355a8afb94..0da31866b20afff58db89a7030fa57393be10bbc 100644 (file)
--- a/public/help/et/wiki_syntax_detailed.html
+++ b/public/help/et/wiki_syntax_detailed.html
@@ -186,7 +186,7 @@ http://www.redmine.org, someone@foo.bar
         <ul>
             <li><strong>bold</strong></li>
             <li><em>italic</em></li>
-            <li><em>*bold italic*</em></li>
+            <li><em><strong>bold italic</strong></em></li>
             <li><ins>underline</ins></li>
             <li><del>strike-through</del></li>
         </ul>

diff --git a/public/help/eu/wiki_syntax_detailed.html b/public/help/eu/wiki_syntax_detailed.html
index 2ddd2fdf5543e34e54670ff2636725355a8afb94..0da31866b20afff58db89a7030fa57393be10bbc 100644 (file)
--- a/public/help/eu/wiki_syntax_detailed.html
+++ b/public/help/eu/wiki_syntax_detailed.html
@@ -186,7 +186,7 @@ http://www.redmine.org, someone@foo.bar
         <ul>
             <li><strong>bold</strong></li>
             <li><em>italic</em></li>
-            <li><em>*bold italic*</em></li>
+            <li><em><strong>bold italic</strong></em></li>
             <li><ins>underline</ins></li>
             <li><del>strike-through</del></li>
         </ul>

diff --git a/public/help/fa/wiki_syntax_detailed.html b/public/help/fa/wiki_syntax_detailed.html
index 2ddd2fdf5543e34e54670ff2636725355a8afb94..0da31866b20afff58db89a7030fa57393be10bbc 100644 (file)
--- a/public/help/fa/wiki_syntax_detailed.html
+++ b/public/help/fa/wiki_syntax_detailed.html
@@ -186,7 +186,7 @@ http://www.redmine.org, someone@foo.bar
         <ul>
             <li><strong>bold</strong></li>
             <li><em>italic</em></li>
-            <li><em>*bold italic*</em></li>
+            <li><em><strong>bold italic</strong></em></li>
             <li><ins>underline</ins></li>
             <li><del>strike-through</del></li>
         </ul>

diff --git a/public/help/fi/wiki_syntax_detailed.html b/public/help/fi/wiki_syntax_detailed.html
index 2ddd2fdf5543e34e54670ff2636725355a8afb94..0da31866b20afff58db89a7030fa57393be10bbc 100644 (file)
--- a/public/help/fi/wiki_syntax_detailed.html
+++ b/public/help/fi/wiki_syntax_detailed.html
@@ -186,7 +186,7 @@ http://www.redmine.org, someone@foo.bar
         <ul>
             <li><strong>bold</strong></li>
             <li><em>italic</em></li>
-            <li><em>*bold italic*</em></li>
+            <li><em><strong>bold italic</strong></em></li>
             <li><ins>underline</ins></li>
             <li><del>strike-through</del></li>
         </ul>

diff --git a/public/help/fr/wiki_syntax_detailed.html b/public/help/fr/wiki_syntax_detailed.html
index 75c2fba9825468968ff12c11f660d5c10a2833e7..990b2d06884cdfcb54ee461fafd7a409f3a05d18 100644 (file)
--- a/public/help/fr/wiki_syntax_detailed.html
+++ b/public/help/fr/wiki_syntax_detailed.html
@@ -186,7 +186,7 @@ http://www.redmine.org, someone@foo.bar
         <ul>
             <li><strong>gras</strong></li>
             <li><em>_italique_</em></li>
-            <li><em>*gras italique*</em></li>
+            <li><em><strong>gras italique</strong></em></li>
             <li><ins>sous-ligné</ins></li>
             <li><del>barré</del></li>
         </ul>

diff --git a/public/help/gl/wiki_syntax_detailed.html b/public/help/gl/wiki_syntax_detailed.html
index 2ddd2fdf5543e34e54670ff2636725355a8afb94..0da31866b20afff58db89a7030fa57393be10bbc 100644 (file)
--- a/public/help/gl/wiki_syntax_detailed.html
+++ b/public/help/gl/wiki_syntax_detailed.html
@@ -186,7 +186,7 @@ http://www.redmine.org, someone@foo.bar
         <ul>
             <li><strong>bold</strong></li>
             <li><em>italic</em></li>
-            <li><em>*bold italic*</em></li>
+            <li><em><strong>bold italic</strong></em></li>
             <li><ins>underline</ins></li>
             <li><del>strike-through</del></li>
         </ul>

diff --git a/public/help/he/wiki_syntax_detailed.html b/public/help/he/wiki_syntax_detailed.html
index 2ddd2fdf5543e34e54670ff2636725355a8afb94..0da31866b20afff58db89a7030fa57393be10bbc 100644 (file)
--- a/public/help/he/wiki_syntax_detailed.html
+++ b/public/help/he/wiki_syntax_detailed.html
@@ -186,7 +186,7 @@ http://www.redmine.org, someone@foo.bar
         <ul>
             <li><strong>bold</strong></li>
             <li><em>italic</em></li>
-            <li><em>*bold italic*</em></li>
+            <li><em><strong>bold italic</strong></em></li>
             <li><ins>underline</ins></li>
             <li><del>strike-through</del></li>
         </ul>

diff --git a/public/help/hr/wiki_syntax_detailed.html b/public/help/hr/wiki_syntax_detailed.html
index 2ddd2fdf5543e34e54670ff2636725355a8afb94..0da31866b20afff58db89a7030fa57393be10bbc 100644 (file)
--- a/public/help/hr/wiki_syntax_detailed.html
+++ b/public/help/hr/wiki_syntax_detailed.html
@@ -186,7 +186,7 @@ http://www.redmine.org, someone@foo.bar
         <ul>
             <li><strong>bold</strong></li>
             <li><em>italic</em></li>
-            <li><em>*bold italic*</em></li>
+            <li><em><strong>bold italic</strong></em></li>
             <li><ins>underline</ins></li>
             <li><del>strike-through</del></li>
         </ul>

diff --git a/public/help/hu/wiki_syntax_detailed.html b/public/help/hu/wiki_syntax_detailed.html
index 2ddd2fdf5543e34e54670ff2636725355a8afb94..0da31866b20afff58db89a7030fa57393be10bbc 100644 (file)
--- a/public/help/hu/wiki_syntax_detailed.html
+++ b/public/help/hu/wiki_syntax_detailed.html
@@ -186,7 +186,7 @@ http://www.redmine.org, someone@foo.bar
         <ul>
             <li><strong>bold</strong></li>
             <li><em>italic</em></li>
-            <li><em>*bold italic*</em></li>
+            <li><em><strong>bold italic</strong></em></li>
             <li><ins>underline</ins></li>
             <li><del>strike-through</del></li>
         </ul>

diff --git a/public/help/id/wiki_syntax_detailed.html b/public/help/id/wiki_syntax_detailed.html
index 2ddd2fdf5543e34e54670ff2636725355a8afb94..0da31866b20afff58db89a7030fa57393be10bbc 100644 (file)
--- a/public/help/id/wiki_syntax_detailed.html
+++ b/public/help/id/wiki_syntax_detailed.html
@@ -186,7 +186,7 @@ http://www.redmine.org, someone@foo.bar
         <ul>
             <li><strong>bold</strong></li>
             <li><em>italic</em></li>
-            <li><em>*bold italic*</em></li>
+            <li><em><strong>bold italic</strong></em></li>
             <li><ins>underline</ins></li>
             <li><del>strike-through</del></li>
         </ul>

diff --git a/public/help/it/wiki_syntax_detailed.html b/public/help/it/wiki_syntax_detailed.html
index 2ddd2fdf5543e34e54670ff2636725355a8afb94..0da31866b20afff58db89a7030fa57393be10bbc 100644 (file)
--- a/public/help/it/wiki_syntax_detailed.html
+++ b/public/help/it/wiki_syntax_detailed.html
@@ -186,7 +186,7 @@ http://www.redmine.org, someone@foo.bar
         <ul>
             <li><strong>bold</strong></li>
             <li><em>italic</em></li>
-            <li><em>*bold italic*</em></li>
+            <li><em><strong>bold italic</strong></em></li>
             <li><ins>underline</ins></li>
             <li><del>strike-through</del></li>
         </ul>

diff --git a/public/help/ko/wiki_syntax_detailed.html b/public/help/ko/wiki_syntax_detailed.html
index 2ddd2fdf5543e34e54670ff2636725355a8afb94..0da31866b20afff58db89a7030fa57393be10bbc 100644 (file)
--- a/public/help/ko/wiki_syntax_detailed.html
+++ b/public/help/ko/wiki_syntax_detailed.html
@@ -186,7 +186,7 @@ http://www.redmine.org, someone@foo.bar
         <ul>
             <li><strong>bold</strong></li>
             <li><em>italic</em></li>
-            <li><em>*bold italic*</em></li>
+            <li><em><strong>bold italic</strong></em></li>
             <li><ins>underline</ins></li>
             <li><del>strike-through</del></li>
         </ul>

diff --git a/public/help/lt/wiki_syntax_detailed.html b/public/help/lt/wiki_syntax_detailed.html
index 2ddd2fdf5543e34e54670ff2636725355a8afb94..0da31866b20afff58db89a7030fa57393be10bbc 100644 (file)
--- a/public/help/lt/wiki_syntax_detailed.html
+++ b/public/help/lt/wiki_syntax_detailed.html
@@ -186,7 +186,7 @@ http://www.redmine.org, someone@foo.bar
         <ul>
             <li><strong>bold</strong></li>
             <li><em>italic</em></li>
-            <li><em>*bold italic*</em></li>
+            <li><em><strong>bold italic</strong></em></li>
             <li><ins>underline</ins></li>
             <li><del>strike-through</del></li>
         </ul>

diff --git a/public/help/lv/wiki_syntax_detailed.html b/public/help/lv/wiki_syntax_detailed.html
index 2ddd2fdf5543e34e54670ff2636725355a8afb94..0da31866b20afff58db89a7030fa57393be10bbc 100644 (file)
--- a/public/help/lv/wiki_syntax_detailed.html
+++ b/public/help/lv/wiki_syntax_detailed.html
@@ -186,7 +186,7 @@ http://www.redmine.org, someone@foo.bar
         <ul>
             <li><strong>bold</strong></li>
             <li><em>italic</em></li>
-            <li><em>*bold italic*</em></li>
+            <li><em><strong>bold italic</strong></em></li>
             <li><ins>underline</ins></li>
             <li><del>strike-through</del></li>
         </ul>

diff --git a/public/help/mk/wiki_syntax_detailed.html b/public/help/mk/wiki_syntax_detailed.html
index 2ddd2fdf5543e34e54670ff2636725355a8afb94..0da31866b20afff58db89a7030fa57393be10bbc 100644 (file)
--- a/public/help/mk/wiki_syntax_detailed.html
+++ b/public/help/mk/wiki_syntax_detailed.html
@@ -186,7 +186,7 @@ http://www.redmine.org, someone@foo.bar
         <ul>
             <li><strong>bold</strong></li>
             <li><em>italic</em></li>
-            <li><em>*bold italic*</em></li>
+            <li><em><strong>bold italic</strong></em></li>
             <li><ins>underline</ins></li>
             <li><del>strike-through</del></li>
         </ul>

diff --git a/public/help/mn/wiki_syntax_detailed.html b/public/help/mn/wiki_syntax_detailed.html
index 2ddd2fdf5543e34e54670ff2636725355a8afb94..0da31866b20afff58db89a7030fa57393be10bbc 100644 (file)
--- a/public/help/mn/wiki_syntax_detailed.html
+++ b/public/help/mn/wiki_syntax_detailed.html
@@ -186,7 +186,7 @@ http://www.redmine.org, someone@foo.bar
         <ul>
             <li><strong>bold</strong></li>
             <li><em>italic</em></li>
-            <li><em>*bold italic*</em></li>
+            <li><em><strong>bold italic</strong></em></li>
             <li><ins>underline</ins></li>
             <li><del>strike-through</del></li>
         </ul>

diff --git a/public/help/nl/wiki_syntax_detailed.html b/public/help/nl/wiki_syntax_detailed.html
index 2ddd2fdf5543e34e54670ff2636725355a8afb94..0da31866b20afff58db89a7030fa57393be10bbc 100644 (file)
--- a/public/help/nl/wiki_syntax_detailed.html
+++ b/public/help/nl/wiki_syntax_detailed.html
@@ -186,7 +186,7 @@ http://www.redmine.org, someone@foo.bar
         <ul>
             <li><strong>bold</strong></li>
             <li><em>italic</em></li>
-            <li><em>*bold italic*</em></li>
+            <li><em><strong>bold italic</strong></em></li>
             <li><ins>underline</ins></li>
             <li><del>strike-through</del></li>
         </ul>

diff --git a/public/help/no/wiki_syntax_detailed.html b/public/help/no/wiki_syntax_detailed.html
index 2ddd2fdf5543e34e54670ff2636725355a8afb94..0da31866b20afff58db89a7030fa57393be10bbc 100644 (file)
--- a/public/help/no/wiki_syntax_detailed.html
+++ b/public/help/no/wiki_syntax_detailed.html
@@ -186,7 +186,7 @@ http://www.redmine.org, someone@foo.bar
         <ul>
             <li><strong>bold</strong></li>
             <li><em>italic</em></li>
-            <li><em>*bold italic*</em></li>
+            <li><em><strong>bold italic</strong></em></li>
             <li><ins>underline</ins></li>
             <li><del>strike-through</del></li>
         </ul>

diff --git a/public/help/pl/wiki_syntax_detailed.html b/public/help/pl/wiki_syntax_detailed.html
index 2ddd2fdf5543e34e54670ff2636725355a8afb94..0da31866b20afff58db89a7030fa57393be10bbc 100644 (file)
--- a/public/help/pl/wiki_syntax_detailed.html
+++ b/public/help/pl/wiki_syntax_detailed.html
@@ -186,7 +186,7 @@ http://www.redmine.org, someone@foo.bar
         <ul>
             <li><strong>bold</strong></li>
             <li><em>italic</em></li>
-            <li><em>*bold italic*</em></li>
+            <li><em><strong>bold italic</strong></em></li>
             <li><ins>underline</ins></li>
             <li><del>strike-through</del></li>
         </ul>

diff --git a/public/help/pt-br/wiki_syntax_detailed.html b/public/help/pt-br/wiki_syntax_detailed.html
index 2ddd2fdf5543e34e54670ff2636725355a8afb94..0da31866b20afff58db89a7030fa57393be10bbc 100644 (file)
--- a/public/help/pt-br/wiki_syntax_detailed.html
+++ b/public/help/pt-br/wiki_syntax_detailed.html
@@ -186,7 +186,7 @@ http://www.redmine.org, someone@foo.bar
         <ul>
             <li><strong>bold</strong></li>
             <li><em>italic</em></li>
-            <li><em>*bold italic*</em></li>
+            <li><em><strong>bold italic</strong></em></li>
             <li><ins>underline</ins></li>
             <li><del>strike-through</del></li>
         </ul>

diff --git a/public/help/pt/wiki_syntax_detailed.html b/public/help/pt/wiki_syntax_detailed.html
index 2ddd2fdf5543e34e54670ff2636725355a8afb94..0da31866b20afff58db89a7030fa57393be10bbc 100644 (file)
--- a/public/help/pt/wiki_syntax_detailed.html
+++ b/public/help/pt/wiki_syntax_detailed.html
@@ -186,7 +186,7 @@ http://www.redmine.org, someone@foo.bar
         <ul>
             <li><strong>bold</strong></li>
             <li><em>italic</em></li>
-            <li><em>*bold italic*</em></li>
+            <li><em><strong>bold italic</strong></em></li>
             <li><ins>underline</ins></li>
             <li><del>strike-through</del></li>
         </ul>

diff --git a/public/help/ro/wiki_syntax_detailed.html b/public/help/ro/wiki_syntax_detailed.html
index 2ddd2fdf5543e34e54670ff2636725355a8afb94..0da31866b20afff58db89a7030fa57393be10bbc 100644 (file)
--- a/public/help/ro/wiki_syntax_detailed.html
+++ b/public/help/ro/wiki_syntax_detailed.html
@@ -186,7 +186,7 @@ http://www.redmine.org, someone@foo.bar
         <ul>
             <li><strong>bold</strong></li>
             <li><em>italic</em></li>
-            <li><em>*bold italic*</em></li>
+            <li><em><strong>bold italic</strong></em></li>
             <li><ins>underline</ins></li>
             <li><del>strike-through</del></li>
         </ul>

diff --git a/public/help/ru/wiki_syntax_detailed.html b/public/help/ru/wiki_syntax_detailed.html
index 2ddd2fdf5543e34e54670ff2636725355a8afb94..0da31866b20afff58db89a7030fa57393be10bbc 100644 (file)
--- a/public/help/ru/wiki_syntax_detailed.html
+++ b/public/help/ru/wiki_syntax_detailed.html
@@ -186,7 +186,7 @@ http://www.redmine.org, someone@foo.bar
         <ul>
             <li><strong>bold</strong></li>
             <li><em>italic</em></li>
-            <li><em>*bold italic*</em></li>
+            <li><em><strong>bold italic</strong></em></li>
             <li><ins>underline</ins></li>
             <li><del>strike-through</del></li>
         </ul>

diff --git a/public/help/sk/wiki_syntax_detailed.html b/public/help/sk/wiki_syntax_detailed.html
index 2ddd2fdf5543e34e54670ff2636725355a8afb94..0da31866b20afff58db89a7030fa57393be10bbc 100644 (file)
--- a/public/help/sk/wiki_syntax_detailed.html
+++ b/public/help/sk/wiki_syntax_detailed.html
@@ -186,7 +186,7 @@ http://www.redmine.org, someone@foo.bar
         <ul>
             <li><strong>bold</strong></li>
             <li><em>italic</em></li>
-            <li><em>*bold italic*</em></li>
+            <li><em><strong>bold italic</strong></em></li>
             <li><ins>underline</ins></li>
             <li><del>strike-through</del></li>
         </ul>

diff --git a/public/help/sl/wiki_syntax_detailed.html b/public/help/sl/wiki_syntax_detailed.html
index 2ddd2fdf5543e34e54670ff2636725355a8afb94..0da31866b20afff58db89a7030fa57393be10bbc 100644 (file)
--- a/public/help/sl/wiki_syntax_detailed.html
+++ b/public/help/sl/wiki_syntax_detailed.html
@@ -186,7 +186,7 @@ http://www.redmine.org, someone@foo.bar
         <ul>
             <li><strong>bold</strong></li>
             <li><em>italic</em></li>
-            <li><em>*bold italic*</em></li>
+            <li><em><strong>bold italic</strong></em></li>
             <li><ins>underline</ins></li>
             <li><del>strike-through</del></li>
         </ul>

diff --git a/public/help/sq/wiki_syntax_detailed.html b/public/help/sq/wiki_syntax_detailed.html
index 2ddd2fdf5543e34e54670ff2636725355a8afb94..0da31866b20afff58db89a7030fa57393be10bbc 100644 (file)
--- a/public/help/sq/wiki_syntax_detailed.html
+++ b/public/help/sq/wiki_syntax_detailed.html
@@ -186,7 +186,7 @@ http://www.redmine.org, someone@foo.bar
         <ul>
             <li><strong>bold</strong></li>
             <li><em>italic</em></li>
-            <li><em>*bold italic*</em></li>
+            <li><em><strong>bold italic</strong></em></li>
             <li><ins>underline</ins></li>
             <li><del>strike-through</del></li>
         </ul>

diff --git a/public/help/sr-yu/wiki_syntax_detailed.html b/public/help/sr-yu/wiki_syntax_detailed.html
index 2ddd2fdf5543e34e54670ff2636725355a8afb94..0da31866b20afff58db89a7030fa57393be10bbc 100644 (file)
--- a/public/help/sr-yu/wiki_syntax_detailed.html
+++ b/public/help/sr-yu/wiki_syntax_detailed.html
@@ -186,7 +186,7 @@ http://www.redmine.org, someone@foo.bar
         <ul>
             <li><strong>bold</strong></li>
             <li><em>italic</em></li>
-            <li><em>*bold italic*</em></li>
+            <li><em><strong>bold italic</strong></em></li>
             <li><ins>underline</ins></li>
             <li><del>strike-through</del></li>
         </ul>

diff --git a/public/help/sr/wiki_syntax_detailed.html b/public/help/sr/wiki_syntax_detailed.html
index 2ddd2fdf5543e34e54670ff2636725355a8afb94..0da31866b20afff58db89a7030fa57393be10bbc 100644 (file)
--- a/public/help/sr/wiki_syntax_detailed.html
+++ b/public/help/sr/wiki_syntax_detailed.html
@@ -186,7 +186,7 @@ http://www.redmine.org, someone@foo.bar
         <ul>
             <li><strong>bold</strong></li>
             <li><em>italic</em></li>
-            <li><em>*bold italic*</em></li>
+            <li><em><strong>bold italic</strong></em></li>
             <li><ins>underline</ins></li>
             <li><del>strike-through</del></li>
         </ul>

diff --git a/public/help/sv/wiki_syntax_detailed.html b/public/help/sv/wiki_syntax_detailed.html
index 2ddd2fdf5543e34e54670ff2636725355a8afb94..0da31866b20afff58db89a7030fa57393be10bbc 100644 (file)
--- a/public/help/sv/wiki_syntax_detailed.html
+++ b/public/help/sv/wiki_syntax_detailed.html
@@ -186,7 +186,7 @@ http://www.redmine.org, someone@foo.bar
         <ul>
             <li><strong>bold</strong></li>
             <li><em>italic</em></li>
-            <li><em>*bold italic*</em></li>
+            <li><em><strong>bold italic</strong></em></li>
             <li><ins>underline</ins></li>
             <li><del>strike-through</del></li>
         </ul>

diff --git a/public/help/th/wiki_syntax_detailed.html b/public/help/th/wiki_syntax_detailed.html
index 2ddd2fdf5543e34e54670ff2636725355a8afb94..0da31866b20afff58db89a7030fa57393be10bbc 100644 (file)
--- a/public/help/th/wiki_syntax_detailed.html
+++ b/public/help/th/wiki_syntax_detailed.html
@@ -186,7 +186,7 @@ http://www.redmine.org, someone@foo.bar
         <ul>
             <li><strong>bold</strong></li>
             <li><em>italic</em></li>
-            <li><em>*bold italic*</em></li>
+            <li><em><strong>bold italic</strong></em></li>
             <li><ins>underline</ins></li>
             <li><del>strike-through</del></li>
         </ul>

diff --git a/public/help/tr/wiki_syntax_detailed.html b/public/help/tr/wiki_syntax_detailed.html
index 2ddd2fdf5543e34e54670ff2636725355a8afb94..0da31866b20afff58db89a7030fa57393be10bbc 100644 (file)
--- a/public/help/tr/wiki_syntax_detailed.html
+++ b/public/help/tr/wiki_syntax_detailed.html
@@ -186,7 +186,7 @@ http://www.redmine.org, someone@foo.bar
         <ul>
             <li><strong>bold</strong></li>
             <li><em>italic</em></li>
-            <li><em>*bold italic*</em></li>
+            <li><em><strong>bold italic</strong></em></li>
             <li><ins>underline</ins></li>
             <li><del>strike-through</del></li>
         </ul>

diff --git a/public/help/uk/wiki_syntax_detailed.html b/public/help/uk/wiki_syntax_detailed.html
index 2ddd2fdf5543e34e54670ff2636725355a8afb94..0da31866b20afff58db89a7030fa57393be10bbc 100644 (file)
--- a/public/help/uk/wiki_syntax_detailed.html
+++ b/public/help/uk/wiki_syntax_detailed.html
@@ -186,7 +186,7 @@ http://www.redmine.org, someone@foo.bar
         <ul>
             <li><strong>bold</strong></li>
             <li><em>italic</em></li>
-            <li><em>*bold italic*</em></li>
+            <li><em><strong>bold italic</strong></em></li>
             <li><ins>underline</ins></li>
             <li><del>strike-through</del></li>
         </ul>

diff --git a/public/help/vi/wiki_syntax_detailed.html b/public/help/vi/wiki_syntax_detailed.html
index 2ddd2fdf5543e34e54670ff2636725355a8afb94..0da31866b20afff58db89a7030fa57393be10bbc 100644 (file)
--- a/public/help/vi/wiki_syntax_detailed.html
+++ b/public/help/vi/wiki_syntax_detailed.html
@@ -186,7 +186,7 @@ http://www.redmine.org, someone@foo.bar
         <ul>
             <li><strong>bold</strong></li>
             <li><em>italic</em></li>
-            <li><em>*bold italic*</em></li>
+            <li><em><strong>bold italic</strong></em></li>
             <li><ins>underline</ins></li>
             <li><del>strike-through</del></li>
         </ul>

diff --git a/public/help/zh-tw/wiki_syntax_detailed.html b/public/help/zh-tw/wiki_syntax_detailed.html
index bb054d6c3bab33a0065496dcc802e5629c449305..8d1e16148e05020d147676b3f9ed9652f48a26c4 100644 (file)
--- a/public/help/zh-tw/wiki_syntax_detailed.html
+++ b/public/help/zh-tw/wiki_syntax_detailed.html
@@ -186,7 +186,7 @@ http://www.redmine.org, someone@foo.bar
         <ul>
             <li><strong>粗體</strong></li>
             <li><em>斜體</em></li>
-            <li><em>*粗斜體*</em></li>
+            <li><em><strong>粗斜體</strong></em></li>
             <li><ins>底線</ins></li>
             <li><del>刪除線</del></li>
         </ul>

diff --git a/public/help/zh/wiki_syntax_detailed.html b/public/help/zh/wiki_syntax_detailed.html
index 2ddd2fdf5543e34e54670ff2636725355a8afb94..0da31866b20afff58db89a7030fa57393be10bbc 100644 (file)
--- a/public/help/zh/wiki_syntax_detailed.html
+++ b/public/help/zh/wiki_syntax_detailed.html
@@ -186,7 +186,7 @@ http://www.redmine.org, someone@foo.bar
         <ul>
             <li><strong>bold</strong></li>
             <li><em>italic</em></li>
-            <li><em>*bold italic*</em></li>
+            <li><em><strong>bold italic</strong></em></li>
             <li><ins>underline</ins></li>
             <li><del>strike-through</del></li>
         </ul>