Merge branch 'develop' into DOC-460-IF

Author: forstisabella

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 %}
 
@@ -34,8 +34,9 @@
   <div class="qi-content">
 <h6>Destination Info</h6>
 <ul class="qi">
-  {% if destMethods.size > 0 %}<li>Accepts {% for method in destMethods%}{% if destMethods.size == 1 %}{{method}} calls.{% else %}{% unless forloop.last == true %}{{method}}, {% endunless %}{% if forloop.last == true%}and {{method}} calls.{%endif%}{% endif %}{% endfor %}</li>{% endif %}
+  {% if destMethods.size > 0 %}<li>Accepts {% for method in destMethods%}{% if destMethods.size == 1 %}{{method}} calls.{% else %}{% unless forloop.last == true %}{{method}}, {% endunless %}{% if forloop.last == true%}and {{method}} calls{%endif%}{% endif %}{% endfor %}</li>{% endif %}
   <li>Referred to as <strong>{{destinationInfo.previous_names | join: '</strong>, or <strong>' }}</strong> in the <a href="/docs/guides/filtering-data/#filtering-with-the-integrations-object">Integrations object</a></li>
+  {% if destinationInfo.status == "PUBLIC_BETA" %}<li>This destination is in <span class="release-pill">Beta</span></li>{% endif %}
 </ul>
 {% if components.size > 0%}
 

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/_sass/components/_quickinfo.scss

@@ -10,6 +10,16 @@
     padding: 10px;
   }
 
+  .release-pill {
+    background-color:#E7E4F9;
+    color: #6E62B6;
+    text-transform: uppercase;
+    font-weight: 600;
+    padding: 0px 6px;
+    border-radius: 4px
+
+  }
+
   @include breakpoint(small down)  {
     max-width: 100%;
     float: none;
@@ -55,7 +65,7 @@
     font-size: 14px;
     line-height: 24px;
   }
-  ul li:first-of-type {
+  ul li:not(:last-of-type) {
     margin-bottom: 16px;
   }
   ul li:before{

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

@@ -9,11 +9,12 @@ 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. Feel free to check it out:
-- [JavaScript](https://github.com/segmentio/analytics.js-integrations/tree/master/integrations/amplitude)
-- [iOS](https://github.com/segment-integrations/analytics-ios-integration-amplitude)
-- [Android](https://github.com/segment-integrations/analytics-android-integration-amplitude)
-
+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"}
+- [Kotlin](https://github.com/segment-integrations/analytics-kotlin-amplitude){:target="_blank"}
+- [Swift](https://github.com/segment-integrations/analytics-swift-amplitude){:target="_blank"} 
 
 In addition to the docs below, Amplitude created a [integration guide](https://developers.amplitude.com/docs/segment-amplitude-integration).
 

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

@@ -5,6 +5,12 @@ 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 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"}
+- [Swift](https://github.com/segment-integrations/analytics-swift-appsflyer){:target="_blank"} 
+
 ## Getting Started
 
 {% include content/connection-modes.md %}

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

@@ -5,10 +5,14 @@ id: 579a568e80412f644ff19cf7
 ---
 Firebase is Google's platform for mobile apps. The Segment Firebase destination requires that you bundle the Firebase SDK with your project. The Segment-wrapped destination code then runs on the user's device, and sends its tracking calls to the Firebase API endpoints, and a copy to Segment for archiving.
 
-
 > 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 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"}
+- [Swift](https://github.com/segment-integrations/analytics-swift-firebase){:target="_blank"} 
 
 ## Getting Started on Android
 
@@ -112,43 +116,6 @@ If you use Segment's React Native source library, you must explicitly bundle the
 4. Change to your iOS directory and run `pod install`.
 5. Add the `analytics-react-native-firebase` module to your `build.gradle` file. (See Step.4 of [Getting Started on Android](/docs/connections/destinations/catalog/firebase/#getting-started-on-android))
 
-
-## Setting up Firebase with Analytics-Kotlin
-If you're using the [Analytics-Kotlin library](/docs/connections/sources/catalog/libraries/mobile/kotlin-android), follow these steps to set up Firebase with Analytics-Kotlin:
-1. In your top-level `build.gradle` file add these lines:
-    ```kotlin  
-    buildscript {
-        ...
-        repositories {
-            google()
-        }
-        dependencies {
-            ...
-            classpath 'com.google.gms:google-services:4.3.5'
-        }
-    }
-    ```    
-2. In your app-module `build.gradle` file add these lines:
-    ```kotlin
-    ...
-    plugins {
-        id 'com.google.gms.google-services'
-    }
-
-    dependencies {
-        ...
-        implementation platform('com.google.firebase:firebase-bom:28.2.1')
-        implementation 'com.google.firebase:firebase-analytics-ktx'
-    }
-    ```
-3. Copy the [FirebaseDestination.kt](https://github.com/segmentio/analytics-kotlin/blob/main/samples/kotlin-android-app-destinations/src/main/java/com/segment/analytics/destinations/plugins/FirebaseDestination.kt) file into your project's codebase.
-4. Copy your `google-service.json` file to your app-module.
-5. Go to your project's codebase and add these lines where you intialize the analytics client:
-    ```kotlin
-    val Firebase = FirebaseDestination()
-    analytics.add(Firebase)
-    ```
-
 ## Identify
 
 When you call `identify` Segment will map to the corresponding Firebase Analytics calls:
@@ -273,7 +240,7 @@ Then, enter the deep link URL scheme in your Segment Firebase destination settin
 
 ### **Conversion Tracking and Adwords Conversions**
 
-Firebase is Google's recommended method for reporting conversions to Adwords. To use Firebase, track the conversion events as you normally would with Segment and Segment will send them through to Firebase. 
+Firebase is Google's recommended method for reporting conversions to Adwords. To use Firebase, track the conversion events as you normally would with Segment and Segment will send them through to Firebase.
 
 ### Troubleshooting