Merge branch 'develop' into big-query-docs-update

forstisabella · forstisabella · commit 5855490e1495 · 2022-06-01T12:57:35.000-04:00
diff --git a/.github/Vocab/Docs/accept.txt b/.github/Vocab/Docs/accept.txt
@@ -70,6 +70,7 @@ Optimizely
 performant
 Preact
 Shopify
+Skalin
 Smartly
 Subnet
 svg
diff --git a/src/_data/catalog/destinations.yml b/src/_data/catalog/destinations.yml
@@ -35124,7 +35124,7 @@ items:
   display_name: Skalin
   name: Skalin
   slug: skalin
-  hidden: true
+  hidden: false
   endpoints:
   - us
   regions:
diff --git a/src/connections/destinations/catalog/actions-google-analytics-4/index.md b/src/connections/destinations/catalog/actions-google-analytics-4/index.md
@@ -128,3 +128,7 @@ The Google Analytics 4 [debug mode](https://support.google.com/analytics/answer/
 ### Mobile Data
 
 Google recommends use of their Firebase SDKs to send mobile data to Google Analytics 4. To assist in your implementation, Segment has a [Firebase destination](/docs/connections/destinations/catalog/firebase) available for mobile analytics. For more information on linking Google Analytics 4 properties to Firebase, see [Google Analytics 4 Firebase integration](https://support.google.com/analytics/answer/9289234?hl=en){:target="_blank"}. Segment's Google Analytics 4 destination is currently only compatible with web streams.
+
+### Reserved Names
+
+Google reserves certain event names, parameters, and user properties. Google silently drops any events that include [these reserved names](https://developers.google.com/analytics/devguides/collection/protocol/ga4/reference?client_type=gtag#reserved_names){:target="_blank"}. If you notice that your data isn't appearing in Google, please check that you're not using a reserved name.
diff --git a/src/connections/destinations/catalog/actions-google-enhanced-conversions/index.md b/src/connections/destinations/catalog/actions-google-enhanced-conversions/index.md
@@ -6,13 +6,6 @@ hide-dossier: false
 id: 60ae8b97dcb6cc52d5d0d5ab
 ---
 
-> info ""
-> This document is about a feature that is in beta. This means that the destination is in active development, and some functionality may change before it becomes generally available.
-
-> success ""
-> **Good to know**: This page is about the [Actions-framework](/docs/connections/destinations/actions/) Google Enhanced Conversions Segment destination. 
-
-
 The Google Enhanced Conversions destination enables you to improve the accuracy of your conversion measurement. You can supplement existing conversion tags by sending first-party customer conversion data from your website, such as email address, to Google Ads. Segment hashes this data and sends it in a privacy-safe way. Google matches hashed data with signed-in Google accounts to attribute the conversion to ad events, such as clicks or views. To learn more about Google Enhanced Conversions, see Google's documentation [About enhanced conversions](https://support.google.com/google-ads/answer/9888656?hl=en-GB){:target="_blank"}.
 
 > warning "Before you begin"
diff --git a/src/connections/destinations/catalog/skalin/index.md b/src/connections/destinations/catalog/skalin/index.md
@@ -0,0 +1,79 @@
+---
+title: Skalin Destination
+id: 6256de4a1fe40d47ffb0b707
+---
+
+
+[Skalin](https://skalin.io/?utm_source=segmentio&utm_medium=docs&utm_campaign=partners){:target="_blank"} calculates your customer health score and alerts you as needed. This allows you to be more proactive, save time, and generate more revenue.
+
+This destination is maintained by Skalin. For any issues with the destination, [contact the Skalin Support team](mailto:contact@skalin.io).
+
+
+## Getting Started
+
+{% include content/connection-modes.md %} 
+
+1. From the Destinations catalog page in the Segment App, click **Add Destination**.
+2. Search for **Skalin** in the Destinations Catalog, and select the **Skalin** destination.
+3. Choose which Source should send data to the Skalin destination.
+4. Go to the [Segment integration page in the Skalin platform](https://app.skalin.io/#/integration/segment){:target="_blank"}, and click **Connect** to create a configuration. Find and copy the **API Key** and and **Skalin Client ID** in the Segment connection section.
+5. Enter the **API Key** and **ClientID** in the Skalin destination settings in Segment.
+
+## Supported methods
+
+Skalin supports the following methods, as specified in the [Segment Spec](/docs/connections/spec).
+
+### Page
+
+Send [Page](/docs/connections/spec/page) calls to Skalin. For example:
+
+```js
+analytics.page('myFeature')
+```
+
+Segment sends Page calls to Skalin as a `feature`. 
+
+
+### Screen
+
+Send [Screen](/docs/connections/spec/screen) calls to Skalin. For example:
+
+```obj-c
+[[SEGAnalytics sharedAnalytics] screen:@"Home"];
+```
+
+Segment sends Screen calls to Skalin as a `feature`. 
+
+
+### Identify
+
+Send [Identify](/docs/connections/spec/identify) calls to Skalin. For example:
+
+```js
+analytics.identify('userId123', {
+  email: 'john.doe@example.com'
+});
+```
+
+Optionally, you can provide your CustomerID:
+```js
+analytics.identify('userId123', {
+  email: 'john.doe@example.com',
+  trait: {
+      groupId: 'myCustomerID'
+  }
+});
+```
+
+Segment sends Identify calls to Skalin as an `identity`.
+
+
+### Track
+
+Send [Track](/docs/connections/spec/track) calls to Skalin. For example:
+
+```js
+analytics.track('myFeature')
+```
+
+Segment sends Track calls to Skalin as a `feature` event.
diff --git a/src/connections/sources/catalog/libraries/mobile/kotlin-android/index.md b/src/connections/sources/catalog/libraries/mobile/kotlin-android/index.md
@@ -458,6 +458,11 @@ Segment currently supports these destinations for Analytics Kotlin and is active
 * [Firebase](https://github.com/segment-integrations/analytics-kotlin-firebase)
 * [Mixpanel](https://github.com/segment-integrations/analytics-kotlin-mixpanel)
 
+## FAQs
+### Can I use the catalog of device-mode destinations from Analytics-Android?
+No, only the plugins listed above are supported in device-mode for Analytics-Kotlin.
+### Will I still see device-mode integrations listed as `false` in the integrations object?
+When you successfully package a plugin in device-mode, you will no longer see the integration listed as `false` in the integrations object for a Segment event. This logic is now packaged in the event metadata, and is not surfaced in the Segment debugger.
 
 ## Changelog
 [View the Analytics-Kotlin changelog on GitHub](https://github.com/segmentio/analytics-kotlin/releases).
diff --git a/src/engage/overview/images/twilioaccountsid.png b/src/engage/overview/images/twilioaccountsid.png
diff --git a/src/engage/overview/onboarding.md b/src/engage/overview/onboarding.md
@@ -168,7 +168,7 @@ To add the ability to send SMS campaigns in Engage, you’ll now create a Twilio
 ### Create a Twilio account and generate an API key
 
 > info "Copying Twilio Credentials"
-> This step generates an Account SID and API key secret that you’ll later add to Segment. Make sure you’re ready to copy and save both proceeding.
+> This step generates an Account SID, API key SID, and API key secret that you’ll later add to Segment. Make sure you’re ready to copy and save both proceeding.
 
 Start by creating your Twilio account and getting an API key for Engage:
 
@@ -178,19 +178,24 @@ Start by creating your Twilio account and getting an API key for Engage:
 4. Enter a name for the API key in the **Friendly name** field.
 5. Set the region to **United States (US1) - Default** and key type to **Standard**.
 6. Click **Create API Key**.
-7. Copy the **SID** and **Secret** field contents.
+7. Copy both the **SID** and **Secret** field contents.
+
 
     ![Copying the Twilio API key](images/apikeys.png "Copying the Twilio API key")
 
-8. Switch to the browser tab or window with your Personas workspace.
-9. Navigate to **Personas > Settings > Messaging Service**.  Under **Send SMS messages with Twilio**, click the **Get Started** button.  The **Set up your SMS service** page appears.
-10. Under **Enter your Twilio API Key information** (shown below), paste the SID and API Key Secret you copied above into their respective fields.
-11. Click **Verify**, then click **Save Twilio Account.**
+8. Return to the API keys & tokens page. In the **Live credentials** section, copy the Account SID credentials.
+
+    ![Copying the Twilio Account SID key](images/twilioaccountsid.png "Copying the Twilio API key")
+
+9. Switch to the browser tab or window with your Personas workspace.
+10. Navigate to **Personas > Settings > Messaging Service**.  Under **Send SMS messages with Twilio**, click the **Get Started** button.  The **Set up your SMS service** page appears.
+11. Under **Enter your Twilio API Key information** (shown below), paste the Account SID, API Key SID, and API Key Secret you copied above into their respective fields.
+12. Click **Verify**, then click **Save Twilio Account.**
 
-    ![Entering Twilio API key into Engage](images/engageapifields.png "Entering Twilio API key into Engage")
+<!--    ![Entering Twilio API key into Engage](images/engageapifields.png "Entering Twilio API key into Engage") -->
 
 > info ""
-> If you’re unable to verify your SID or API Key secret, you may have copied an extra space at the end of one or the other. Verify that you’ve not added any extra characters or spaces, then try to verify again.
+> If you’re unable to verify your Account SID, SID, or API Key secret, you may have copied an extra space at the end of one or the other. Verify that you’ve not added any extra characters or spaces, then try to verify again.
 
 ### Set up a Twilio Messaging Service
 
diff --git a/src/engage/profiles/csv-upload.md b/src/engage/profiles/csv-upload.md
@@ -5,15 +5,15 @@ engage: true
 ---
 Use the CSV Uploader to add or update user profiles and set subscription states.
 
-When you upload a CSV file, Twilio Engage adds new users and updates existing user profiles. CSV rows correspond to a user and columns to an identifier trait in your [identity resolution configuration](/docs/personas/identity-resolution/identity-resolution-settings/).
+When you upload a CSV file, Twilio Engage adds new users and updates existing user profiles. Each CSV row corresponds to a user profile and columns to an identifier trait in your [identity resolution configuration](/docs/personas/identity-resolution/identity-resolution-settings/).
 
-You can also use the CSV Uploader to set email and SMS [subscription states](#set-user-subscriptions) to track email addresses and phone numbers that you have permission to market to.
+You can also [set subscription states](#set-user-subscriptions) for each email and SMS that you upload in the CSV. Subscription states help you track which email addresses and phone numbers you have permission to market to.
 
 ## Upload a CSV file
 
-To upload a CSV file, navigate to **Personas > Profiles** and click **Update Users**.
+To upload a CSV file, navigate to **Personas > Profiles** and click **Upload CSV**.
 
-### 1. Download a CSV template with identifiers
+### 1. Download your CSV template
 
 Click **Download Template** to download a CSV template with identifier columns from your identity resolution configuration. Engage adds subscription columns next to email and SMS identifiers, where you can update subscription states for email addresses and phone numbers.
 
@@ -22,7 +22,14 @@ Click **Download Template** to download a CSV template with identifier columns f
 
 Navigate to **Personas > Settings** and select the **Identity Resolution** tab to view or add identifiers in your Segment workspace.
 
-### 2. Upload a CSV file
+### 2. Fill out your CSV file
+
+Enter values for the identifiers in your CSV file. You can also [set email and phone subscriptions](#set-user-subscriptions) using the `email_subscription_status` and `sms_subscription_status` columns.
+
+> success ""
+> Leave any unknown values blank to avoid bad data.
+
+### 3. Upload your CSV file
 
 Upload a CSV file to Twilio Engage in two ways:
 - Drag and drop the CSV file in the dropzone.
@@ -32,7 +39,7 @@ Engage processes CSV rows sequentially. Column values, except for a blank subscr
 
 A blank subscription status in the CSV doesn't overwrite current **email** or **phone** [subscription states](/docs/engage/profiles/user-subscriptions/subscription-states/) in your Segment space.
 
-### 3. Name the custom trait
+### 4. Name your custom trait
 
 Every time you upload a file, you have the option to add a custom trait to user profiles in the CSV. Use custom traits to help you create audiences or send messages to a specific group of users. You can also add an existing custom trait name from your Segment workspace to the list of users in the CSV file.
 
@@ -53,12 +60,13 @@ Use error reports to fix invalid rows and quickly re-upload data.
 From the Upload History page:
 
 1. Select the link in the **Report** column to download an error report CSV. All rows not present in the error report were processed successfully.
-2. Correct data in the invalid rows and remove any extra columns.
-3. Click **Update Users** and re-upload the CSV file.
+2. Correct data in the invalid rows.
+3. Remove any extra columns such as `row_number`, `error_message`, and `error_code`.
+3. Click **Upload CSV** and re-upload the file.
 
 ## Set user subscriptions
 
-Use the CSV Uploader to set subscription states for user email addresses or phone numbers. Subscription states help you track which email addresses and numbers you have permission to market to.
+Use the CSV Uploader to set subscription states for user email addresses and phone numbers.
 
 > info ""
 > Each user profile in a Segment workspace can have multiple email addresses and phone numbers, all with different subscription states.
diff --git a/vale-styles/Vocab/Docs/accept.txt b/vale-styles/Vocab/Docs/accept.txt
@@ -70,6 +70,7 @@ Optimizely
 performant
 Preact
 Shopify
+Skalin
 Smartly
 Subnet
 svg

-Original file line number
+Diff line change
 performant
 Preact
 Shopify
 +Skalin
 Smartly
 Subnet
 svg