merge master

markzegarelli · markzegarelli · commit 8db73676189f · 2021-06-23T14:43:48.000-07:00
diff --git a/src/_data/catalog/destinations.yml b/src/_data/catalog/destinations.yml
@@ -13046,6 +13046,81 @@ items:
       Cloud Mode or send track events from one of our server side libraries. Use
       these fields to map your Segment track event names to Marketo Custom
       Activities. We'll only send events that you specify.
+<<<<<<< HEAD
+=======
+    settings:
+    - name: marketoActivityId
+      display_name: Marketo Custom Activity ID
+      type: STRING
+      deprecated: false
+      required: true
+      string_validators:
+        regexp: '^[0-9]+$'
+      description: Enter the Marketo Custom Activity ID. This must be an Integer.
+      settings: []
+    - name: segmentProperty
+      display_name: Marketo Fields
+      type: MIXED
+      deprecated: false
+      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
+        deprecated: false
+        required: true
+        string_validators:
+          regexp: ''
+        description: >-
+          Enter the Segment Property Name. This is case sensitive so make sure
+          the name matches exactly how you are passing it in your .track() call.
+        settings: []
+      - name: marketoAttributeName
+        display_name: Marketo Field Name
+        type: STRING
+        deprecated: false
+        required: true
+        string_validators:
+          regexp: ''
+        description: >-
+          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: event
+      display_name: Segment Event Name
+      type: STRING
+      deprecated: false
+      required: true
+      string_validators:
+        regexp: ''
+      description: Enter the Segment Event Name.
+      settings: []
+  - name: traits
+    display_name: Marketo Custom Fields
+    type: MIXED
+    deprecated: false
+>>>>>>> master
     required: false
   - name: privateKey
     type: string
@@ -17041,7 +17116,124 @@ items:
     description: >-
       Use these fields to map your Segment event names to Responsys Supplemental
       Tables. We'll only send events and properties that you specify.
-    required: false
+<<<<<<< HEAD
+    required: false
+=======
+    settings:
+    - name: columns
+      display_name: Columns
+      type: MIXED
+      deprecated: false
+      required: false
+      description: Map your Segment properties to Responsys Columns
+      settings:
+      - name: fieldName
+        display_name: Responsys Column Name
+        type: STRING
+        deprecated: false
+        required: true
+        string_validators:
+          regexp: ''
+        description: Enter the Responsys column name.
+        settings: []
+      - name: fieldType
+        display_name: Responsys Column Type
+        type: SELECT
+        deprecated: false
+        required: true
+        select_validators:
+          select_options:
+          - CHAR
+          - STR25
+          - STR100
+          - STR500
+          - STR4000
+          - Number
+          - INTEGER
+          - TIMESTAMP
+        description: Enter the Responsys column type.
+        settings: []
+      - name: primaryKey
+        display_name: Set as Primary Key
+        type: BOOLEAN
+        deprecated: false
+        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
+      deprecated: false
+      required: false
+      description: >-
+        Check this box if you want to automatically create and or map Segment's
+        `email` property (in `context.traits.email` or `properties.email`) as a
+        column in Responsys. Highly **recommended** if you are calling
+        `.identify()` with an `email` trait for anonymous users without
+        `userId`s.
+      settings: []
+    - name: mapUserId
+      display_name: Map Segment UserId
+      type: BOOLEAN
+      deprecated: false
+      required: false
+      description: >-
+        Check this box if you want to automatically create and or map Segment's
+        `userId` field as a column in Responsys. Highly **recommended** if you
+        want to connect records in your Profile Lists/Extension Tables with
+        records in this Supplemental Table.
+      settings: []
+    - name: folderName
+      display_name: Responsys Folder Name
+      type: STRING
+      deprecated: false
+      required: true
+      string_validators:
+        regexp: ''
+      description: >-
+        Optional. Enter a Responsys Folder Name where this Supplemental exists
+        or where you'd like one to be created. If this input is left blank, we
+        will fallback on the default Folder Name you've provided at the top
+        level settings.
+      settings: []
+    - name: suppName
+      display_name: Responsys Supplemental Table Name
+      type: STRING
+      deprecated: false
+      required: true
+      string_validators:
+        regexp: ''
+      description: Enter a Responsys Supplemental Table Name.
+      settings: []
+    - name: event
+      display_name: Segment Event Name
+      type: STRING
+      deprecated: false
+      required: true
+      string_validators:
+        regexp: ''
+      description: Enter the Segment Event Name.
+      settings: []
+    - name: useSegmentMsgId
+      display_name: Use Segment Message ID
+      type: BOOLEAN
+      deprecated: false
+      required: false
+      description: >-
+        Use Segment's `messageId` as one of the four Primary Keys to easily
+        ensure that you do not overwrite historical records in your Supplemental
+        Tables.
+      settings: []
+>>>>>>> master
   - name: folderName
     type: string
     defaultValue: ''
@@ -18319,8 +18511,7 @@ items:
   - Customer Success
   - Raw Data
   logo:
-    url: >-
-      https://public-segment-devcenter-production.s3.amazonaws.com/aa62411e-8a50-467b-9b76-edb083819144.svg
+    url: 'https://cdn.filepicker.io/api/file/MLWgTbepQSGONWcv6NFu'
   mark:
     url: >-
       https://public-segment-devcenter-production.s3.amazonaws.com/97c63f06-f139-44dc-9524-ba287a1d2900.svg
diff --git a/src/connections/destinations/catalog/crisp/index.md b/src/connections/destinations/catalog/crisp/index.md
@@ -0,0 +1,4 @@
+---
+title: 'Crisp Destination'
+hidden: true
+--- %}
diff --git a/src/connections/destinations/catalog/wootric-by-inmoment/index.md b/src/connections/destinations/catalog/wootric-by-inmoment/index.md
@@ -1,5 +1,5 @@
 ---
-title: Wootric by InMoment by InMoment Destination
+title: Wootric by InMoment Destination
 rewrite: true
 redirect_from: '/connections/destinations/catalog/wootric/'
 ---
diff --git a/src/personas/audiences/account-audiences.md b/src/personas/audiences/account-audiences.md
@@ -100,6 +100,7 @@ For example, you may wish to create an audience which selects all admin-level us
 
 ## Known limitations of account-level audiences
 
+- Unlike user-level audiences which are [computed in real time](/docs/personas/audiences#realtime-compute-vs-batch), account-level audiences are computed on an hourly, batched basis.
 - Account-level audiences do not respect the `context.groupId` property on track calls. If users are associated with multiple accounts (through multiple group calls), the entire collection of a user’s events is considered when evaluating user-level event conditions (not just those events which are tagged with a matching `groupId`). This can lead to unexpected results where a user’s events triggered in the context of one account lead to another account incorrectly matching an account-level audience.
 - The identity breakdown report (displayed in the audience builder for user-level audiences) is not available for account-level audiences.
 

-Original file line number
+Diff line change
@@ @@ -0,0 +1,4 @@ @@
 +---
 +title: 'Crisp Destination'
 +hidden: true
 +--- %}