Merge branch 'develop' into airship-doc-sync

Author: markzegarelli

.github/workflows/unallowed-contributions.yml

@@ -22,7 +22,7 @@ on:
 
 jobs:
   triage:
-    if: github.repository == 'segmentio/segment-docs' && github.event.pull_request.user.login != 'markzegarelli'
+    if: github.repository == 'segmentio/segment-docs' && (github.event.pull_request.user.login != 'markzegarelli' || github.event.pull_request.user.login != 'stayseesong' || github.event.pull_request.user.login != 'pwseg')
     runs-on: ubuntu-latest
     steps:
       - name: Get files changed

.vale.ini

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

src/_data/catalog/destinations.yml

@@ -7818,7 +7818,7 @@ items:
   components:
   - code: https://github.com/segmentio/integrations/tree/master/integrations/hubspot
     type: server
-  browserUnbundlingSupported: true
+  browserUnbundlingSupported: false
   browserUnbundlingPublic: true
   replay: false
   connection_modes:
@@ -8707,14 +8707,14 @@ items:
     description: Sends pages with names to FullStory as tracking events.
     required: false
     label: Track Named Pages
-- display_name: Fullstory (Actions)
-  name: Fullstory (Actions)
+- display_name: FullStory (Actions)
+  name: FullStory (Actions)
   slug: actions-fullstory
   hidden: false
   url: connections/destinations/catalog/actions-fullstory
   previous_names:
   - Fullstory
-  - Fullstory (Actions)
+  - FullStory (Actions)
   website: http://www.fullstory.com
   status: PUBLIC_BETA
   categories:

src/_data/catalog/overrides-list.yml

@@ -4,3 +4,5 @@ items:
   - google-ads-gtag
   - klaviyo
   - friendbuy
+  - google-ads-classic
+  

src/_data/catalog/overrides.yml

@@ -3,6 +3,8 @@
 items:
 - slug: hubspot
   display_name: HubSpot
+  previous_names:
+  - HubSpot
   components:
   - type: WEB
   - type: CLOUD
@@ -106,4 +108,135 @@ items:
     defaultValue: []
     description: Map your page calls to specific FriendBuy Widgets.
     required: false
