Merge branch 'master' into DOC-212

Author: stayseesong

.vale.ini

@@ -4,3 +4,4 @@ Vocab = Docs
 
 [*.md]
 BasedOnStyles = write-good, segment
+TokenIgnores = ({% .* %})

scripts/ignore.sh

@@ -6,8 +6,13 @@ log=$(env -i git log -1 --pretty=%B)
 # run a series of checks for common reasons that we shouldn't preview build.
 # if no checks match, exit with code 1 to run the build
 
+# Force a build
+if echo $log | grep -1 'netlify\-build'; then
+echo "Force build becuase Netlify is a benevolent overseer"
+exit 1
+
 # ignore for simple typo fixes
-if echo "$log" | grep -q 'typo'; then
+elif echo "$log" | grep -q 'typo'; then
 echo "Build ignored because 'typo' is in the commit message."
 exit
 # ignore link / url updates
@@ -23,7 +28,7 @@ elif echo "$log" | grep -q 'dependabot'; then
 echo "Ignoring dependabot update"
 exit
 # ignore when master is merged into a branch
-elif echo "$log" | grep -q 'Merge branch \SMaster\S'; then
+elif echo "$log" | grep -q 'Merge branch \Smaster\S'; then
 echo "Build ignored because it's only an update from the main branch."
 exit
 else

src/_data/catalog/destination_categories.yml

@@ -1,5 +1,5 @@
 # AUTOGENERATED FROM PLATFORM API. DO NOT EDIT
-# destination categories last updated 2021-06-01 
+# destination categories last updated 2021-06-16 
 items:
 - display_name: Email Marketing
   slug: email-marketing

src/_data/catalog/destinations.yml

@@ -1,5 +1,5 @@
 # AUTOGENERATED FROM PLATFORM API. DO NOT EDIT
-# destination data last updated 2021-06-04 
+# destination data last updated 2021-06-16 
 items:
 - display_name: ActiveCampaign
   slug: activecampaign
@@ -6234,6 +6234,17 @@ items:
     required: false
     description: 'If true, timestamps are converted to Unix Time.'
     settings: []
+  - name: datacenter
+    display_name: Customer.io Datacenter
+    type: SELECT
+    deprecated: false
+    required: false
+    select_validators:
+      select_options:
+      - us
+      - eu
+    description: Choose your Customer.io gateway for data residency.
+    settings: []
   - name: siteId
     display_name: Site ID
     type: STRING
@@ -6578,7 +6589,7 @@ items:
     email preference centers. Digioh makes it easy with a drag and drop builder
     and built-in integrations to Segment and 100s of email marketing systems
   hidden: false
-  status: PUBLIC_BETA
+  status: PUBLIC
   previous_names:
   - Digioh
   logo:
@@ -10088,8 +10099,9 @@ items:
     string_validators:
       regexp: ''
     description: >-
-      If you want to map all your default `.page()` calls that do not explicitly
-      pass in a `name` to a conversion event, you can enter it here. 
+      If you want to map all your default .page() calls that do not explicitly
+      pass in a name to a conversion event, you can enter the Adwords Conversion
+      ID here.
     settings: []
   - name: disableAdPersonalization
     display_name: Disable Ad Personalization
@@ -12507,6 +12519,60 @@ items:
     required: false
     description: Send an event for every page or screen with a name.
     settings: []
+- display_name: June
+  slug: june
+  name: catalog/destinations/june
+  url: connections/destinations/catalog/june
+  description: >-
+    June is instant product analytics. We automatically generate graphs for the
+    metrics you should track.
+  hidden: false
+  status: PUBLIC_BETA
+  previous_names:
+  - June
+  logo:
+    url: >-
+      https://public-segment-devcenter-production.s3.amazonaws.com/564bf917-044c-4810-aa9e-973b16515151.svg
+  mark:
+    url: >-
+      https://public-segment-devcenter-production.s3.amazonaws.com/f30208e6-a3c3-43b9-8577-7e18fd6261bd.svg
+  categories:
+  - Analytics
+  methods:
+    alias: false
+    group: true
+    identify: true
+    page_view: true
+    track: true
+  components: []
+  platforms:
+    browser: true
+    server: true
+    mobile: true
+  browserUnbundlingSupported: false
+  browserUnbundlingPublic: false
+  connection_modes:
+    device:
+      web: false
+      mobile: false
+      server: false
+    cloud:
+      web: false
+      mobile: false
+      server: false
+    summary: No connection mode information available.
+    cmode_type: none
+    case: '0'
+  settings:
+  - name: apiKey
+    display_name: API Key
+    type: STRING
+    deprecated: false
+    required: true
+    string_validators:
+      regexp: '^.{8,}$'
+    description: You can find your API key in the Settings page
+    settings: []
 - display_name: KISSmetrics
   slug: kissmetrics
   name: catalog/destinations/kissmetrics
