Merge branch 'digioh-oauth-flow' of ssh://github.com/segmentio/segment-docs into digioh-oauth-flow

Author: Paul Yoo

scripts/ignore.sh

@@ -28,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-08 
+# destination categories last updated 2021-06-15 
 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-08 
+# destination data last updated 2021-06-15 
 items:
 - display_name: ActiveCampaign
   slug: activecampaign
@@ -10099,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
@@ -12991,8 +12992,8 @@ items:
   categories:
   - Email Marketing
   methods:
-    alias: true
-    group: true
+    alias: false
+    group: false
     identify: true
     page_view: true
     track: true
@@ -14558,6 +14559,26 @@ items:
       required: false
       description: Map your Segment properties to the Marketo Activity Fields
       settings:
+      - name: marketoAttributeType
+        display_name: Marketo Field Type
+        type: SELECT
+        deprecated: false
+        required: true
+        select_validators:
+          select_options:
+          - string
+          - boolean
+          - number
+          - 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: segmentProperty
         display_name: Segment Property Name
         type: STRING
@@ -14580,26 +14601,6 @@ items:
           Enter the Marketo Field name. Make sure to copy and paste the exact
           API Name for your field as it appears in Marketo.
         settings: []
-      - name: marketoAttributeType
-        display_name: Marketo Field Type
-        type: SELECT
-        deprecated: false
-        required: true
-        select_validators:
-          select_options:
-          - string
-          - boolean
-          - number
-          - 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
@@ -16748,7 +16749,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:
@@ -16913,7 +16916,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
@@ -19145,6 +19150,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
@@ -19178,15 +19192,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

src/_data/catalog/source_categories.yml

@@ -1,5 +1,5 @@
 # AUTOGENERATED FROM PLATFORM API. DO NOT EDIT
-# source cateogries last updated 2021-06-08 
+# source cateogries last updated 2021-06-15 
 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-08 
+# sources last updated 2021-06-15 
 items:
   - display_name: .NET
     slug: net

src/_data/products.yml

@@ -106,3 +106,11 @@ items:
     team: true
     business: false
     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/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/)