Skip to content

Commit 6cf6e86

Browse files
authored
Merge branch 'master' into DOC-207
2 parents c641a2d + 6195a46 commit 6cf6e86

File tree

33 files changed

+222
-136
lines changed

33 files changed

+222
-136
lines changed

.vale.ini

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,3 +4,4 @@ Vocab = Docs
44

55
[*.md]
66
BasedOnStyles = write-good, segment
7+
TokenIgnores = ({% .* %})

scripts/ignore.sh

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,13 @@ log=$(env -i git log -1 --pretty=%B)
66
# run a series of checks for common reasons that we shouldn't preview build.
77
# if no checks match, exit with code 1 to run the build
88

9+
# Force a build
10+
if echo $log | grep -1 'netlify\-build'; then
11+
echo "Force build becuase Netlify is a benevolent overseer"
12+
exit 1
13+
914
# ignore for simple typo fixes
10-
if echo "$log" | grep -q 'typo'; then
15+
elif echo "$log" | grep -q 'typo'; then
1116
echo "Build ignored because 'typo' is in the commit message."
1217
exit
1318
# ignore link / url updates
@@ -23,7 +28,7 @@ elif echo "$log" | grep -q 'dependabot'; then
2328
echo "Ignoring dependabot update"
2429
exit
2530
# ignore when master is merged into a branch
26-
elif echo "$log" | grep -q 'Merge branch \SMaster\S'; then
31+
elif echo "$log" | grep -q 'Merge branch \Smaster\S'; then
2732
echo "Build ignored because it's only an update from the main branch."
2833
exit
2934
else

src/_data/catalog/destination_categories.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# AUTOGENERATED FROM PLATFORM API. DO NOT EDIT
2-
# destination categories last updated 2021-06-01
2+
# destination categories last updated 2021-06-08
33
items:
44
- display_name: Email Marketing
55
slug: email-marketing

src/_data/catalog/destinations.yml

Lines changed: 24 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# AUTOGENERATED FROM PLATFORM API. DO NOT EDIT
2-
# destination data last updated 2021-06-04
2+
# destination data last updated 2021-06-08
33
items:
44
- display_name: ActiveCampaign
55
slug: activecampaign
@@ -6234,6 +6234,17 @@ items:
62346234
required: false
62356235
description: 'If true, timestamps are converted to Unix Time.'
62366236
settings: []
6237+
- name: datacenter
6238+
display_name: Customer.io Datacenter
6239+
type: SELECT
6240+
deprecated: false
6241+
required: false
6242+
select_validators:
6243+
select_options:
6244+
- us
6245+
- eu
6246+
description: Choose your Customer.io gateway for data residency.
6247+
settings: []
62376248
- name: siteId
62386249
display_name: Site ID
62396250
type: STRING
@@ -13035,13 +13046,17 @@ items:
1303513046
deprecated: false
1303613047
required: false
1303713048
description: >-
13038-
If this option is enabled, we will never set $id field to your `userId`
13039-
when you call `.identify()` or `.track()`. Instead, we will only set a
13040-
custom attribute `id` and only set $email as the primary identifier with
13041-
your `traits.email` or `properties.email`. You should be careful when
13042-
enabling this option and understand its full implications. This should
13043-
only be enabled if you are experiencing an issue with duplicate profiles
13044-
being created inside Klaviyo.
13049+
This option is enabled by default to ensure duplicate profiles are not
13050+
being created inside of Klaviyo. When enabled, we will never set $id field
13051+
to your `userId` when you call `.identify()` or `.track()`. Instead, we
13052+
will only set a custom attribute `id` and only set $email as the primary
13053+
identifier with your `traits.email` or `properties.email`.
13054+
13055+
13056+
Klaviyo will not record events/profiles if there isn’t an email address
13057+
associated with that customer.
13058+
13059+
Impact is fewer events/profiles recorded in Klaviyo as a result.
1304513060
settings: []
1304613061
- name: privateKey
1304713062
display_name: Enter your Private Key
@@ -21797,7 +21812,7 @@ items:
2179721812
url: connections/destinations/catalog/smartlook
2179821813
description: Qualitative analytics for websites
2179921814
hidden: false
21800-
status: PUBLIC_BETA
21815+
status: PUBLIC
2180121816
previous_names:
2180221817
- Smartlook
2180321818
logo:

src/_data/catalog/source_categories.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# AUTOGENERATED FROM PLATFORM API. DO NOT EDIT
2-
# source cateogries last updated 2021-06-01
2+
# source cateogries last updated 2021-06-08
33
items:
44
- display_name: Server
55
slug: server

src/_data/catalog/sources.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# AUTOGENERATED FROM PLATFORM API. DO NOT EDIT
2-
# sources last updated 2021-06-01
2+
# sources last updated 2021-06-08
33
items:
44
- display_name: .NET
55
slug: net

src/_data/products.yml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -106,3 +106,11 @@ items:
106106
team: true
107107
business: false
108108
add-on: false
109+
- product_display_name: Journeys
110+
slug: journeys
111+
plan-note: "Journeys is available to Personas Advanced customers"
112+
plans:
113+
free: false
114+
team: false
115+
business: true
116+
add-on: true

src/_data/sidenav/main.yml

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -266,21 +266,21 @@ sections:
266266
title: Overview
267267
- path: /personas/audiences/account-audiences
268268
title: Account-level Audiences
269-
# - section_title: Journeys
270-
# slug: /personas/journeys
271-
# section:
272-
# - path: /personas/journeys
273-
# title: Journeys Overview
274-
# - path: /personas/journeys/build-journey
275-
# title: Build a Journey
276-
# - path: /personas/journeys/send-data
277-
# title: Send Data to Destinations
278-
# - path: /personas/journeys/faq-best-practices
279-
# title: Journeys Best Practices and FAQ
280-
# - path: /personas/journeys/use-cases
281-
# title: Example Journeys Use Cases
282-
# - path: /personas/journeys/key-terms
283-
# title: Journeys Glossary
269+
- section_title: Journeys
270+
slug: /personas/journeys
271+
section:
272+
- path: /personas/journeys
273+
title: Journeys Overview
274+
- path: /personas/journeys/build-journey
275+
title: Build a Journey
276+
- path: /personas/journeys/send-data
277+
title: Send Data to Destinations
278+
- path: /personas/journeys/faq-best-practices
279+
title: Journeys Best Practices and FAQ
280+
- path: /personas/journeys/use-cases
281+
title: Example Journeys Use Cases
282+
- path: /personas/journeys/key-terms
283+
title: Journeys Glossary
284284
- path: /personas/using-personas-data
285285
title: Using Personas data
286286
- path: /personas/warehouses

src/connections/destinations/actions.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,9 +46,9 @@ You can add or remove, disable and re-enable, and rename individual actions from
4646

4747
From the edit screen you can change the action’s name, subscription criteria, and mapping, and toggle it on or off. See [Customizing mappings](#customizing-mappings) for more information.
4848

49-
<!-- TODO screenshot-->
49+
![](/docs/connections/destinations/catalog/actions-amplitude/images/amplitude-actions-tab.png)
5050

51-
## Disable a destination actioon
51+
## Disable a destination action
5252
If you find that you need to stop an action from running, but don’t want to delete it completely, you can click the action to select it, then click the toggle next to the action’s name to disable it. This takes effect within minutes, and disables the action until you reenable it.
5353

5454
## Delete a destination action
248 KB
Loading

0 commit comments

Comments
 (0)