@@ -12980,8 +13046,8 @@ items:
   categories:
   - Email Marketing
   methods:
-    alias: true
-    group: true
+    alias: false
+    group: false
     identify: true
     page_view: true
     track: true
@@ -13035,13 +13101,17 @@ items:
     deprecated: false
     required: false
     description: >-
-      If this option is enabled, we will never set $id field to your `userId`
-      when you call `.identify()` or `.track()`. Instead, we will only set a
-      custom attribute `id` and only set $email as the primary identifier with
-      your `traits.email` or `properties.email`. You should be careful when
-      enabling this option and understand its full implications. This should
-      only be enabled if you are experiencing an issue with duplicate profiles
-      being created inside Klaviyo.
+      This option is enabled by default to ensure duplicate profiles are not
+      being created inside of Klaviyo. When enabled, we will never set $id field
+      to your `userId` when you call `.identify()` or `.track()`. Instead, we
+      will only set a custom attribute `id` and only set $email as the primary
+      identifier with your `traits.email` or `properties.email`. 
+
+
+      Klaviyo will not record events/profiles if there isn’t an email address
+      associated with that customer.
+
+      Impact is fewer events/profiles recorded in Klaviyo as a result.
     settings: []
   - name: privateKey
     display_name: Enter your Private Key
@@ -14543,6 +14613,13 @@ items:
       required: false
       description: Map your Segment properties to the Marketo Activity Fields
       settings:
+      - name: primaryKey
+        display_name: Set as Primary Key
+        type: BOOLEAN
+        deprecated: false
+        required: false
+        description: Mark this property as the Primary field in Marketo.
+        settings: []
       - name: segmentProperty
         display_name: Segment Property Name
         type: STRING
@@ -14578,13 +14655,6 @@ items:
           - date
         description: Enter the Marketo Field type.
         settings: []
-      - name: primaryKey
-        display_name: Set as Primary Key
-        type: BOOLEAN
-        deprecated: false
-        required: false
-        description: Mark this property as the Primary field in Marketo.
-        settings: []
     - name: event
       display_name: Segment Event Name
       type: STRING
@@ -16733,7 +16803,9 @@ items:
   slug: optimizely-full-stack
   name: catalog/destinations/optimizelyx
   url: connections/destinations/catalog/optimizely-full-stack
-  description: ''
+  description: >-
+    Optimizely Full Stack is a powerful A/B testing and feature flag tool for
+    product teams. Segment will pass events and traits to Optimizely Full Stack.
   hidden: false
   status: PUBLIC_BETA
   previous_names:
@@ -16898,7 +16970,9 @@ items:
     required: false
     description: >-
       Enable this if you want the server side integration to use Optimizely User
-      ID instead of User ID or anonymous ID in your calls
+      ID instead of User ID or anonymous ID in your calls. You can include
+      Optimizely User ID in your calls via `integrations.['Optimizely Full
+      Stack'].optimizelyUserId`.
     settings: []
   - name: useUserId
     display_name: Use User ID
@@ -19130,6 +19204,15 @@ items:
       required: false
       description: Map your Segment properties to Responsys Columns
       settings:
+      - name: columns
+        display_name: Segment Property Name
+        type: STRING
+        deprecated: false
+        required: true
+        string_validators:
+          regexp: ''
+        description: Enter the Segment Property Name.
+        settings: []
       - name: fieldName
         display_name: Responsys Column Name
         type: STRING
@@ -19163,15 +19246,6 @@ items:
         required: false
         description: Mark this property as a Primary Key in Responsys.
         settings: []
-      - name: columns
-        display_name: Segment Property Name
-        type: STRING
-        deprecated: false
-        required: true
-        string_validators:
-          regexp: ''
-        description: Enter the Segment Property Name.
-        settings: []
     - name: mapEmail
       display_name: Map Email
       type: BOOLEAN
@@ -21797,7 +21871,7 @@ items:
   url: connections/destinations/catalog/smartlook
   description: Qualitative analytics for websites
   hidden: false
-  status: PUBLIC_BETA
+  status: PUBLIC
   previous_names:
   - Smartlook
   logo:

src/_data/catalog/source_categories.yml

@@ -1,5 +1,5 @@
 # AUTOGENERATED FROM PLATFORM API. DO NOT EDIT
