Skip to content

Commit 296714f

Browse files
committed
Merge branch 'develop' into DOC-467-IF
2 parents 45ae78f + 6ad580b commit 296714f

File tree

56 files changed

+1587
-935
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

56 files changed

+1587
-935
lines changed

.github/Vocab/Docs/accept.txt

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
(?:C|c)annonical
2+
(?:C|c)onfig
23
(?:D|d)eduplicate
34
(?:D|d)eduplication
45
(?:G|g)tag
@@ -11,21 +12,28 @@
1112
(?:U|u)nlinks?\b
1213
(?:U|u)nmaps?\b
1314
(?:U|u)rls?\b
15+
adset
1416
Adwords
1517
allowlist
18+
Amberflo
1619
Appboy
1720
blocklist
1821
boolean
1922
Chargebee
2023
CloudFront
2124
Cocoapods
2225
csv
26+
deeplink
2327
Dev
2428
Doubleclick
29+
endfor
30+
endif
31+
eu
2532
Friendbuy
2633
ga
2734
gmail
2835
Gradle
36+
html
2937
http
3038
HTTP
3139
https
@@ -36,6 +44,7 @@ iOS
3644
Javadoc
3745
Javadocs
3846
Javascript
47+
Jivox
3948
Kameleoon
4049
Kissmetrics
4150
Lightbox
@@ -57,8 +66,10 @@ Subnet
5766
Totango
5867
Twilio
5968
upsert
69+
US
70+
utm
6071
Vero
6172
viewability
6273
WebKit
6374
Wootric
64-
Zendesk
75+
Zendesk
Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
extends: spelling
2+
message: "Did you really mean '%s'?"
3+
level: error
4+
# ignore liquid tags
5+
filters:
6+
- '({%).*(%})'

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ vendor/
1010
node_modules/
1111
src/assets/docs.bundle.js
1212
yarn-error.log
13+
.yarn/install-state.gz
1314
# Make sure to update `analytics` to the full path to your Typewriter client.
1415
.vscode/spellright.dict
1516

9.49 KB
Binary file not shown.
62.7 KB
Binary file not shown.
5.42 KB
Binary file not shown.
4.09 KB
Binary file not shown.
4.47 KB
Binary file not shown.
4.51 KB
Binary file not shown.
4.45 KB
Binary file not shown.

0 commit comments

Comments
 (0)