Merge branch 'master' into evanSegment-clarify-object-throughput

Author: markzegarelli

.vscode/yml.code-snippets

@@ -0,0 +1,24 @@
+{
+	// Place your segment-docs workspace snippets here. Each snippet is defined under a snippet name and has a scope, prefix, body and 
+	// description. Add comma separated ids of the languages where the snippet is applicable in the scope field. If scope 
+	// is left empty or omitted, the snippet gets applied to all languages. The prefix is what is 
+	// used to trigger the snippet and the body will be expanded and inserted. Possible variables are: 
+	// $1, $2 for tab stops, $0 for the final cursor position, and ${1:label}, ${2:another} for placeholders. 
+	// Placeholders with the same ids are connected.
+	// Example:
+	// "Print to console": {
+	// 	"scope": "javascript,typescript",
+	// 	"prefix": "log",
+	// 	"body": [
+	// 		"console.log('$1');",
+	// 		"$2"
+	// 	],
+	// 	"description": "Log output to console"
+	// }
+
+	"yml": {
+		"prefix": ["- name"],
+		"body":["- name: ${1:name}\r\tdescription: ${2:description}\r\tdefault: ${3}"],
+		"description": "Yaml settings"
+	}
+}

src/connections/destinations/catalog/ab-smartly/index.md

@@ -1,5 +1,4 @@
 ---
-rewrite: true
 title: AB Smartly Destination
 ---
 

src/connections/destinations/catalog/onesignal-new/index.md

@@ -15,11 +15,10 @@ This destination is maintained by OneSignal. For any issues with the destination
 
 {% include content/connection-modes.md %}
 
