Merge branch 'master' into DOC-441

Author: stayseesong

src/_data/catalog/overrides.yml

@@ -2,7 +2,7 @@
 # it from the `overrides-list.yml` too.
 items:
 - slug: criteo-app-web-events
-  connection_modes:
+  id: 5787cc5180412f644ff14d7e
   connection_modes:
     device:
       web: true
@@ -13,6 +13,7 @@ items:
       mobile: true
       server: false
 - slug: doubleclick-floodlight
+  id: 57ab9dfc80412f644ff2004c
   connection_modes:
     device:
       web: true
@@ -23,6 +24,7 @@ items:
       mobile: true
       server: true
 - slug: intercom
+  id: 54521fd725e721e32a72eec6
   connection_modes:
     device:
       web: true
@@ -33,6 +35,7 @@ items:
       mobile: true
       server: true
 - slug: hubspot
+  id: 54521fd725e721e32a72eec1
   display_name: HubSpot
   previous_names:
   - HubSpot
@@ -53,6 +56,7 @@ items:
     cmode_type: mixed
     case: '6'
 - slug: iterable
+  id: 54521fd925e721e32a72eecc
   display_name: Iterable
   components:
   - type: WEB
@@ -71,9 +75,11 @@ items:
     cmode_type: mixed
     case: '5'
 - slug: google-ads-gtag
+  id: 5a03bfe73156760001ab34ec
   previous_names:
   - Google AdWords New
 - slug: klaviyo
+  id: 54521fd825e721e32a72eec8
   display_name: Klaviyo
   previous_names:
   - Klaviyo
@@ -96,9 +102,12 @@ items:
     cmode_type: mixed
     case: '10'
 - slug: friendbuy
-  display_name: Friendbuy
+  id: 59ce9468cf711e00014a9c12
+  display_name: Friendbuy (Legacy)
+  name: Friendbuy (Legacy)
   previous_names:
   - FriendBuy
+  - Friendbuy (Legacy)
   components:
   - code: https://github.com/segment-integrations/analytics.js-integration-friendbuy
     type: browser
@@ -143,6 +152,7 @@ items:
     required: false
     label: Page Widgets
 - slug: google-ads-classic
+  id: 54521fd525e721e32a72ee92
   display_name: Google Ads (Classic)
   name: Google Ads (Classic)
   hidden: false

src/_data/sidenav/main.yml

@@ -219,6 +219,8 @@ sections:
         title: Redshift Cluster and Redshift Connector Limitations
       - path: /connections/storage/warehouses/redshift-tuning
         title: Speeding Up Redshift Queries
+      - path: /connections/storage/warehouses/redshift-useful-sql
+        title: Useful SQL Queries for Redshift
   - path: /connections/test-connections
     title: Testing Connections
   - path: /connections/data-export-options

src/_includes/content/destination-dossier.html

@@ -1,7 +1,7 @@
 <!-- in the file we're pulling from the API, "name" corresponds with the path to the yml blob for a specific destination.-->
 {% assign thisDestination = page.id %}
 
-{% assign overrideInfo = site.data.catalog.overrides.items % | where: "slug", thisDestination | first %}
+{% assign overrideInfo = site.data.catalog.overrides.items % | where: "id", thisDestination | first %}
 
 {% assign destinationInfo = site.data.catalog.destinations.items | where: "id", thisDestination | first %}
 

src/_includes/content/how-a-sync-works.md

@@ -0,0 +1,3 @@
+When Segment loads data into your warehouse, each sync goes through two steps:
+1. **Ping:** Segment servers connect to your warehouse. For Redshift warehouses, Segment also runs a query to determine how many slices a cluster has. Common reasons a sync might fail at this step include a blocked VPN or IP, a warehouse that isn't set to be publicly accessible, or an issue with user permissions or credentials. 
+2. **Load:** Segment de-duplicates the transformed data and loads it into your warehouse. If you have queries set up in your warehouse, they run after the data is loaded into your warehouse. 

src/_includes/content/spec-field-anonymous-id.md

@@ -1,9 +1,9 @@
 <tr>
   <td markdown="span">`anonymousId`</td>
-  <td markdown="span">*optional if userID is set instead*</td>
+  <td markdown="span">*required; optional if `userID` is set instead*</td>
   <td markdown="span">String</td>
