Merge branch 'master' into digioh-oauth-flow

Author: pauljaeinyoo

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
@@ -19145,6 +19146,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 +19188,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/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/)

src/connections/destinations/catalog/google-ads-classic/index.md

@@ -2,6 +2,7 @@
 title: Google Ads (Classic) Destination
 redirect_from: '/connections/destinations/catalog/adwords/'
 strat: google
+hide-personas-partial: true
 ---
 
 Our Google Ads (Classic) destination code is open-source on GitHub if you want to check out

src/connections/destinations/catalog/personas-display-video-360/index.md

@@ -249,7 +249,8 @@ When you complete the connection between Segment and DV360, it can take from 24
 
 Google’s [documentation](https://developers.google.com/authorized-buyers/rtb/downloads/cookie-bulk-upload-proto) provides information about the accepted identifiers for this integration.
 
-- To use DV360 with web traffic, you must collect `anon``ymous``_id` through the client-side `analytics.js` Source.
+
+- To use DV360 with web traffic, you must collect `anonymous_id` through the client-side `analytics.js` Source.
 - To use DV360 with mobile traffic, you must collect  `IDFA`s through Segment’s mobile sources.
 
 

src/connections/sources/catalog/libraries/website/shopify-littledata/index.md

@@ -14,7 +14,7 @@ Littledata is available as an independent [Shopify App](https://apps.shopify.com
 
 2. The app also sets up server-side webhook forwarding to ensure 100% accuracy of important Customer and Order data.
 
-This source has a full [tracking plan and event schema](https://docs.google.com/spreadsheets/d/1JOlgpXpQ7ctktES6B_RyKn0_KxanxGF6) in Google Sheets, which is ready to [upload into Protocols](/docs/protocols/apis-and-extensions/#google-sheets-tracking-plan-uploader).
+This source has a full [tracking plan and event schema](https://docs.google.com/spreadsheets/d/1aljowRhMU9_7uGXmcipbP1Y14S4cOSdXGQA2Vx7BHko/copy) in Google Sheets, which is ready to [upload into Protocols](/docs/protocols/apis-and-extensions/#google-sheets-tracking-plan-uploader).
 
 Here's an architecture diagram that shows how the Littledata app mediates data flow between Shopify and Segment.
 
@@ -151,7 +151,7 @@ The list below outlines the properties included in the events listed above.
 | -------------------------------------- | -------------------------------------------------------------------------------------------------- | ------------- |
 | `affiliation`                          | A comma-seperated list of order tags. Untagged orders use `Shopify`                                | String        |
 | `cart_id`                              | The ID of the Shopify cart                                                                         | String        |
-| `checkoutId`                           | The ID of the checkout session                                                                     | String        |
+| `checkout_id`                          | The ID of the checkout session                                                                     | String        |
 | `context.uip`                          | The user's IP address                                                                              | String        |
 | `context['Google Analytics'].clientId` | The user's Google Analytics Client ID                                                              | String        |
 | `context['Google Analytics'].geoid`    | The user's location                                                                                | String        |
@@ -168,6 +168,7 @@ The list below outlines the properties included in the events listed above.
 | `sent_from`                            | A unique property to identify events sent by Littledata                                            | String        |
 | `shipping_method`                      | The shipping method chosen for checkout                                                            | String        |
 | `shipping`                             | The shipping cost                                                                                  | Float         |
+| `source_name`                          | The source of the order (e.g. `web`, `android`, `pos`)                                             | String        |
 | `step`                                 | The checkout [step number](https://blog.littledata.io/help/posts/shopify-checkout-funnel-updates/) | Integer       |
 | `subscription_revenue`                 | The revenue associated with a [Subscription Event](#subscription-events)                           | Float         |
 | `subtotal`                             | Order total after discounts but before taxes and shipping                                          | Float         |