-1. From the Destinations catalog page in the Segment App, click **Add Destination**.
-1. Search for OneSignal in the Destinations Catalog, and select the OneSignal destination.
-1. Choose which Source should send data to the OneSignal destination.
-1. Go to the [OneSignal dashboard](https://app.onesignal.com/apps/){:target="_blank"}, select the Segment App, and go to the **Settings > Keys & IDs**. Copy the **App ID** and the **API key**.
-1. Enter the OneSignal **App ID** and the **API key** in the OneSignal destination settings in Segment.
+1. Log in to the [OneSignal Dashboard](https://app.onesignal.com/){:target="_new"}
+2. Navigate to **Segment App** -> **Settings** -> **Analytics** -> **Segment.com** and click **Activate**.
+3. The Segment App opens in a new window. Log in to authenticate the connection from OneSignal.
+4. Select the Workspace and Source to connect with OneSignal.
 
 
 > info ""

src/connections/destinations/catalog/optimizely-full-stack/index.md

@@ -164,7 +164,8 @@ Notification listeners are not available for Segment `track` events when impleme
 
 Follow these instructions on how to set up Personas and Optimizely:
 
-* [Using Segment Personas and Optimizely Full Stack for Omnichannel Experiments](https://www.optimizely.com/insights/blog/segment-personas-optimizely-full-stack-omnichannel-experiments/)
+* [Using Segment Personas and Optimizely Full Stack for Omnichannel Experiments](https://www.optimizely.com/insights/blog/segment-personas-optimizely-full-stack-omnichannel-experiments/){:target="_blank"}
+
 
 ## GDPR Support
 Segment supports deleting/suppressing users in Optimizely using the [Segment app](/docs/privacy/user-deletion-and-suppression/). In order to do this however, you will need to create a [Personal Access Token](https://developers.optimizely.com/x/authentication/personal-token/) in Optimizely and provide it as the value of the Access Token setting.

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

@@ -0,0 +1,59 @@
+---
+title: ProsperStack Destination
+rewrite: true
+beta: true
+---
+
+[ProsperStack](https://prosperstack.com/?utm_source=segmentio&utm_medium=docs&utm_campaign=partners) is the hosted cancellation flow for subscription businesses that automatically prevents churn. Retain customers with targeted offers and interventions designed to prevent cancellations and increase customer lifetime value.
+
+ProsperStack maintains this destination. For any issues with the ProsperStack Destination, [contact the ProsperStack Support team](mailto:[email protected]).
+
+> The ProsperStack Destination is currently in beta, and is actively developing.  To join the beta program, or if you have any feedback to help improve the ProsperStack Destination and its documentation, [contact the ProsperStack support team](mailto:[email protected]).
+
+## Getting Started
+
+{% include content/connection-modes.md %}
+
+### Automated setup
+
+1. Log in to the [ProsperStack dashboard](https://app.prosperstack.com){:target="\_blank"}.
+2. Navigate to **Settings** > **Manage integrations**.
+3. Click **Configure** in the Segment integration section.
+4. Click **Connect Segment**.
+5. Select a Segment workspace and source to send to the ProsperStack Destination.
+
+To add additional sources, click **Connect a source**.
+
+### Manual setup
+
+1. In the Segment app, go to **Connections** and click **Add Destination**.
+2. Search for "ProsperStack" in the Destinations Catalog, and select the **ProsperStack** destination.
+3. Click **Configure ProsperStack** and choose the source you want to connect the destination to. 
+4. Create a new API key from the [ProsperStack API keys settings screen](https://app.prosperstack.com/settings/api-keys){:target="\_blank"}.
+5. Enter the **API Key** in the ProsperStack destination **Settings** tab in Segment.
+
+## Supported methods
+
+ProsperStack supports the following methods, as specified in the [Segment Spec](/docs/connections/spec).
+
+### Identify
+
+Send [Identify](/docs/connections/spec/identify) calls to ProsperStack to update subscriber custom properties in ProsperStack. For example:
+
+```js
+analytics.identify("userId123", {
+  email: "[email protected]",
+  traits: {
+    "Number of contacts": 5800,
+    "Is professional": true,
+    "Last contacted": "2021-05-04",
+    "Preferred name": "Johnny",
+  },
+});
+```
+
+Segment sends Identify calls to ProsperStack as an `identify` event.
+
+Custom traits specified in an Identify call update [custom properties](https://prosperstack.com/docs/custom-properties/){:target="\_blank"} for a corresponding subscriber in ProsperStack. You must specify an `email` in an Identify call in order for a ProsperStack subscriber to match with the Identify call. 
+
+Custom properties in ProsperStack that match the exact key of a trait update automatically. You can configure additional trait mappings in the [ProsperStack configuration dashboard](https://app.prosperstack.com/settings/integrations/segment){:target="\_blank"}.

src/connections/sources/catalog/libraries/mobile/android/index.md

@@ -2,8 +2,9 @@
 title: 'Analytics for Android'
 strat: android
 repo: analytics-android
-redirect_from: '/connections/sources/catalog/cloud-apps/kotlin-android/'
-redirect_from: '/connections/sources/catalog/cloud-apps/kotlin/'
+redirect_from:
+  - '/connections/sources/catalog/cloud-apps/kotlin-android/'
+  - '/connections/sources/catalog/cloud-apps/kotlin/'
 ---
 
 

src/connections/sources/catalog/libraries/website/javascript/upgrade-to-ajs2.md

@@ -35,7 +35,7 @@ Once a source moves to Analytics.js 2.0, you can follow the steps above in [Manu
 
 ## Cases that require additional intervention
 
-There are two cases where upgrading to Analytics.js 2.0 requires manual effort beyond enabling the Analytics.js 2.0 toggle.
+In some cases, upgrading to Analytics.js 2.0 requires manual effort beyond enabling the Analytics.js 2.0 toggle.  
 
 ### When using in-domain instrumentation CDN aliasing
 

src/connections/sources/sources-compare.md

@@ -43,7 +43,7 @@ Cloud-App Sources allow you to pull in data from third-party tools so you can us
     <th width="30%"> Categories </th>
     <th> Data Type </th>
   </tr>
-  {% assign integrations = site.data.catalog.sources.items %}
+  {% assign integrations = site.data.catalog.sources_capi.items %}
   {% for integration in integrations %}
     {% unless integration.categories contains promoted_categories[0] or integration.categories contains promoted_categories[1] or integration.categories contains promoted_categories[2] or integration.categories contains promoted_categories[3]%}
     {% unless integration.display_name == "Project"%}

src/connections/storage/catalog/db2/index.md

@@ -66,11 +66,13 @@ Search for and select "Db2":
 
 Add your credentials as follows:
 
-- User (This is the "User ID" that you created above)
-- Password
 - Host (Found in Settings → Connection Info → Connection Information)
-- Port (50000 by default)
+- Port (50001 is Db2 Default)
 - Database name
+- User (This is the "User ID" that you created above)
+- Password
+- Security (Enter "SSL" in this field if applicable - optional)
+
 
 <img src="./images/settings.png" style="max-width: 540px">