-  <td markdown="span">A pseudo-unique substitute for a User ID, for cases when you don't have an absolutely unique identifier. A userId or an anonymousId is required.
-  
+  <td markdown="span">A pseudo-unique substitute for a User ID, for cases when you don't have an absolutely unique identifier. A `userId` or an `anonymousId` is required.
+
   See the [Identities docs](/docs/connections/spec/identify#identities) for more details.
   </td>
 </tr>

src/_includes/content/spec-field-user-id.md

@@ -1,10 +1,10 @@
 <tr>
   <td markdown="span">`userId`</td>
-  <td markdown="span">*optional if anonymousID is set instead*</td>
+  <td markdown="span">*required; optional if `anonymousID` is set instead*</td>
   <td markdown="span">String</td>
   <td markdown="span">Unique identifier for the user in your database.
 
-  A userId or an anonymousId is required.
+  A `userId` or an `anonymousId` is required.
 
   See the [Identities docs](/docs/connections/spec/identify#identities) for more details.
   </td>

src/_includes/content/spec-table-header.md

@@ -1,6 +1,8 @@
+<thead>
 <tr>
   <th>Field</th>
   <th></th>
   <th>Type</th>
   <th>Description</th>
 </tr>
+</thead>

src/_sass/components/_markdown.scss

@@ -308,10 +308,10 @@
 
 }
 
-a[target="_blank"]:not(.reference-button):after {
-  content: url("/docs/images/external-link-alt-solid.svg");
-  margin-left: 4px;
-}
+//a[target="_blank"]:not(.reference-button):after {
+  //content: url("/docs/images/external-link-alt-solid.svg");
+//  margin-left: 4px;
+//}
 
 a.no-icon[target="_blank"]:after {
   content: none
@@ -436,4 +436,4 @@ div.highlighter-rouge {
   color: black;
   font-weight: bold;
   margin-left: 3px
-}
+}

src/connections/destinations/catalog/amplitude/index.md

@@ -9,7 +9,7 @@ platform for your web and mobile apps. By analyzing the actions your users
 perform, you can gain a better understanding to drive retention, engagement,
 and conversion.
 
-Segment's Amplitude destination code is open source and available on GitHub. You can view these repos:
+Segment's Amplitude destination code is open source and available on GitHub. You can view these repositories:
 - [Android](https://github.com/segment-integrations/analytics-android-integration-amplitude){:target="_blank"}
 - [iOS](https://github.com/segment-integrations/analytics-ios-integration-amplitude){:target="_blank"}
 - [JavaScript](https://github.com/segmentio/analytics.js-integrations/tree/master/integrations/amplitude){:target="_blank"}

src/connections/destinations/catalog/appsflyer/index.md

@@ -5,7 +5,7 @@ id: 54521fd525e721e32a72ee8f
 ---
 [AppsFlyer](https://www.appsflyer.com/) is the world's leading mobile attribution & marketing analytics platform, helping app marketers around the world make better decisions. Our AppsFlyer destination code is open-source. You can browse the code on GitHub for [iOS](https://github.com/AppsFlyerSDK/segment-appsflyer-ios) and [Android](https://github.com/AppsFlyerSDK/AppsFlyer-Segment-Integration).
 
-Segment's Appsflyer destination code is open source and available on GitHub. You can view these repos:
+Segment's Appsflyer destination code is open source and available on GitHub. You can view these repositories:
 - [Android](https://github.com/AppsFlyerSDK/appsflyer-segment-android-plugin){:target="_blank"}
 - [iOS](https://github.com/AppsFlyerSDK/segment-appsflyer-ios){:target="_blank"}
 - [Kotlin](https://github.com/segment-integrations/analytics-kotlin-appsflyer){:target="_blank"}

src/connections/destinations/catalog/firebase/index.md

@@ -8,7 +8,7 @@ Firebase is Google's platform for mobile apps. The Segment Firebase destination
 > info ""
 > As of October 2019, Firebase replaced the legacy version of Google Analytics Classic for mobile devices. (If you used Google Analytics for mobile, see the [migration guide](/docs/connections/destinations/catalog/google-analytics/migrating/).)
 
-Segment's Firebase destination code is open source and available on GitHub. You can view these repos:
+Segment's Firebase destination code is open source and available on GitHub. You can view these repositories:
 - [Android](https://github.com/segment-integrations/analytics-android-integration-firebase){:target="_blank"}
 - [iOS](https://github.com/segment-integrations/analytics-ios-integration-firebase){:target="_blank"}
 - [Kotlin](https://github.com/segment-integrations/analytics-kotlin-firebase){:target="_blank"}

src/connections/destinations/catalog/mixpanel/index.md

@@ -6,7 +6,7 @@ id: 54521fd925e721e32a72eed6
 ---
 [Mixpanel](https://mixpanel.com/?utm_source=segmentio&utm_medium=docs&utm_campaign=partners) is an event tracking and segmentation platform for your web and mobile apps. By analyzing the actions your users perform, you can gain a better understanding to drive retention, engagement, and conversion. The client-side Mixpanel Destination code is open-source.
 
-Segment's Mixpanel destination code is open source and available on GitHub. You can view these repos:
+Segment's Mixpanel destination code is open source and available on GitHub. You can view these repositories:
 - [Analytics.js in Device-mode](https://github.com/segmentio/analytics.js-integrations/tree/master/integrations/mixpanel){:target="_blank"}
 - [Android](https://github.com/segment-integrations/analytics-android-integration-mixpanel){:target="_blank"}
 - [iOS](https://github.com/segment-integrations/analytics-ios-integration-mixpanel){:target="_blank"}

src/connections/destinations/catalog/tiktok-conversions/index.md

@@ -44,6 +44,10 @@ The TikTok Conversions destination is configured to use the TikTok Events API. T
 
 ## FAQ & Troubleshooting
 
+### Deduplication with the TikTok Pixel
+
+If you independently placed the TikTok Pixel on your website, please reach out to your TikTok representative to see if there are any necessary changes to your Pixel to properly deduplicate events sent through both the Pixel and the Segment TikTok Conversions destination.
+
 ### Match Keys
 
 To increase the probability of matching website visitor events with TikTok ads, please send one or more of the following match keys and identifiers when possible:
@@ -75,4 +79,4 @@ You can check whether the integration is working, test events in real-time, and
 ## Support
 
 - For general Segment questions, including issues with event data not being sent to TikTok Events Manager, please contact [Segment support](https://segment.com/help/){:target="_blank"}.
-- For questions regarding campaign setup and performance, web tracking, or additional API functionality, please contact your TikTok representative.
+- For questions regarding campaign setup and performance, web tracking, or additional API functionality, please contact your TikTok representative.