Add latest changes from gitlab-org/gitlab@15-8-stable-eev15.8.0-rc42

2 files changed, 12 insertions, 12 deletions

diff --git a/glfm_specification/output_example_snapshots/html.yml b/glfm_specification/output_example_snapshots/html.yml
index 06e88ce4b81..f82e9d18150 100644
--- a/glfm_specification/output_example_snapshots/html.yml
+++ b/glfm_specification/output_example_snapshots/html.yml
@@ -423,7 +423,7 @@
   canonical: |
     <p>## foo</p>
   static: |-
-    <p data-sourcepos="1:1-1:27" dir="auto"><span>#</span># foo</p>
+    <p data-sourcepos="1:1-1:28" dir="auto"><span>#</span># foo</p>
   wysiwyg: |-
     <p>## foo</p>
 04_02_00__leaf_blocks__atx_headings__005:
@@ -533,11 +533,11 @@
     <h2>foo ###</h2>
     <h1>foo #</h1>
   static: |-
-    <h3 data-sourcepos="1:1-1:32" dir="auto">
+    <h3 data-sourcepos="1:1-1:33" dir="auto">
     <a id="user-content-foo-" class="anchor" href="#foo-" aria-hidden="true"></a>foo <span>#</span>##</h3>
-    <h2 data-sourcepos="2:1-2:31" dir="auto">
+    <h2 data-sourcepos="2:1-2:32" dir="auto">
     <a id="user-content-foo--1" class="anchor" href="#foo--1" aria-hidden="true"></a>foo #<span>#</span>#</h2>
-    <h1 data-sourcepos="3:1-3:28" dir="auto">
+    <h1 data-sourcepos="3:1-3:29" dir="auto">
     <a id="user-content-foo--2" class="anchor" href="#foo--2" aria-hidden="true"></a>foo <span>#</span>
     </h1>
   wysiwyg: |-
@@ -4785,7 +4785,7 @@
   canonical: |
     <p>!&quot;#$%&amp;'()*+,-./:;&lt;=&gt;?@[\]^_`{|}~</p>
   static: |-
-    <p data-sourcepos="1:1-1:224" dir="auto"><span>!</span>"<span>#</span><span>$</span><span>%</span><span>&amp;</span>'()*+,-./:;&lt;=&gt;?<span>@</span>[\]<span>^</span>_`{|}<span>~</span></p>
+    <p data-sourcepos="1:1-1:295" dir="auto"><span>!</span>"<span>#</span><span>$</span><span>%</span><span>&amp;</span>'()*+,-./:;&lt;=&gt;?<span>@</span>[\]<span>^</span><span>_</span>`<span>{</span>|<span>}</span><span>~</span></p>
   wysiwyg: |-
     <p>!"#$%&amp;'()*+,-./:;&lt;=&gt;?@[\]^_`{|}~</p>
 06_02_00__inlines__backslash_escapes__002:
@@ -4804,7 +4804,7 @@
     [foo]: /url &quot;not a reference&quot;
     &amp;ouml; not a character entity</p>
   static: |-
-    <p data-sourcepos="1:1-9:50" dir="auto">*not emphasized*
+    <p data-sourcepos="1:1-9:51" dir="auto">*not emphasized*
     &lt;br/&gt; not a tag
     <a href="/foo">not a link</a>
     `not code`
@@ -5929,7 +5929,7 @@
   canonical: |
     <p>foo <em>_</em></p>
   static: |-
-    <p data-sourcepos="1:1-1:8" dir="auto">foo <em>_</em></p>
+    <p data-sourcepos="1:1-1:29" dir="auto">foo <em><span>_</span></em></p>
   wysiwyg: |-
     <p>foo <em>_</em></p>
 06_05_00__inlines__emphasis_and_strong_emphasis__100:
@@ -5950,7 +5950,7 @@
   canonical: |
     <p>foo <strong>_</strong></p>
   static: |-
-    <p data-sourcepos="1:1-1:10" dir="auto">foo <strong>_</strong></p>
+    <p data-sourcepos="1:1-1:31" dir="auto">foo <strong><span>_</span></strong></p>
   wysiwyg: |-
     <p>foo <strong>_</strong></p>
 06_05_00__inlines__emphasis_and_strong_emphasis__103:
@@ -6639,7 +6639,7 @@
   canonical: |
     <p>[bar][foo!]</p>
   static: |-
-    <p data-sourcepos="1:1-1:32" dir="auto">[bar][foo<span>!</span>]</p>
+    <p data-sourcepos="1:1-1:33" dir="auto">[bar][foo<span>!</span>]</p>
   wysiwyg: |-
     <p>[bar][foo!]</p>
     <pre>[foo!]: /url</pre>
@@ -7043,7 +7043,7 @@
   canonical: |
     <p>!<a href="/url" title="title">foo</a></p>
   static: |-
-    <p data-sourcepos="1:1-1:27" dir="auto"><span>!</span><a href="/url" title="title">foo</a></p>
+    <p data-sourcepos="1:1-1:28" dir="auto"><span>!</span><a href="/url" title="title">foo</a></p>
   wysiwyg: |-
     <p>!<a target="_blank" rel="noopener noreferrer nofollow" href="/url" title="title">foo</a></p>
     <pre>[foo]: /url "title"</pre>
@@ -8441,7 +8441,7 @@
   canonical: |
     TODO: Write canonical HTML for this example
   static: |-
-    <p data-sourcepos="1:1-1:36" dir="auto">This math is inline <code class="code math js-render-math" data-math-style="inline">a^2+b^2=c^2</code>.</p>
+    <p data-sourcepos="1:1-1:36" dir="auto">This math is inline <code data-math-style="inline" class="code math js-render-math">a^2+b^2=c^2</code>.</p>
     <p data-sourcepos="3:1-3:27" dir="auto">This is on a separate line:</p>
     <div class="gl-relative markdown-code-block js-markdown-code">
     <pre data-sourcepos="5:1-7:3" lang="math" data-math-style="display" class="js-render-math code highlight js-syntax-highlight language-math" v-pre="true"><code><span id="LC1" class="line" lang="math">a^2+b^2=c^2</span></code></pre>
diff --git a/glfm_specification/output_example_snapshots/snapshot_spec.html b/glfm_specification/output_example_snapshots/snapshot_spec.html
index 080712d1b4e..415ad1d0b11 100644
--- a/glfm_specification/output_example_snapshots/snapshot_spec.html
+++ b/glfm_specification/output_example_snapshots/snapshot_spec.html
@@ -6849,7 +6849,7 @@ not have their usual Markdown meanings:</p>
 <span id="LC6" class="line" lang="plaintext">\* not a list</span>
 <span id="LC7" class="line" lang="plaintext">\# not a heading</span>
 <span id="LC8" class="line" lang="plaintext">\[foo]: /url "not a reference"</span>
-<span id="LC9" class="line" lang="plaintext">\&amp;ouml; not a character entity</span></code></pre>
+<span id="LC9" class="line" lang="plaintext">\ö not a character entity</span></code></pre>
 <copy-code></copy-code>
 </div>
 <div class="gl-relative markdown-code-block js-markdown-code">