Skip to content

Commit 0e17201

Browse files
authored
Merge branch 'develop' into issue_3465
2 parents c21a791 + e3f3761 commit 0e17201

File tree

10 files changed

+241
-369
lines changed

10 files changed

+241
-369
lines changed

.circleci/config.yml

-2
Original file line numberDiff line numberDiff line change
@@ -186,8 +186,6 @@ workflows:
186186
branches:
187187
only:
188188
- develop
189-
- feature-contentful
190-
- issue_3465
191189
# This is beta env for production soft releases
192190
- "build-prod-beta":
193191
context : org-global

__tests__/shared/utils/__snapshots__/markdown.js.snap

+27-27
Original file line numberDiff line numberDiff line change
@@ -653,7 +653,7 @@ Array [
653653
<a
654654
href="/projects/markdown/syntax.text"
655655
>
656-
see the source for it by adding '.text' to the URL
656+
see the source for it by adding .text to the URL
657657
</a>
658658
.
659659
</p>,
@@ -672,11 +672,11 @@ Array [
672672
<br />
673673
document should be publishable as-is, as plain text, without looking
674674
<br />
675-
like it's been marked up with tags or formatting instructions. While
675+
like its been marked up with tags or formatting instructions. While
676676
<br />
677-
Markdown's syntax has been influenced by several existing text-to-HTML
677+
Markdowns syntax has been influenced by several existing text-to-HTML
678678
<br />
679-
filters -- including
679+
filters including
680680
<a
681681
href="http://docutils.sourceforge.net/mirror/setext.html"
682682
>
@@ -713,9 +713,9 @@ Array [
713713
>
714714
EtText
715715
</a>
716-
-- the single biggest source of
716+
the single biggest source of
717717
<br />
718-
inspiration for Markdown's syntax is the format of plain text email.
718+
inspiration for Markdowns syntax is the format of plain text email.
719719
</p>,
720720
<h2>
721721
Block Elements
@@ -728,18 +728,18 @@ Array [
728728
<br />
729729
by one or more blank lines. (A blank line is any line that looks like a
730730
<br />
731-
blank line -- a line containing nothing but spaces or tabs is considered
731+
blank line a line containing nothing but spaces or tabs is considered
732732
<br />
733733
blank.) Normal paragraphs should not be indented with spaces or tabs.
734734
</p>,
735735
<p>
736-
The implication of the "one or more consecutive lines of text" rule is
736+
The implication of the one or more consecutive lines of text rule is
737737
<br />
738-
that Markdown supports "hard-wrapped" text paragraphs. This differs
738+
that Markdown supports hard-wrapped text paragraphs. This differs
739739
<br />
740740
significantly from most other text-to-HTML formatters (including Movable
741741
<br />
742-
Type's "Convert Line Breaks" option) which translate every line break
742+
Type’s “Convert Line Breaks option) which translate every line break
743743
<br />
744744
character in a paragraph into a
745745
<code>
@@ -775,11 +775,11 @@ Array [
775775
Markdown supports two styles of headers, [Setext] [1] and [atx] [2].
776776
</p>,
777777
<p>
778-
Optionally, you may "close" atx-style headers. This is purely
778+
Optionally, you may close atx-style headers. This is purely
779779
<br />
780-
cosmetic -- you can use this if you think it looks better. The
780+
cosmetic you can use this if you think it looks better. The
781781
<br />
782-
closing hashes don't even need to match the number of hashes
782+
closing hashes dont even need to match the number of hashes
783783
<br />
784784
used to open the header. (The number of opening hashes
785785
<br />
@@ -800,7 +800,7 @@ Array [
800800
className="bash"
801801
/>
802802
</code>
803-
characters for blockquoting. If you're
803+
characters for blockquoting. If youre
804804
<br />
805805
familiar with quoting passages of text in an email message, then you
806806
<br />
@@ -916,7 +916,7 @@ Array [
916916
</li>
917917
</ol>
918918
<p>
919-
Here's some example code:
919+
Heres some example code:
920920
</p>
921921
<code>
922922
return shell_exec("echo $input | $markdown_script");
@@ -937,9 +937,9 @@ Array [
937937
Markdown supports ordered (numbered) and unordered (bulleted) lists.
938938
</p>,
939939
<p>
940-
Unordered lists use asterisks, pluses, and hyphens -- interchangably
940+
Unordered lists use asterisks, pluses, and hyphens interchangably
941941
<br />
942-
-- as list markers:
942+
as list markers:
943943
</p>,
944944
<ul>
945945
<li>
@@ -1019,7 +1019,7 @@ Array [
10191019
</li>
10201020
</ol>,
10211021
<p>
1022-
It's important to note that the actual numbers you use to mark the
1022+
Its important to note that the actual numbers you use to mark the
10231023
<br />
10241024
list have no effect on the HTML output Markdown produces. The HTML
10251025
<br />
@@ -1068,13 +1068,13 @@ Array [
10681068
</li>
10691069
</ol>,
10701070
<p>
1071-
you'd get the exact same HTML output. The point is, if you want to,
1071+
youd get the exact same HTML output. The point is, if you want to,
10721072
<br />
10731073
you can use ordinal numbers in your ordered Markdown lists, so that
10741074
<br />
10751075
the numbers in your source match the numbers in your published HTML.
10761076
<br />
1077-
But if you want to be lazy, you don't have to.
1077+
But if you want to be lazy, you dont have to.
10781078
</p>,
10791079
<p>
10801080
To make lists look nice, you can wrap items with hanging indents:
@@ -1098,7 +1098,7 @@ Array [
10981098
</li>
10991099
</ul>,
11001100
<p>
1101-
But if you want to be lazy, you don't have to:
1101+
But if you want to be lazy, you dont have to:
11021102
</p>,
11031103
<ul>
11041104
<li>
@@ -1161,7 +1161,7 @@ Array [
11611161
This is a list item with two paragraphs.
11621162
</p>
11631163
<p>
1164-
This is the second paragraph in the list item. You're
1164+
This is the second paragraph in the list item. Youre
11651165
<br />
11661166
only required to indent the first line. Lorem ipsum dolor
11671167
<br />
@@ -1175,7 +1175,7 @@ Array [
11751175
</li>
11761176
</ul>,
11771177
<p>
1178-
To put a blockquote within a list item, the blockquote's
1178+
To put a blockquote within a list item, the blockquotes
11791179
<code>
11801180
<span
11811181
className="hljs-meta"
@@ -1210,7 +1210,7 @@ Array [
12101210
<em>
12111211
twice
12121212
</em>
1213-
-- 8 spaces or two tabs:
1213+
8 spaces or two tabs:
12141214
</p>,
12151215
<ul>
12161216
<li>
@@ -1305,7 +1305,7 @@ end tell
13051305
<br />
13061306
are automatically converted into HTML entities. This makes it very
13071307
<br />
1308-
easy to include example HTML source code using Markdown -- just paste
1308+
easy to include example HTML source code using Markdown just paste
13091309
<br />
13101310
it and indent it, and Markdown will handle the hassle of encoding the
13111311
<br />
@@ -1322,7 +1322,7 @@ end tell
13221322
<br />
13231323
asterisks are just literal asterisks within a code block. This means
13241324
<br />
1325-
it's also easy to use Markdown to write about Markdown's own syntax.
1325+
its also easy to use Markdown to write about Markdowns own syntax.
13261326
</p>,
13271327
Array [
13281328
<pre
@@ -1388,7 +1388,7 @@ end tell
13881388
<p>
13891389
To create an inline link, use a set of regular parentheses immediately
13901390
<br />
1391-
after the link text's closing square bracket. Inside the parentheses,
1391+
after the link texts closing square bracket. Inside the parentheses,
13921392
<br />
13931393
put the URL where you want the link to point, along with an
13941394
<em>

0 commit comments

Comments
 (0)