Merge branch 'develop' of github.com:segmentio/segment-docs into develop

Author: markzegarelli

src/_data/catalog/overrides.yml

@@ -1,6 +1,17 @@
 # This file is manually generated. When you add or remove an item, add or remove
 # it from the `overrides-list.yml` too.
 items:
+- slug: criteo-app-web-events
+  connection_modes:
+  connection_modes:
+    device:
+      web: true
+      mobile: false
+      server: false
+    cloud:
+      web: false
+      mobile: true
+      server: false
 - slug: doubleclick-floodlight
   connection_modes:
     device:

src/connections/destinations/catalog/criteo-app-web-events/index.md

@@ -1,28 +1,23 @@
 ---
 title: Criteo App & Web Events Destination
 rewrite: true
+cmode-override: true 
+hide-cmodes: true
 redirect_from: '/connections/destinations/catalog/criteo/'
 ---
 
 ## Getting Started
 
-{% include content/connection-modes.md %}
+> info "Information about Criteo App & Web Events and Analytics.js"
+> If you connect the Criteo App & Web Events destination to an Analytics.js source, the connection defaults to Device-mode. Cloud-mode connections are not available with Analytics.js.
 
 Currently this destination supports events originating from Mobile or Web sources (not Server). You can read more [about sources here](/docs/connections/sources/).
 
-**Our web integration with Criteo Events is currently in public beta. Use carefully and [contact us](https://segment.com/help/contact) if you are having any issues.**
-
 To get started with Criteo Events and Segment, you'll need:
 
 1. An existing account with [Criteo](http://www.criteo.com/).
 2. A data source integrated with either one of our mobile SDK's ([iOS](/docs/connections/sources/catalog/libraries/mobile/ios/) or [Android](/docs/connections/sources/catalog/libraries/mobile/android/)) or Javascript library ([Analytics.js](/docs/connections/sources/catalog/libraries/website/javascript/))
 
-Assuming both of these criteria are met, you can add Criteo Events as a destination for your desired source in your Segment account.
-
-**If you are using our mobile integration with Criteo Events make sure your app is properly registered with them.**
-
-
-- - -
 
 
 ## Track

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

@@ -105,7 +105,7 @@ In this case, your HubSpot `eventId` is 'Bought Item'. If you want to use an exi
 
 #### Setting Contact Properties on Track
 
-Segment recommends that you send `traits` with an [Identify](/docs/connections/spec/identify/) call. You can also set HubSpot properties on a track call sent from any server-side source, as allowed by Hubspot's [events API](http://developers.hubspot.com/docs/methods/enterprise_events/http_api){:target="_blank"}. You might want to use this method if you're running out of API calls on the Identify requests.
+Segment recommends that you send `traits` with an [Identify](/docs/connections/spec/identify/) call. You can also set HubSpot properties on a track call sent from any server-side source, as allowed by Hubspot's [events API](http://developers.hubspot.com/docs/methods/enterprise_events/http_api){:target="_blank"}. Segment recommends this method if you're running out of HubSpot API calls on the Identify requests.
 
 Include HubSpot contact properties into the `context.traits` object:
 

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

@@ -50,7 +50,7 @@ If the source you intend to upgrade uses the in-domain instrumentation as well a
 
 ### Relying on Analytics.js Classic's `ajs_anonymous_id` cookie format  
 
-Analytics.js 2.0 removes inbuilt quotes from cookie values, resulting in a different format for the `ajs_anonymous_id` value when compared to Analytics.js Classic.  Though you can retrieve cookie values with [standard supported functions](/docs/connections/sources/catalog/libraries/website/javascript/identity/#retrieve-the-anonymous-id), you'll need to configure your environment to accept the new format if your implementation relies on accessing the cookie value directly.
+Analytics.js 2.0 removes inbuilt quotes from cookie values, resulting in a different format for the `ajs_anonymous_id` value when compared to Analytics.js Classic.  Though you can retrieve cookie values with [standard supported functions](/docs/connections/sources/catalog/libraries/website/javascript/identity/#retrieve-the-anonymous-id), you'll need to configure your environment to accept the new format using the `utility` [plugin](/docs/connections/sources/catalog/libraries/website/javascript/index/#example-plugins) if your implementation relies on accessing the cookie value directly. 
 
 ### Using a strict content security policy on the page