Merge branch 'develop' into repo-sync

Author: stayseesong

.vscode/yml.code-snippets

@@ -20,5 +20,9 @@
 		"prefix": ["- name"],
 		"body":["- name: ${1:name}\r\tdescription: ${2:description}\r\tdefault: ${3}"],
 		"description": "Yaml settings"
-	}
+	},
+	"ext_link":{
+		"prefix": ["{:}"],
+		"body":["{:target='${1:_blank}'}"]
+	},
 }

src/_data/catalog/overrides.yml

@@ -1,6 +1,16 @@
 # This file is manually generated. When you add or remove an item, add or remove
 # it from the `overrides-list.yml` too.
 items:
+- slug: intercom
+  connection_modes:
+    device:
+      web: true
+      mobile: false
+      server: false
+    cloud:
+      web: false
+      mobile: true
+      server: true
 - slug: hubspot
   display_name: HubSpot
   previous_names:

src/_data/catalog/warehouse_papi.yml

@@ -1,14 +1,6 @@
 # AUTOGENERATED FROM PUBLIC API. DO NOT EDIT
 # warehouse data last updated 2021-11-16 
 items:
-- display_name: amazing-warehouse
-  slug: amazing-warehouse
-  description: This warehouse is amazing!
-  logo:
-    url: http://default.com
-  mark:
-    url: http://mark.com
-  settings: []
 - display_name: Azure SQL Data Warehouse
   slug: azuresqldw
   description: Connector for Azure SQL Data Warehouse

src/_data/landing.yml

@@ -4,7 +4,7 @@ sections:
   section:
   - name: Getting started with Segment
     icon: getting-started.svg
-    description: "Learn about Segment, work through a basic implementation, plan a full implementation and learn about features and extensions. "
+    description: "Learn about Segment, plan and work through a basic implementation, and explore features and extensions."
     path: /getting-started/
 - section_title: How can Segment help you?
   section_col: 6
@@ -19,22 +19,22 @@ sections:
     path: /protocols/
   - name: Personalize interactions
     icon: personas.svg
-    description: "Improve customer interactions by building audiences to power personalized experiences."
+    description: "Improve customer interactions by building audiences that power personalized experiences."
     path: /personas/
   - name: Respect users' privacy
     icon: privacy.svg
-    description: "Use Segment's tools for data discovery and policy enforcement to keep customer data private."
+    description: "Keep customer data private with Segment's data discovery and policy enforcement tools."
     path: /privacy/
 
 - section_title: Get Data into Segment
-  section_description: "The Segment Spec provides guidance on meaningful data to capture, and the best format for it, across all of our libraries and APIs. When you use these formats it’s simple to send data to downstream tools."
+  section_description: "The Segment Spec helps you identify, capture, and format meaningful data for use with Segment libraries and APIs as well as downstream tools."
   section_col: 4
   section:
   - name: Segment calls
-    description: "Use Track, Page, and Identify, and learn about the other calls Segment tracking is built on."
+    description: "Use Track, Page, Identify, and other Segment tracking calls."
     path: /connections/spec/
   - name: Common traits
-    description: "Save time by letting the Segment calls collect information automatically."
+    description: "Save time by letting Segment calls collect information for you."
     path: /connections/spec/common/
   - name: Use case specs
     description: "Use our business-case specs to ensure that your tools get the most from your data."
@@ -45,17 +45,17 @@ sections:
   section:
   - name: Segment for Developers
     icon: git-repo.svg
-    description: "An overview of the basics of your Segment implementation."
+    description: "The basics of your Segment implementation."
     path: /guides/intro-impl/
   - name: How-To Guides
     icon: book.svg
-    description: "Over a dozen how-to guides to help you accomplish common tasks."
+    description: "Over a dozen how-to guides that help you accomplish common tasks."
     path: /guides/how-to-guides/
 
 - section_title: Connect your app to Segment
   section_col: 4
   section:
-  - name: Javascript
+  - name: JavaScript
     path: /connections/sources/catalog/libraries/website/javascript/
   - name: HTTP Tracking API
     path: /connections/sources/catalog/libraries/server/http-api/

src/_data/sidenav/strat.yml

@@ -29,7 +29,9 @@ sections:
   - path: /connections/destinations/catalog/facebook-pixel
     title: Facebook Pixel destination
   - path: /connections/destinations/catalog/facebook-pixel-server-side
-    title: Facebook Conversions API Destination (Beta)
+    title: Facebook Conversions API Destination (Classic)
+  - path: /connections/destinations/catalog/actions-facebook-conversions-api
+    title: Facebook Conversions API Destination (Actions)
   - path: /connections/destinations/catalog/facebook-app-events
     title: Facebook App Events destination
   - path: /connections/destinations/catalog/facebook-offline-conversions

src/_includes/components/actions-fields.html

@@ -74,10 +74,11 @@
 
 {% for action in actions %}
 ### {{action.name}}
-{{action.description | markdownify}}
+<p>{{action.description | markdownify}}</p>
+<p>{{action.name}} is a <strong>{{action.platform | capitalize}}</strong> action.</p>
 
 
-{% if action.fields %}
+{% if action.fields.size > 0 %}
 <p class="button button-fill button-fill--white" data-toggle="collapse" data-target=".settings-content-{{action.slug}}">Click to expand fields</p>
 <div class="collapse settings-content-{{action.slug}}">
 <table id="settingsTable">

src/_includes/components/feedback.html

@@ -1,11 +1,11 @@
 <div class="flex flex--wrap waffle waffle--large waffle--xxlarge@medium">
