Skip to content

Commit d2413ff

Browse files
committed
Merge branch 'master' into DOC-192_data-res-ga
2 parents 23f888c + 51b0a5a commit d2413ff

File tree

6 files changed

+77
-109
lines changed

6 files changed

+77
-109
lines changed

Gemfile.lock

100755100644
Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -88,14 +88,14 @@ GEM
8888
rb-fsevent (~> 0.10, >= 0.10.3)
8989
rb-inotify (~> 0.9, >= 0.9.10)
9090
mercenary (0.4.0)
91-
mini_portile2 (2.5.0)
91+
mini_portile2 (2.5.1)
9292
multipart-post (2.1.1)
93-
nokogiri (1.11.1)
93+
nokogiri (1.11.4)
9494
mini_portile2 (~> 2.5.0)
9595
racc (~> 1.4)
96-
nokogiri (1.11.1-x86_64-darwin)
96+
nokogiri (1.11.4-x86_64-darwin)
9797
racc (~> 1.4)
98-
nokogiri (1.11.1-x86_64-linux)
98+
nokogiri (1.11.4-x86_64-linux)
9999
racc (~> 1.4)
100100
pathutil (0.16.2)
101101
forwardable-extended (~> 2.6)

package-lock.json

Lines changed: 28 additions & 29 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/connections/destinations/catalog/facebook-pixel-server-side/index.md

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -133,13 +133,12 @@ Beginning February 15th 2021, Facebook requires the `action_source` server event
133133

134134
### Action Source
135135

136-
`action_source` is set to "website" as a default value. If a mobile library is used then `action_source` defaults to "app".
136+
`action_source` is set to "website" as a default value.
137137

138138
You can set `action_source` manually by passing it as a property of a Track event. You can use either snake case or camel case to include `action_source` as a property in Track events.
139139

140140
| Action Source Values | Description |
141141
| -------------------- | --------------------------------------------------------------------------------------------------------- |
142-
| `app` | Conversion was made using your app. |
143142
| `chat` | Conversion was made via a messaging app, SMS, or online messaging feature. |
144143
| `email` | Conversion happened over email. |
145144
| `other` | Conversion happened in a way that is not listed. |

src/personas/journeys/faq-best-practices.md

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,19 @@ title: Journeys Best Practices and FAQ
1111
When you create a multi-branch split, do not create overlapping conditions that might lead a user to qualify for more than one step at a time.
1212

1313
For example:
14-
- If a multi-branch split has the following conditions, a user who has performed both `webinar attended` and `registration form submitted` will end up in both branches.
14+
- In the case where a multi-branch split is based on the conditions `registration form submitted` and `webinar attended`, a user may satisfy both conditions, and therefore is eligible for both paths.
1515
- To set a priority, branch 2 should then be `who performed registration form submitted and did not perform webinar attended` to ensure mutual exclusivity
1616

1717
### Add time windows whenever possible
1818

19-
Where possible, add a time window when defining conditions to ensure that users exit the step or Journey, rather than remain at the step forever. This prevents Journeys from collecting stale users which can muddle your data for analytics, or cause you to over-target.
19+
Add time windows when defining conditions to enforce funnel constraints in a Journey, rather than using an unbounded event condition which operates on the entire history of the user profile. For example, to check if a user has completed an order since receiving an email triggered 7 days ago, use the condition “Order Completed at least 1 time within 7 days.”
20+
21+
### Suppress targeting with journey lists
22+
23+
Unlike lists associated with Personas Audiences, users who are added to a journey list cannot be subsequently removed. Lists are typically associated with advertising campaigns, and you must take additional steps if you wish to ensure that users do not continue to be targeted with ads after they achieve some goal. A typical implementation pattern is:
24+
1. Use a send to destination step to add users to the initial targeting list.
25+
2. Create additional journey steps to model the conditions where a user should be removed from targeting. Create a second send to destination step for the removal list.
26+
3. When configuring targeting conditions in the destination interface, use boolean logic to include only those users who are in the initial list AND NOT in the removal list.
2027