-# source cateogries last updated 2021-06-01 
+# source cateogries last updated 2021-06-16 
 items:
   - display_name: Server
     slug: server

src/_data/catalog/sources.yml

@@ -1,5 +1,5 @@
 # AUTOGENERATED FROM PLATFORM API. DO NOT EDIT
-# sources last updated 2021-06-01 
+# sources last updated 2021-06-16 
 items:
   - display_name: .NET
     slug: net

src/_data/products.yml

@@ -100,9 +100,17 @@ items:
     add-on: false
 - product_display_name: Destination Actions
   slug: dest-actions
-  plan-note: "Destination Actions are currently available for Free and Team plans. Actions will be available for Business plan users soon."
+  plan-note: "Destination Actions are available for all Segment plans."
   plans:
     free: true
     team: true
-    business: false
+    business: true
     add-on: false
+- product_display_name: Journeys
+  slug: journeys
+  plan-note: "Journeys is available to Personas Advanced customers"
+  plans:
+    free: false
+    team: false
+    business: true
+    add-on: true

src/_data/sidenav/main.yml

@@ -266,21 +266,21 @@ sections:
         title: Overview
       - path: /personas/audiences/account-audiences
         title: Account-level Audiences
-  # - section_title: Journeys
-  #   slug: /personas/journeys
-  #   section:
-  #     - path: /personas/journeys
-  #       title: Journeys Overview
-  #     - path: /personas/journeys/build-journey
-  #       title: Build a Journey
-  #     - path: /personas/journeys/send-data
-  #       title: Send Data to Destinations
-  #     - path: /personas/journeys/faq-best-practices
-  #       title: Journeys Best Practices and FAQ
-  #     - path: /personas/journeys/use-cases
-  #       title: Example Journeys Use Cases
-  #     - path: /personas/journeys/key-terms
-  #       title: Journeys Glossary
+  - section_title: Journeys
+    slug: /personas/journeys
+    section:
+      - path: /personas/journeys
+        title: Journeys Overview
+      - path: /personas/journeys/build-journey
+        title: Build a Journey
+      - path: /personas/journeys/send-data
+        title: Send Data to Destinations
+      - path: /personas/journeys/faq-best-practices
+        title: Journeys Best Practices and FAQ
+      - path: /personas/journeys/use-cases
+        title: Example Journeys Use Cases
+      - path: /personas/journeys/key-terms
+        title: Journeys Glossary
   - path: /personas/using-personas-data
     title: Using Personas data
   - path: /personas/warehouses

src/connections/destinations/actions.md

@@ -2,7 +2,8 @@
 title: Destination Actions
 hidden: true
 ---
-{% include content/plan-grid.md name="actions" %}
+
+{% include content/plan-grid.md name="dest-actions" %}
 
 
 > info ""
@@ -46,9 +47,9 @@ You can add or remove, disable and re-enable, and rename individual actions from
 
 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.
 
-<!-- TODO screenshot-->
+![](/docs/connections/destinations/catalog/actions-amplitude/images/amplitude-actions-tab.png)
 
-## Disable a destination actioon
+## Disable a destination action
 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.
 
 ## Delete a destination action

src/connections/destinations/add-destination.md

@@ -171,6 +171,7 @@ The sections below list the most popular multi-instance Segment destinations. Th
 For the following destinations, a single source can connect to up to 10 instances of the destination in cloud-mode, and **up to one instance in device-mode**.
 
 - [Adobe Analytics](/docs/connections/destinations/catalog/adobe-analytics/)
+- [Amplitude](/docs/connections/destinations/catalog/amplitude/)
 - [Braze](/docs/connections/destinations/catalog/braze/)
 - [Customer.io](/docs/connections/destinations/catalog/customer-io)
 - [Google Analytics](/docs/connections/destinations/catalog/google-analytics/)
@@ -191,7 +192,6 @@ For the following destinations, a single source can connect to up to 10 instance
 - [Amazon Kinesis Firehose](/docs/connections/destinations/catalog/amazon-kinesis-firehose/)
 - [Amazon Lambda](/docs/connections/destinations/catalog/amazon-lambda/)
 - [Amazon Personalize](/docs/connections/destinations/catalog/amazon-personalize/)
-- [Amplitude](/docs/connections/destinations/catalog/amplitude/)
 - [Attribution](/docs/connections/destinations/catalog/attribution/)
 - [Attune](/docs/connections/destinations/catalog/attune/)
 - [Autopilot](/docs/connections/destinations/catalog/autopilothq/)