-  <div class="flex__column flex__column--12 flex__column--6@medium flex">
+  <div class="flex__column flex__column--12 flex__column--4@medium flex">
     <div class="feedback-box flex flex--stack flex--justify waffle waffle--large@medium">
       <div class="flex__column flex__column--shrink">
         <div class="feedback-box__content">
           <h3>Need support?</h3>
 
-          <p>Questions? Problems? Need more info? Contact us, and we can help!</p>
+          <p>Questions? Problems? Need more info? Contact Segment Support for assistance!</p>
         </div>
       </div>
 
@@ -14,16 +14,24 @@ <h3>Need support?</h3>
       </div>
     </div>
   </div>
-
-  <div class="flex__column flex__column--12 flex__column--6@medium flex">
+  <div class="flex__column flex__column--12 flex__column--4@medium flex">
+    <div class="flex__column flex__column--shrink">
+      <div class="feedback-box__content">
+        <h3>Help improve these docs!</h3>
+        {%include sidebar/edit-tools.html %}
+      </div>
+    </div>
+  </div>
+  <div class="flex__column flex__column--12 flex__column--4@medium flex">
     <div class="feedback-box flex flex--stack flex--justify waffle waffle--none waffle--large@medium">
       <div class="flex__column flex__column--shrink">
         <div class="feedback-box__content">
           <h3>Was this page helpful?</h3>
 
           <div class="flex gutter gutter--large">
             <div class="flex__column flex__column--shrink">
-              <button class="button button-hollow gutter gutter--small" data-feedback-button="helpful" data-active-class="button-fill button-fill--secondary">
+              <button class="button button-hollow gutter gutter--small" data-feedback-button="helpful"
+                data-active-class="button-fill button-fill--secondary">
                 <span class="button__icon">
                   {% include icons/symbols/thumb-up.svg %}
                 </span>
@@ -33,7 +41,8 @@ <h3>Was this page helpful?</h3>
             </div>
 
             <div class="flex__column flex__column--shrink">
-              <button class="button button-hollow gutter gutter--small" data-feedback-button="unhelpful" data-active-class="button-fill button-fill--gray">
+              <button class="button button-hollow gutter gutter--small" data-feedback-button="unhelpful"
+                data-active-class="button-fill button-fill--gray">
                 <span class="button__icon">
                   {% include icons/symbols/thumb-down.svg %}
                 </span>
@@ -52,4 +61,5 @@ <h3>Was this page helpful?</h3>
       </div>
     </div>
   </div>
+
 </div>

src/_includes/content/ajs-upgrade.md

@@ -1,3 +1,3 @@
-<div class="premonition success"><div class="fa fa-check-square"></div><div class="content"><p class="header">Upgrade to Analytics.js 2.0</p>
-<p markdown=1>Actions-based destinations require features found in [Analytics.js 2.0](/docs/connections/sources/catalog/libraries/website/javascript/). [Upgrade your Analytics.js](/docs/connections/sources/catalog/libraries/website/javascript/upgrade-to-ajs2/) source to take advantage of Actions-based destinations, performance improvements, and more.</p>
+<div class="premonition success"><div class="fa fa-check-square"></div><div class="content"><p class="header">Analytics.js 2.0</p>
+<p markdown=1>Actions-based destinations may require features found in [Analytics.js 2.0](/docs/connections/sources/catalog/libraries/website/javascript/). If the destination has Web actions and is connected to a javascript source, [upgrade your Analytics.js](/docs/connections/sources/catalog/libraries/website/javascript/upgrade-to-ajs2/) source to ensure compatibility.</p>
 </div></div>

src/_includes/content/destination-dossier.html

@@ -1,5 +1,10 @@
 <!-- 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.url | split: "/" | last %}
+
+{% assign overrideInfo = site.data.catalog.overrides.items % | where: "slug", thisDestination | first %}
+
+
+
 {% assign destinationInfo = site.data.catalog.destinations.items | where: "slug", thisDestination | first %}
 {% comment %}There are probably prettier ways to generate a list of links to these methods, but this was good enough for me.{% endcomment %}
 {% assign destMethods = "" | split: ", " %}
@@ -12,14 +17,18 @@
 {% assign methodHTML = methodUrl | append: methodName %}
 {% assign methodHTML = methodHTML | append: '</a>' %}
 {% assign destMethods = destMethods | push: methodHTML %} {%endif%}
+
+{% if page.cmode-override %}
+{% assign connectionModes = overrideInfo.connection_modes %}
+{% else %}
 {% assign connectionModes = destinationInfo.connection_modes %}
+{% endif %}
+
 {% assign components = destinationInfo.components %}
 {% endfor %}
 {% assign destMethods = destMethods| reverse %}
 
-{% if page.cmode-override %}
-{% assign destinationInfo = site.data.catalog.overrides.items % | where: "slug", thisDestination | first %}
-{% endif %}
+
 
 
 <div class="quick-info">

src/_includes/content/warehouse-sync-sched.md

@@ -1,4 +1,4 @@
-Your data will be available in Warehouses between 24 and 48 hours from your first sync. Your warehouse then syncs once, or twice a day depending on your [Segment Plan](https://segment.com/pricing).
+Your data will be available in Warehouses between 24 and 48 hours from your first sync. Your warehouse then syncs once or twice a day depending on your [Segment Plan](https://segment.com/pricing).
 
 Segment allows Business Tier (BT) customers to schedule the time and frequency of warehouse data syncs.