2128
### Review your Journey in drafts first
2229

src/personas/journeys/send-data.md

Lines changed: 1 addition & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -41,18 +41,6 @@ When the user enters the step:
4141
}
4242
```
4343

44-
When the user leaves the step:
45-
46-
```json
47-
{
48-
"type": "track",
49-
"event": "Audience Exited",
50-
"properties": {
51-
"j_o_first_purchase__opened_email_dje83h": "false"
52-
}
53-
}
54-
```
55-
5644
#### Identify calls
5745

5846
When the user enters the step:
@@ -66,20 +54,9 @@ When the user enters the step:
6654
}
6755
```
6856

69-
When the user leaves the step:
70-
71-
```json
72-
{
73-
"type": "identify",
74-
"traits": {
75-
"j_o_first_purchase__opened_email_dje83h": "false"
76-
}
77-
}
78-
```
79-
8057
### List destination
8158

82-
The destination receives a list of users who qualify for that step of the Journey. This list is constantly updated by Segment.
59+
The destination receives a list of users who qualify for the associated journey step. Unlike lists associated with Personas Audiences, users who are added to a journey list cannot be subsequently removed. See [best practices](/docs/personas/journeys/faq-best-practices#suppress-targeting-with-journey-lists) for techniques to suppress targeting with journey lists.
8360

8461
For more information, see [Using Personas Data](/docs/personas/using-personas-data/).
8562

yarn.lock

Lines changed: 34 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -1893,25 +1893,16 @@ browserify-zlib@^0.2.0:
18931893
dependencies:
18941894
pako "~1.0.5"
18951895

1896-
browserslist@^4.0.0:
1897-
version "4.14.0"
1898-
resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.14.0.tgz#2908951abfe4ec98737b72f34c3bcedc8d43b000"
1899-
integrity sha512-pUsXKAF2lVwhmtpeA3LJrZ76jXuusrNyhduuQs7CDFf9foT4Y38aQOserd2lMe5DSSrjf3fx34oHwryuvxAUgQ==
1900-
dependencies:
1901-
caniuse-lite "^1.0.30001111"
1902-
electron-to-chromium "^1.3.523"
1903-
escalade "^3.0.2"
1904-
node-releases "^1.1.60"
1905-
1906-
browserslist@^4.12.0, browserslist@^4.8.5:
1907-
version "4.13.0"
1908-
resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.13.0.tgz#42556cba011e1b0a2775b611cba6a8eca18e940d"
1909-
integrity sha512-MINatJ5ZNrLnQ6blGvePd/QOz9Xtu+Ne+x29iQSCHfkU5BugKVJwZKn/iiL8UbpIpa3JhviKjz+XxMo0m2caFQ==
1910-
dependencies:
1911-
caniuse-lite "^1.0.30001093"
1912-
electron-to-chromium "^1.3.488"
1913-
escalade "^3.0.1"
1914-
node-releases "^1.1.58"
1896+
browserslist@^4.0.0, browserslist@^4.12.0, browserslist@^4.8.5:
1897+
version "4.16.6"
1898+
resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.16.6.tgz#d7901277a5a88e554ed305b183ec9b0c08f66fa2"
1899+
integrity sha512-Wspk/PqO+4W9qp5iUTJsa1B/QrYn1keNCcEP5OvP7WBwT4KaDly0uONYmC6Xa3Z5IqnUgS0KcgLYu1l74x0ZXQ==
1900+
dependencies:
1901+
caniuse-lite "^1.0.30001219"
1902+
colorette "^1.2.2"
1903+
electron-to-chromium "^1.3.723"
1904+
escalade "^3.1.1"
1905+
node-releases "^1.1.71"
19151906

19161907
buffer-from@^1.0.0:
19171908
version "1.1.1"
@@ -2046,15 +2037,10 @@ caniuse-api@^3.0.0:
20462037
lodash.memoize "^4.1.2"
20472038
lodash.uniq "^4.5.0"
20482039

2049-
caniuse-lite@^1.0.0, caniuse-lite@^1.0.30001111:
2050-
version "1.0.30001120"
2051-
resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001120.tgz#cd21d35e537214e19f7b9f4f161f7b0f2710d46c"
2052-
integrity sha512-JBP68okZs1X8D7MQTY602jxMYBmXEKOFkzTBaNSkubooMPFOAv2TXWaKle7qgHpjLDhUzA/TMT0qsNleVyXGUQ==
2053-
2054-
caniuse-lite@^1.0.30001093:
2055-
version "1.0.30001107"
2056-
resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001107.tgz#809360df7a5b3458f627aa46b0f6ed6d5239da9a"
2057-
integrity sha512-86rCH+G8onCmdN4VZzJet5uPELII59cUzDphko3thQFgAQG1RNa+sVLDoALIhRYmflo5iSIzWY3vu1XTWtNMQQ==
2040+
caniuse-lite@^1.0.0, caniuse-lite@^1.0.30001219:
2041+
version "1.0.30001228"
2042+
resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001228.tgz#bfdc5942cd3326fa51ee0b42fbef4da9d492a7fa"
2043+
integrity sha512-QQmLOGJ3DEgokHbMSA8cj2a+geXqmnpyOFT0lhQV6P3/YOJvGDEwoedcwxEQ30gJIwIIunHIicunJ2rzK5gB2A==
20582044

20592045
capture-stack-trace@^1.0.0:
20602046
version "1.0.1"
@@ -2360,6 +2346,11 @@ color@^3.0.0:
23602346
color-convert "^1.9.1"
23612347
color-string "^1.5.2"
23622348

2349+
colorette@^1.2.2:
2350+
version "1.2.2"
2351+
resolved "https://registry.yarnpkg.com/colorette/-/colorette-1.2.2.tgz#cbcc79d5e99caea2dbf10eb3a26fd8b3e6acfa94"
2352+
integrity sha512-MKGMzyfeuutC/ZJ1cba9NqcNpfeqMUcYmyF1ZFY6/Cn7CNSAKx6a+s48sqLqyAiZuaP2TcqMhoo+dlwFnVxT9w==
2353+
23632354
combined-stream@^1.0.5, combined-stream@^1.0.6, combined-stream@~1.0.6:
23642355
version "1.0.8"
23652356
resolved "https://registry.yarnpkg.com/combined-stream/-/combined-stream-1.0.8.tgz#c3d45a8b34fd730631a110a8a2520682b31d5a7f"
@@ -3026,15 +3017,10 @@ ecc-jsbn@~0.1.1:
30263017
jsbn "~0.1.0"
30273018
safer-buffer "^2.1.0"
30283019

3029-
electron-to-chromium@^1.3.488:
3030-
version "1.3.510"
3031-
resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.510.tgz#dee781ff8b595c0deb60172b75d50b6889757eda"
3032-
integrity sha512-sLtGB0znXdmo6lM8hy5wTVo+fLqvIuO8hEpgc0DvPmFZqvBu/WB7AarEwhxVKjf3rVbws/rC8Xf+AlsOb36lJQ==
3033-
3034-
electron-to-chromium@^1.3.523:
3035-
version "1.3.555"
3036-
resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.555.tgz#a096716ff77cf8da9a608eb628fd6927869503d2"
3037-
integrity sha512-/55x3nF2feXFZ5tdGUOr00TxnUjUgdxhrn+eCJ1FAcoAt+cKQTjQkUC5XF4frMWE1R5sjHk+JueuBalimfe5Pg==
3020+
electron-to-chromium@^1.3.723:
3021+
version "1.3.738"
3022+
resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.738.tgz#aec24b091c82acbfabbdcce08076a703941d17ca"
3023+
integrity sha512-vCMf4gDOpEylPSLPLSwAEsz+R3ShP02Y3cAKMZvTqule3XcPp7tgc/0ESI7IS6ZeyBlGClE50N53fIOkcIVnpw==
30383024

30393025
elliptic@^6.0.0:
30403026
version "6.5.4"
@@ -3152,10 +3138,10 @@ esanimate@^1.1.0:
31523138
escodegen "^1.11.1"
31533139
esprima "^4.0.1"
31543140

3155-
escalade@^3.0.1, escalade@^3.0.2:
3156-
version "3.0.2"
3157-
resolved "https://registry.yarnpkg.com/escalade/-/escalade-3.0.2.tgz#6a580d70edb87880f22b4c91d0d56078df6962c4"
3158-
integrity sha512-gPYAU37hYCUhW5euPeR+Y74F7BL+IBsV93j5cvGriSaD1aG6MGsqsV1yamRdrWrb2j3aiZvb0X+UBOWpx3JWtQ==
3141+
escalade@^3.1.1:
3142+
version "3.1.1"
3143+
resolved "https://registry.yarnpkg.com/escalade/-/escalade-3.1.1.tgz#d8cfdc7000965c5a0174b4a82eaa5c0552742e40"
3144+
integrity sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==
31593145

31603146
escape-string-regexp@^1.0.2, escape-string-regexp@^1.0.5:
31613147
version "1.0.5"
@@ -5551,10 +5537,10 @@ node-machine-id@^1.1.12:
55515537
resolved "https://registry.yarnpkg.com/node-machine-id/-/node-machine-id-1.1.12.tgz#37904eee1e59b320bb9c5d6c0a59f3b469cb6267"
55525538
integrity sha512-QNABxbrPa3qEIfrE6GOJ7BYIuignnJw7iQ2YPbc3Nla1HzRJjXzZOiikfF8m7eAMfichLt3M4VgLOetqgDmgGQ==
55535539

5554-
node-releases@^1.1.58, node-releases@^1.1.60:
5555-
version "1.1.60"
5556-
resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.60.tgz#6948bdfce8286f0b5d0e5a88e8384e954dfe7084"
5557-
integrity sha512-gsO4vjEdQaTusZAEebUWp2a5d7dF5DYoIpDG7WySnk7BuZDW+GPpHXoXXuYawRBr/9t5q54tirPz79kFIWg4dA==
5540+
node-releases@^1.1.71:
5541+
version "1.1.72"
5542+
resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.72.tgz#14802ab6b1039a79a0c7d662b610a5bbd76eacbe"
5543+
integrity sha512-LLUo+PpH3dU6XizX3iVoubUNheF/owjXCZZ5yACDxNnPtgFuludV1ZL3ayK1kVep42Rmm0+R9/Y60NQbZ2bifw==
55585544

55595545
normalize-package-data@^2.3.2, normalize-package-data@^2.3.4, normalize-package-data@^2.5.0:
55605546
version "2.5.0"
@@ -9288,9 +9274,9 @@ [email protected]:
92889274
integrity sha1-wlLXx8WxtAKJdjDjRTx7/mkNnKE=
92899275

92909276
ws@^7.0.0:
9291-
version "7.3.1"
9292-
resolved "https://registry.yarnpkg.com/ws/-/ws-7.3.1.tgz#d0547bf67f7ce4f12a72dfe31262c68d7dc551c8"
9293-
integrity sha512-D3RuNkynyHmEJIpD2qrgVkc9DQ23OrN/moAwZX4L8DfvszsJxpjQuUq3LMx6HoYji9fbIOBY18XWBsAux1ZZUA==
9277+
version "7.4.6"
9278+
resolved "https://registry.yarnpkg.com/ws/-/ws-7.4.6.tgz#5654ca8ecdeee47c33a9a4bf6d28e2be2980377c"
9279+
integrity sha512-YmhHDO4MzaDLB+M9ym/mDA5z0naX8j7SIlT8f8z+I0VtzsRbekxEutHSme7NPS2qE8StCYQNUnfWdXta/Yu85A==
92949280

92959281
x-is-string@^0.1.0:
92969282
version "0.1.0"

0 commit comments

Comments
 (0)