Merge branch 'master' into destinationVariance

Author: pauljaeinyoo

src/_sass/components/_markdown.scss

@@ -253,4 +253,11 @@
       }
     }
   }
+
+
 }
+
+a[target="_blank"]:after{
+  content: url("/docs/images/external-link-alt-solid.svg");
+  margin-left: 4px;
+}

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

@@ -34,13 +34,13 @@ Session tracking is only available when using Segment's new libraries: [Analytic
 
 ## Getting Started
 
-1. Before you start, go to your [Amplitude project settings](https://analytics.amplitude.com/settings/projects), and locate the project that you'll be sending Segment data to. Copy the Amplitude API Key and Secret key for the project.
-1. From the Segment web app, click **Catalog**, then click **Destinations**.
-2. Find the Destinations Actions item in the left navigation, and click it.
-2. Click the "Amplitude" item to select it and click **Configure**.
-3. Choose which of your sources to connect the destination to. (You can connect more sources to the destination later.)
-3. On the next page enter your Amplitude API key and Secret key and click **Verify credentials**.
-4. Next, choose how to create the mapping. You can click Quick Setup to use the defaults provided by Segment, or click Customized Setup to start from a blank mapping.
+1. Before you start, go to your [Amplitude workspace](https://analytics.amplitude.com){:target="_blank"}. Click **Settings** in the bottom left, then click **Projects** in the left menu. Select your **Project**. Copy the Amplitude API Key and Secret Key for the project.
+2. From the Segment web app, click **Catalog**, then click **Destinations**.
+3. Find the Destinations Actions item in the left navigation, and click it.
+4. Click the "Amplitude" item to select it and click **Configure**.
+5. Choose which of your sources to connect the destination to. (You can connect more sources to the destination later.)
+6. On the next page enter your Amplitude API key and Secret key and click **Verify credentials**.
+7. Next, choose how to create the mapping. You can click Quick Setup to use the defaults provided by Segment, or click Customized Setup to start from a blank mapping.
 
 Once you have a mapping, you can follow the steps in the Destinations Actions documentation on [Customizing mappings](/docs/connections/destinations/actions/#customizing-mappings).
 

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

@@ -133,13 +133,12 @@ Beginning February 15th 2021, Facebook requires the `action_source` server event
 
 ### Action Source
 
-`action_source` is set to "website" as a default value. If a mobile library is used then `action_source` defaults to "app".
+`action_source` is set to "website" as a default value.
 
 You can set `action_source` manually by passing it as a property of a Track event. You can use either snake case or camel case to include `action_source` as a property in Track events.
 
 | Action Source Values | Description                                                                                               |
 | -------------------- | --------------------------------------------------------------------------------------------------------- |
-| `app`                | Conversion was made using your app.                                                                       |
 | `chat`               | Conversion was made via a messaging app, SMS, or online messaging feature.                                |
 | `email`              | Conversion happened over email.                                                                           |
 | `other`              | Conversion happened in a way that is not listed.                                                          |

src/connections/destinations/catalog/google-ads-gtag/index.md

@@ -9,7 +9,8 @@ strat: google
 
 If you're using the [new Google Ads (Gtag) experience](https://support.google.com/adwords/answer/6095821?hl=en&ref_topic=3165803), you can enable the **Google Ads (Gtag)** Destination (previously called "Google Adwords New") in the Segment catalog. The new Google Ads uses a Global Site Tag (Gtag) and event snippets.
 
-**IMPORTANT**: Only use this destination if your Google Ads account is using the _New_ (Gtag) Experience. If you are using Google Tag Manager (a separate product) as well, do not add the global site tag again in your GTM containers. You should also disable any [Google Ads (Classic)](https://segment.com/docs/connections/destinations/catalog/adwords/) destinations within the same source, since **Google Ads (Classic)** cannot load at the same times as **Google Ads (Gtag)**.
+> info "Info message."
+> **IMPORTANT**: Only use this destination if your Google Ads account is using the _New_ (Gtag) Experience. If you're using Google Tag Manager (a separate product) as well, don't add the global site tag again in your GTM containers. You should also disable any [Google Ads (Classic)](https://segment.com/docs/connections/destinations/catalog/adwords/) destinations within the same source, since **Google Ads (Classic)** can't load at the same times as **Google Ads (Gtag)**.
 
 ## Getting Started
 
@@ -19,11 +20,11 @@ Currently this is only supported on the browser.
 
 ## Page
 
-If you want to map all your unnamed `.page()` calls to a default Page Load Conversion, you can enter it in our settings. However, if you created specific Page Load Conversions in Google Ads that you'd like to map your named `.page()` calls in Segment, you can also do that by mapping the events in **Page Load Conversions** setting.
+If you want to map all your unnamed `.page()` calls to a default Page Load Conversion, you can enter the AdWords Conversion ID in **Settings > Default Page Conversion**. However, if you created specific Page Load Conversions in Google Ads that you'd like to map your named `.page()` calls in Segment, you can map the events in **Settings > Page Load Conversions**.
 
-Segment forwards all the `properties` of the page call, such as `path`, `title`, `url`, and so on, because by default Google Ads (Gtag) makes these available in your remarketing campaigns.
+Segment forwards all the `properties` of the page call, such as `path`, `title`, `url`, because by default, Google Ads (Gtag) makes these available in your remarketing campaigns.
 
-You can send Google's semantic properties, such as `value`, `currency`, or `transaction_id`, as integration specific options. However, we recommend just creating a Click Conversion instead and mapping them to `.track()` calls. The example below shows these properties as integration-specific options:
+You can send Google's semantic properties, such as `value`, `currency`, or `transaction_id`, as integration specific options. However, Segment recommends you to  create a **Click Conversion** instead, and map them to `.track()` calls. The example below shows these properties as integration-specific options:
 
 ```javascript
 analytics.page({}, {
@@ -35,15 +36,45 @@ analytics.page({}, {
 });
 ```
 
-**NOTE**: The `'Google Ads (Gtag)'` is case sensitive. We ask for `order_id` rather than  `transaction_id` to stay more consistent with our own [ecommerce spec](https://segment.com/docs/connections/spec/ecommerce/v2). However, we will send it as `transaction_id` in the request itself to satisfy Google's specifications.
+> note ""
+> **NOTE:** The `'Google Ads (Gtag)'` is case sensitive. Segment prefers you to use `order_id` rather than  `transaction_id` to stay more consistent with the [ecommerce spec](https://segment.com/docs/connections/spec/ecommerce/v2). However, Segment will send it as `transaction_id` in the request itself to satisfy Google's specifications.
 
 ## Track
 
-You can map your custom `.track()` events to any **Click Conversions** you created inside Google Ads. We will pass any `properties` so you can use them during your remarketing campaigns.
+You can map your custom `.track()` events to any **Click Conversions** you created inside Google Ads. Segment passes any `properties` so you can use them during your remarketing campaigns.
 
-If you pass `properties.value`, `properties.currency`, or `properties.order_id`, we will map them to Google's semantic `value`, `currency`, or `transaction_id` respectively.
+If you pass `properties.value`, `properties.currency`, or `properties.order_id`, Segment maps them to Google's semantic `value`, `currency`, or `transaction_id` respectively.
 
-The only exception is that for `Order Completed` events, we will map Google's semantic `value` field to your `properties.revenue`.
+The only exception is that for `Order Completed` events, Segment will map Google's semantic `value` field to your `properties.revenue`.
+
+## Troubleshooting AdWords Conversions
+To figure out if an event is flagged for Conversion by the AdWords SDK, follow these steps:
+1. Confirm that the events mapped to Google Ads Conversion are being sent in device-mode while using the Segment Analytics.js library. To do this:
+    1. Go to **Connections > Sources** in your workspace and choose your Source.
+    2. Go to the **Debugger** tab.
+    3. Click on an event and look at the **Raw** view to make sure the events have a library name of `analytics.js`. There should be a snippet of code that looks like this:
+
+      ```js
+        "library": {
+          "name": "analytics.js",
+      ``` 
+
+2. Verify that the [Google Conversion ID](/docs/connections/destinations/catalog/google-ads-gtag/#google-conversion-id) in your Segment workspace is correct.
+3. Find your ad online and click on it. This will redirect you to your website.
+4. Open the Network tab in your browser and make sure the **Preserve log** checkbox is checked and **All** is selected. Keep this Network tab and webpage open.
+
+      ![Network tab](../../images/network-tab.png)
+
+5. Go to the **Settings** tab for your Gtag destination in Segment on a new webpage and choose **Click Conversions** to look at the mapped `track()` events and make sure the events are mapped to the correct **Adwords Conversion Label**.
+
+      ![Edit Settings](../../images/conversion-settings.png)
+
+6. Go back to your website and trigger the event mapped to the conversion. For example, as shown in the image above, it would be `Order Completed`.
+7. Go to the Network tab in your browser and enter the **Adwords Conversion Label** linked to the event you triggered in the **Filter** field.
+
+      ![Network tab](../../images/network-tab-search.png)
+
+8. See if the value for the `ct_cookie_present` changed to `true`. If `true`, it means that Adwords counts the event as a conversion.  
 
 ## Multiple Google Ads Accounts
 

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

@@ -197,10 +197,15 @@ If you're not familiar with the Segment Specs, take a look to understand what th
 analytics.alias('newUserId')
 ```
 
-**Important:** Mixpanel used to require that you call `alias` in all libraries to connect anonymous visitors to identified users. However, with the release of Mixpanel's new [Identity Merge feature](https://help.mixpanel.com/hc/en-us/articles/360039133851#enable-id-merge) this is no longer necessary. To enable ID Merge, go to your Mixpanel Settings Dashboard, navigate to **Project Settings > Identity Merge** and enable the setting from that screen. If you are _not_ using this setting, use the instructions below.**
+> info ""
+> **Important:** Mixpanel used to require that you call `alias` in all libraries to connect anonymous visitors to identified users. However, with the release of Mixpanel's new [Identity Merge feature](https://help.mixpanel.com/hc/en-us/articles/360039133851#enable-id-merge) this is no longer necessary. To enable ID Merge, go to your Mixpanel Settings Dashboard, navigate to **Project Settings > Identity Merge** and enable the setting from that screen. If you are _not_ using this setting, use the instructions below.
 
 
-As soon as you have a `userId` for a visitor that was previously anonymous you'll need to [`alias`](/docs/connections/spec/alias/) their old anonymous `id` to the new `userId`. In Mixpanel only **one** anonymous user history can be merged to **one** identified user. For that reason you should only call `alias` once, right after a user registered, but before the first `identify`.
+As soon as you have a `userId` for a visitor that was previously anonymous you'll need to [`alias`](/docs/connections/spec/alias/) their old anonymous `id` to the new `userId`. In Mixpanel only **one** anonymous user history can be merged to **one** identified user. For that reason you should only call `alias` once, right after a user registered, but before the first `identify`. To merge identities in Mixpanel, send an identify call with both the previous anonymous ID, and the new user ID, as follows:
+
+```javascript
+analytics.alias('anonId','newUserId');
+```
 
 You'll also want to `track` the action that caused the user to be identified or created. Read our [guide on how to identify new users](/docs/connections/spec/best-practices-identify/) to learn why.
 

src/connections/destinations/images/conversion-settings.png

@@ -408,7 +408,7 @@ For more advance logging, you can check out the [sample code](https://github.com
 
 ## Java Support
 
-We officially support Java 8, 9 and 10. The library may work on other versions of Java as well, however we don't test for compatibility on unsupported versions.
+Segment supports Java 8, 9, 10, and 11. The library may work on other versions of Java as well, however we don't test for compatibility on unsupported versions.
 
 ## Snapshots
 

src/connections/destinations/images/network-tab-search.png

@@ -3,7 +3,7 @@ title: Upgrade to Analytics.js 2.0
 strat: ajs
 ---
 
-Analytics.js 2.0 is fully backward compatible with Analytics.js Classic. To upgrade your sources, follow the manual upgrade steps below, or see the schedule for automatic migration.
+Analytics.js 2.0 is fully backward compatible with Analytics.js Classic. To upgrade your sources, follow the manual upgrade steps below, or see the schedule for automatic migration. As with all upgrades, Segment recommends that you start development on a non-production source to test the upgrade process and outcome, prior to upgrading your production sources.
 
 ## Manual upgrade