-    label: Page Widgets
+    label: Page Widgets
+- slug: google-ads-classic
+  display_name: Google Ads (Classic)
+  name: Google Ads (Classic)
+  hidden: false
+  url: connections/destinations/catalog/google-ads-classic
+  previous_names:
+  - AdWords
+  - Google Ads (Classic)
+  website: https://adwords.google.com
+  status: PUBLIC
+  categories:
+  - Advertising
+  logo:
+    url: https://cdn.filepicker.io/api/file/O54PEswFQAC7ZZDLSBZ5
+  mark:
+    url: https://cdn.filepicker.io/api/file/R5kQQ2DMR0CuNdDbzPvr
+  methods:
+    track: true
+    identify: false
+    group: false
+    alias: false
+    page: true
+  platforms:
+    browser: true
+    mobile: true
+    server: true
+  components:
+  - code: https://github.com/segment-integrations/analytics.js-integration-adwords
+    type: browser
+  - code: >-
+      https://github.com/segmentio/integrations/tree/master/integrations/google-adwords
+    type: server
+  browserUnbundlingSupported: false
+  browserUnbundlingPublic: true
+  replay: false
+  connection_modes:
+    device:
+      web: true
+      mobile: false
+      server: false
+    cloud:
+      web: false
+      mobile: true
+      server: false
+    summary: >-
+      accepts data in cloud-mode from all mobile sources, and can accept data in
+      device-mode from Analytics.js sources.
+    cmode_type: mixed
+    case: '9'
+  settings:
+  - name: conversionId
+    type: string
+    defaultValue: ''
+    description: >-
+      Your AdWords conversion identifier. It looks like `983265867`. You can opt
+      to override this on a per-event basis but at the very least this
+      conversion ID will serve as the ID used in page calls.
+    required: true
+    label: Conversion ID
+  - name: correctLat
+    type: boolean
+    defaultValue: true
+    description: >-
+      Enable this to set Limit Ad Tracking to `true` when
+      context.device.adTrackingEnabled is `false`.
+    required: true
+    label: Correct LAT Behavior
+  - name: eventMappings
+    type: mixed
+    defaultValue: []
+    description: AdWords behavior for each of your Segment Events is defined here.
+    required: true
+    label: Event Mappings
+  - name: linkId
+    type: string
+    defaultValue: ''
+    description: >-
+      The AdWords Link Id associated with Segment. The process for obtaining
+      this can be found
+      [here](https://support.google.com/adwords/answer/7365001). To create this
+      Link Id, you must input Segment's Provider Id: **7552494388**
+
+
+      **Important:** this setting is required only if you are using the new
+      AdWords for mobile implementations.
+    required: true
+    label: Link Id
+  - name: pageRemarketing
+    type: boolean
+    defaultValue: false
+    description: Enable this to send a remarketing tag with your page calls
+    required: true
+    label: Page Remarketing
+  - name: trackAttributionData
+    type: boolean
+    defaultValue: false
+    description: >-
+      If this setting is enabled, Segment will send successfully attributed
+      `Application Installed` events from AdWords as `Install Attributed` events
+      back into this source. These events will contain data about the AdWords
+      campaign that lead to the conversion. You can learn more about these
+      events [here](https://segment.com/docs/spec/mobile/#install-attributed).
+
+
+      **Important:** this feature is only available if you are using the new
+      AdWords version.
+    required: true
+    label: Track Attribution Data
+  - name: version
+    type: select
+    defaultValue: ''
+    description: >-
+      The current version of your AdWords account. If you have migrated your
+      AdWords account to the **new** AdWords interface at any point, you are
+      using version 2. Otherwise, please select version 1.
+    required: true
+    label: Version
+  - name: zeroedAttribution
+    type: boolean
+    defaultValue: false
+    description: >-
+      With the update to use analytics-ios v4.x SDK if adTrackingEnabled is set
+      to false, the advertisingId key will be deleted from the event. These
+      events will fail when sent to Google Adwords. To prevent these event
+      failures in this scenario enable this setting to set the IDFA to be zero'd
+      out (ie. '00000000-0000-0000-0000-000000000000') when sent to Google
+      Adwords. 
+    required: false
+    label: >-
+      Fallback to Zeroed IDFA when advertisingId key not present (Server-Side
+      Only)

src/_data/sidenav/strat.yml

@@ -71,8 +71,9 @@ sections:
   section:
   - path: /connections/destinations/catalog/salesforce
     title: Salesforce destination
-  - path: /connections/destinations/catalog/salesforce-live-agent
-    title: Salesforce Live Agent destination
+  # This is in Private Beta
+  # - path: /connections/destinations/catalog/salesforce-live-agent
+  #   title: Salesforce Live Agent destination
   - path: /connections/destinations/catalog/salesforce-marketing-cloud
     title: Salesforce Marketing Cloud destination
   - path: /connections/destinations/catalog/salesforce-dmp

src/connections/destinations/actions.md

@@ -20,7 +20,8 @@ Each Actions-framework Destination you see in the Segment catalog represents a f
 - [Braze (Actions) Web](/docs/connections/destinations/catalog/actions-braze-web)
 - [Braze (Actions) Cloud](/docs/connections/destinations/catalog/actions-braze-cloud)
 - [Slack (Actions)](/docs/connections/destinations/catalog/actions-slack)
-- [Fullstory (Actions)](/docs/connections/destinations/catalog/actions-fullstory)
+- [FullStory (Actions)](/docs/connections/destinations/catalog/actions-fullstory)
+- [Customer.io (Actions)](/docs/connections/destinations/catalog/actions-customer-io)
 
 ## Destination Actions compatibility
 

src/connections/destinations/catalog/actions-customer-io/index.md

@@ -3,8 +3,6 @@ title: Customer.io (Actions) Destination
 hide-personas-partial: true
 hide-boilerplate: true
 hide-dossier: true
-hidden: true
-published: false
 ---
 {% include content/plan-grid.md name="actions" %}
 

src/connections/destinations/catalog/actions-fullstory/index.md

@@ -1,5 +1,5 @@
 ---
-title: Fullstory (Actions)
+title: FullStory (Actions)
 hide-boilerplate: true
 hide-dossier: true
 ---

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

@@ -76,8 +76,7 @@ This approach provides a redundancy that ensures maximum signal reliability. Eve
 
 #### Match rate considerations
 
-For this option to work best, you must pass the same `external_id` from both the browser and the server sources.
-To do this, go to your Facebook Pixel destination settings in Segment, and enable **Use UserId or Anonymous Id as External Id**. By default the Facebook Conversions API destination uses the `userId` (or `anonymousId` if not present) to set the External Id, so when you set up Facebook Pixel to use the same settings, Facebook can then match the users.
+For this option to work best, pass the same `external_id` from the browser and the server. To achieve this, go to the Facebook Pixel destination settings in Segment and enable the **Enable Advanced Matching** and **Use User ID or Anonymous ID as External ID** settings. By default, the Facebook Conversions API destination uses the `userId` (or `anonymousId` if not present) to set the `external_id`, so when you configure Facebook Pixel to use the same settings, Facebook matches users by those IDs.
 
 You can also increase the match rate for events from a server source by sending [user traits in the context object of the track events](#default-mappings-to-facebook-properties). You can also collect other fields from the browser, such as `userAgent`, `ip` address, and [Facebook's parameters (fbp, fbc)](https://developers.facebook.com/docs/marketing-api/conversions-api/parameters/fbp-and-fbc) and pass them to the server, and manually add them to the events.
 
@@ -91,9 +90,9 @@ Use this approach if you want to separate tracking events completed on a user's
 
 #### Match rate considerations
 
-For this option to work best, the same `external_id` needs to be passed from the browser and from the server. To easily achieve this go to your Segment destination settings for Facebook Pixel and toggle on the setting called **Use UserId or Anonymous Id as External Id**. The Facebook Conversions API destination uses the userId (or anonymousId if not present) to set the External Id by default. Therefore enabling this on Facebook Pixel will allow Facebook to match the users.
+For this option to work best, the same `external_id` needs to be passed from the browser and the server. To achieve this, go to your Facebook Pixel destination settings in Segment and enable the **Enable Advanced Matching** and **Use User ID or Anonymous ID as External ID** settings. By default the Facebook Conversions API destination uses the `userId` (or `anonymousId` if not present) to set the `external_id`, so when you set up Facebook Pixel to use the same settings, Facebook can then match the users.
 
-You can also increase the match rate for events from a server source by sending [user traits in the context object of the track events](#default-mappings-to-facebook-properties). You can also collect other fields from the browser, such as `userAgent`, `ip` address, and [Facebook's parameters (fbp, fbc)](https://developers.facebook.com/docs/marketing-api/conversions-api/parameters/fbp-and-fbc) and pass them to the server, and manually add them to the events.
+You can also send [user traits in the context object of the track events](#default-mappings-to-facebook-properties)to increase the match rate for events from a server source. Collect other fields from the browser, like `userAgent`, `ip` address, and [Facebook's parameters (fbp, fbc)](https://developers.facebook.com/docs/marketing-api/conversions-api/parameters/fbp-and-fbc){:target="_blank"}, pass them to the server, and manually add them to the events.
 
 #### Deduplication considerations
 
@@ -124,7 +123,7 @@ For more information about Track calls, see the [Track method](/docs/connections
 
 Beginning February 15th 2021, Facebook requires the `action_source` server event parameter for all events sent to the Conversions API. This parameter is used to specify where the conversions occurred. If `action_source` is set to 'website' then the `client_user_agent` and the `event_source_url` parameters are also required. Events sent to the Conversions API after February 15th that do not meet the requirements may not be available for optimization, targeting, or measurement.
 
-| Server Event Parameter | Requirement                                 | Implementation                                                                                       |
+| Server Event Parameter | Requirement                                 | Implementation                 p                                                                      |
 | ---------------------- | ------------------------------------------- | ---------------------------------------------------------------------------------------------------- |
 | `action_source`        | Always required                             | It is set automatically but it can be set manually.                                                  |
 | `client_user_agent`    | Only required if `action_source` = "website" | It must be set manually if using a server library. It is set automatically if using the Segment web library. |
@@ -139,7 +138,7 @@ You can set `action_source` manually by passing it as a property of a Track even
 
 | Action Source Values | Description                                                                                               |
 | -------------------- | --------------------------------------------------------------------------------------------------------- |
-| `chat`               | Conversion was made via a messaging app, SMS, or online messaging feature.                                |
+| `chat`               | Conversion was made through a messaging app, SMS, or online messaging feature.                                |
 | `email`              | Conversion happened over email.                                                                           |
 | `other`              | Conversion happened in a way that is not listed.                                                          |
 | `phone_call`         | Conversion was made over the phone.                                                                       |
@@ -265,18 +264,18 @@ analytics.track("Clicked Email", {
 ```
 
 ### Custom Mappings to Facebook Properties
-Any properties you send that aren't listed above are sent in the 'Custom Data' part of the Segment payload to Facebook.
+Any properties you send that aren't listed above are sent in the `custom_data` part of the Segment payload to Facebook.
 
 ### Alternative External IDs
 
-By default, Segment sends the `userID` as `externalID`, and if `userID` is absent falls back to `anonymousID`. To use a different field in your payload as the External ID, use the "Alternative External ID Field". An example value for this setting would be `properties.externalId`.
+By default, Segment sends the `userId` as `external_id`, and if `userId` is absent falls back to `anonymousId`. To use a different field in your payload as the `external_id`, use the **Alternative External ID Field** setting. An example value for this setting would be `properties.externalId`.
 
-### Alternative "Value" Properties
+### Alternative Value Properties
 
 For most events Segment sends revenue for the Pixel value field, but for
-the pre-purchase events "Product Viewed" and "Product Added", Segment
-uses the value of the "Value Field Identifier" setting to determine which
-property to use for the "value" field. This field defaults to
+the pre-purchase events `Product Viewed` and `Product Added`, Segment
+uses the value of the **Value Field Identifier** setting to determine which
+property to use for the `value` field. This field defaults to
 `price`.
 
 ## Limited Data Use
@@ -313,7 +312,7 @@ minutes. You can confirm that Facebook received them:
 
 1.   Go to the Events Manager.
 2.   Click on the corresponding pixel.
-3.   In the **Overview** tab, look for events where the "Connection Mode" is `Server`.
+3.   In the **Overview** tab, look for events where the "Connection Method" is `Server`.
 
 > info ""
 > **Note**: It might take a few minutes before events appear in the Events Manager.