Merge branch 'master' into jenskene-patch-1

markzegarelli · web-flow · commit dfbb3064d374 · 2021-07-08T17:09:07.000-07:00
diff --git a/src/_data/sidenav/main.yml b/src/_data/sidenav/main.yml
@@ -24,21 +24,21 @@ sections:
   - path: /guides
     title: An introduction to Segment
   - path: /guides/intro-impl
-    title: Segment developer overview
+    title: Segment for developers
   - path: /guides/intro-user
-    title: Segment data user overview
+    title: Segment for data users
   - path: /guides/intro-admin
-    title: Segment workspace admin overview
+    title: Segment for workspace admins
   - path: /guides/filtering-data
     title: Filtering your Segment data
   - path: /guides/duplicate-data
-    title: How does Segment handle duplicate data?
+    title: Handling duplicate data
   - path: /guides/ignore-bots
-    title: How can I ignore internet bots?
+    title: Ignoring internet bots
   - path: /guides/segment-vs-tag-managers
-    title: What is the difference between Segment and tag managers?
+    title: Segment vs. tag managers
   - path: /guides/what-is-replay
-    title: What is Replay?
+    title: Replay
 
   - section_title: How To Guides
     slug: guides/how-to-guides
diff --git a/src/_includes/content/destination-footer.md b/src/_includes/content/destination-footer.md
@@ -56,13 +56,15 @@ Segment lets you change these destination settings from the Segment app without
 {% endunless %}
 {% if currentIntegration.previous_names.size > 1 %}
 
+{% unless page.hide-integrations-object == true %}
 ## Adding {{ currentIntegration.display_name }} to the integrations object
 
 To add {{ currentIntegration.display_name }} to the `integrations` JSON object (for example, [to filter data from a specific source](/docs/guides/filtering-data/#filtering-with-the-integrations-object)), use one of the following valid names for this integration:
 
 {% for valid_name in currentIntegration.previous_names %}
 - {{ valid_name }}
 {% endfor %}
+{% endunless %}
 {% endif %}
 
 {% endif %}
diff --git a/src/connections/destinations/catalog/braze/index.md b/src/connections/destinations/catalog/braze/index.md
@@ -2,6 +2,7 @@
 title: Braze Destination
 hide-cmodes: true
 hide-personas-partial: true
+hide-integrations-object: true
 ---
 
 [Braze](https://www.braze.com/), formerly Appboy, is an engagement platform that empowers growth by helping marketing teams to build customer loyalty through mobile, omni-channel customer experiences.
diff --git a/src/connections/sources/catalog/libraries/website/javascript/upgrade-to-ajs2.md b/src/connections/sources/catalog/libraries/website/javascript/upgrade-to-ajs2.md
@@ -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. 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.
+Analytics.js 2.0 is fully backward compatible with Analytics.js Classic when using the default Segment snippet. 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
 
diff --git a/src/guides/duplicate-data.md b/src/guides/duplicate-data.md
@@ -1,5 +1,5 @@
 ---
-title: How does Segment handle duplicate data?
+title: Handling duplicate data
 ---
 
 Segment has a special de-duplication service that sits just behind the `api.segment.com` endpoint, and attempts to drop duplicate data. However, that de-duplication service has to hold the entire set of events in memory in order to know whether or not it has seen that event already. Segment stores 24 hours worth of event `message_id`s. This means Segment can de-duplicate any data that appears within a 24 hour rolling window.
diff --git a/src/guides/ignore-bots.md b/src/guides/ignore-bots.md
@@ -1,20 +1,20 @@
 ---
-title: How can I ignore internet bots?
+title: Internet bots
 ---
 
-## But wait, I don't even know what a bot is!
+## What's a bot?
 
 If you stumbled onto this page by accident and don't know what a bot is or are just curious to learn more, the following Wikipedia article provides an awesome summary: [https://en.wikipedia.org/wiki/Internet\_bot](https://en.wikipedia.org/wiki/Internet_bot).
 
 Surprisingly, more than half of all web traffic is made up of bots. While a fraction of them are good bots with a regulated pattern, and therefore beneficial to all online businesses, the majority of them have malicious intents and are mostly unregulated.
 
-## Got it! So is it possible to ignore bad bots?
+## Is it possible to ignore bad bots?
 
-Now that we're level-set on what a bot is, unfortunately Segment does not offer any out-of-the-box feature to filter/ignore bot traffic.
+Segment doesn't offer any out-of-the-box feature to filter or ignore bot traffic.
 
 As such, you generally have two options:
 
-**Handle the filtering at a destination-level:** some of our destination partners, [like Mixpanel](https://help.mixpanel.com/hc/en-us/articles/115004567946-Exclude-Bot-Activity-Web-JavaScript-), filter bots automatically. Whereas others [such as Hubspot](https://knowledge.hubspot.com/getting-started-with-hubspot-v2/how-to-filter-out-traffic-from-your-website-analytics) allow you to set up bot filtering manually. The advantage of filtering bots at a destination level is that it allows you to implement a robust, easy-to-maintain solution. However, as it pertains to Segment, the downside is that bot traffic will _still_ make it to Segment, [affecting your MTU count.](https://segment.com/docs/guides/usage-and-billing/mtus-and-throughput/#how-does-segment-calculate-mtus)
+**Handle the filtering at a destination-level:** Some of Segment's destination partners, [like Mixpanel](https://help.mixpanel.com/hc/en-us/articles/115004567946-Exclude-Bot-Activity-Web-JavaScript-), filter bots automatically. Whereas others [such as Hubspot](https://knowledge.hubspot.com/getting-started-with-hubspot-v2/how-to-filter-out-traffic-from-your-website-analytics) allow you to set up bot filtering manually. The advantage of filtering bots at a destination level is that it allows you to implement a robust, easy-to-maintain solution. However, as it pertains to Segment, the downside is that bot traffic will _still_ make it to Segment, [affecting your MTU count.](https://segment.com/docs/guides/usage-and-billing/mtus-and-throughput/#how-does-segment-calculate-mtus)
 
 **Write custom logic that suppresses bot activity from being sent to Segment:** if you want to prevent bot traffic from making it to Segment in the first place, another option is to write your own custom code. The logic, in pseudo-code, would look something like this if you know a particular characteristic of the bot traffic to filter out, such as the userAgent:
 
@@ -25,17 +25,17 @@ if ! window.navigator.userAgent in robots
   analytics.track
 ```
 
-The benefit here of course is that you would be able to limit the impact that bots have on your MTU count. However, on the flip side, it's much harder to implement and maintain a custom filter.
+The benefit here is that you would be able to limit the impact that bots have on your MTU count. On the flip side, it's much harder to implement and maintain a custom filter.
 
-## If we see a massive MTU spike because of bots, can we apply for a refund?
+## If I see a massive MTU spike because of bots, can I apply for a refund?
 
-As a matter of policy, we typically do not provide refunds for bot-related MTU spikes, as bot traffic is out of our control. However for extenuating circumstances, [you can petition for a refund](https://segment.com/contact/billing), assuming you're able to provide proof of the bot's effect.
+As a matter of policy, Segment doesn't provide refunds for bot-related MTU spikes, as bot traffic is out of Segment's control. However for extenuating circumstances, [you can petition for a refund](https://segment.com/contact/billing), assuming you're able to provide proof of the bot's effect.
 
-## I'm seeing a lot of browser traffic from Boardman; isn't that from Segment?
+## I'm seeing a lot of browser traffic from Boardman; is that from Segment or a bot?
 
-We do indeed use Amazon's hosting services, which are based in Boardman, Oregon. However [many bots also originate from AWS in Boardman as well](https://productforums.google.com/forum/#!topic/webmasters/Ow5baxkjiPI).
+Segment uses Amazon's hosting services, which are based in Boardman, Oregon. However [many bots also originate from AWS in Boardman as well](https://productforums.google.com/forum/#!topic/webmasters/Ow5baxkjiPI).
 
-One way you can confirm whether or not traffic is coming from Segment vs. a bot is to check the userAgent of the inbound call. Ours is:
+One way you can confirm whether or not traffic is coming from Segment vs. a bot is to check the userAgent of the inbound call. Segment's is:
 
 ```js
 'Mozilla/5.0 (' + deviceModel.slice(0, -3) + '; CPU ' + osName + ' ' +
diff --git a/src/guides/intro-admin.md b/src/guides/intro-admin.md
@@ -1,5 +1,5 @@
 ---
-title: Segment for Workspace Administrators
+title: Segment for workspace administrators
 ---
 
 If your job is to set up or maintain a Segment Workspace for your organization, or assist other people using the Segment Web App, this guide is for you. If you're more interested in Segment implementation details, see the [developer intro guide](/docs/guides/intro-impl/).
diff --git a/src/guides/intro-impl.md b/src/guides/intro-impl.md
@@ -1,5 +1,5 @@
 ---
-title: Segment for Developers
+title: Segment for developers
 ---
 
 This guide explains all you need to know to get started with your Segment implementation, and directs you to more resources depending on your specific needs.
diff --git a/src/guides/intro-user.md b/src/guides/intro-user.md
@@ -1,5 +1,5 @@
 ---
-title: Segment for Data Users
+title: Segment for data users
 ---
 
 If you aren't involved in setting up your Segment implementation, or are just starting to set up Destinations for your organization's workspace, this guide is for you.
diff --git a/src/guides/segment-vs-tag-managers.md b/src/guides/segment-vs-tag-managers.md
@@ -1,5 +1,5 @@
 ---
-title: What is the difference between Segment and tag managers?
+title: Segment vs. tag managers
 ---
 
 Tag managers, also known as Tag Management Systems (TMS), were a popular solution before the mainstream adoption of mobile apps. They primarily helped Digital Analytics and Online Marketers manage web tags or "beacons" on a website.
diff --git a/src/guides/usage-and-billing/billing.md b/src/guides/usage-and-billing/billing.md
@@ -4,35 +4,35 @@ title: Billing and Account FAQs
 
 ## What is a billing cycle?
 
-On the Segment monthly Team plan, your billing cycle starts the day after your 14-day trial ends. You are billed on this day for each month while you are on this plan. 
+On the Segment monthly Team plan, your billing cycle starts the day after your 14-day trial ends. You're billed on this day for each month while you're on this plan. 
 
-On the Segment annual Team plan, you are billed at the end of your 14-day trail for the amount for an entire year of service including a specific number of MTUs. Annual plan subscribers are billed for MTU overages at the end of each monthly cycle.
+On the Segment annual Team plan, you're billed at the end of your 14-day trial for the amount of an entire year of service including a specific number of [MTUs](docs/guides/usage-and-billing/mtus-and-throughput/#what-is-an-mtu). Annual plan subscribers are billed for MTU overages at the end of each monthly cycle.
 
 
 ## How do I change my plan?
 
-If you already have a Segment workspace, you can change which plan your workspace is on by navigating to the "Usage & Billing" menu, then finding the "Plans" page. You can select a different plan from the "Plans" page.
+If you already have a Segment workspace, you can change which plan your workspace is on by navigating to **Settings > Usage & Billing > Plans**.
 
-_If you cancel or downgrade your plan during the two-week trial period, you do not incur any charges._
+_If you cancel or downgrade your plan during the 2-week trial period, you don't incur any charges._
 
 ### What if I cancel my paid plan before the end of the month?
 
-#### Cancellation on the Monthly Team Plan
+#### Cancellation on the monthly Team plan
 
-If you cancel your plan or downgrade to a free account before the end of your official billing period on the monthly team plan, you will receive a final bill for the prorated amount for the $120 base + a charge for any MTUs you have used over the allotted 10,000 at the rates posted on our [pricing page](https://segment.com/pricing).
+If you cancel your plan or downgrade to a free account before the end of your official billing period on the monthly Team plan, you'll receive a final bill for the prorated amount for the $120 base + a charge for any MTUs you've used over the allotted 10,000 at the rates posted on the [pricing page](https://segment.com/pricing).
 
-#### Cancellation on the Annual Team Plan
+#### Cancellation on the annual Team plan
 
-We do not issue refunds for the pre-paid portion of your annual bill after your trial has ended.
+Segment doesn't issue refunds for the pre-paid portion of your annual bill after your trial ends.
 
-Be aware that if you notify us that you want to cancel your annual plan, but continue to send data to our servers, you may incur overage charges in any given month. You should fully delete your workspace or cycle your write keys to stop all data flow into Segment and avoid future charges.
+Be aware that if you notify Segment of wanting to cancel your annual plan, but continue to send data to Segment's servers, you may incur overage charges in any given month. You should fully delete your workspace or cycle your write keys to stop all data flow into Segment to avoid future charges.
 
 
 ## Will Segment charge sales tax on my invoice?
 
-All Segment customers with a US business address may be subject to state and local sales taxes. The applicable tax law will be applied based on your business location address, which may be different from your billing address. Customers who purchase a taxable product or service, and are located in a jurisdiction where Segment currently charges sales tax, will see the calculated sales tax on their invoice.
+All Segment customers with a US business address may be subject to state and local sales taxes. The applicable tax law applies based on your business location address, which may be different from your billing address. Customers who purchase a taxable product or service, and are located in a jurisdiction where Segment currently charges sales tax, will see the calculated sales tax on their invoice.
 
-Segment currently charges sales tax in the following states:
+Segment currently charges sales tax in the these states:
 
 - Arizona
 - Colorado (Denver only)
@@ -53,7 +53,7 @@ Segment currently charges sales tax in the following states:
 
 If you believe your organization qualifies for a sales tax exemption (for example, because of a nonprofit or government status), you can contact [tax@segment.com](mailto:tax@segment.com) with the appropriate form.
 
-### I submitted a form for tax exemption, why am I still being charged sales tax?
+### I submitted a form for tax exemption, why am I still charged sales tax?
 
 Tax might still be charged on your bill if either:
 
@@ -63,15 +63,23 @@ Tax might still be charged on your bill if either:
 
 ## Do you offer refunds?
 
-In most cases we do not offer refunds, as noted in our [Terms of Service](https://segment.com/legal/terms/). [Contact support](https://segment.com/help/contact) if you feel that you are in a unique situation.
+In most cases Segment doesn't offer refunds, as noted in the [Terms of Service](https://segment.com/legal/terms/). [Contact support](https://segment.com/help/contact) if you feel that you're in a unique situation.
 
 ## Is there a free trial for paid plans?
 
-Yes! We offer a _**two-week trial on the Team plan**_ to let you try the plan before you purchase it! 
+Yes! Segment offers a _**2-week trial on the Team plan**_ to let you try the plan before you purchase it! 
 
-We also offer the Free plan, which includes up to 1,000 MTUs, at no cost to you. 
+Segment also offers the Free plan, which includes up to 1,000 MTUs, at no cost to you. 
 
-Find out more about the different plans and which one suits your needs best [here](https://segment.com/pricing). 
+Find out more about the [different plans](https://segment.com/pricing) and which one suits your needs best.  
+
+## What happens when I exceed the Free plan limit?
+
+The Free plan includes up to 1,000 MTUs at no cost. If you exceed the 1,000 MTU limit once in a 6-month period, Segment locks your account but data is still able to flow through Segment. To unlock your account, you can choose from these options:
+* **Option 1**: Wait for a full billing cycle (1 month) to go by with any overages. This will automatically unlock your account if the MTU numbers are able to go back down on their own.
+* **Option 2**: Upgrade to the [Team plan](https://segment.com/pricing/). This starts a 2-week free trial that gives you 14 days to fix your implementation to decrease the traffic.
+
+If you exceed the 1,000 MTU limit twice in a 6-month period, Segment locks your account and also stops sending and receiving data. You can unlock your account by following option 2 above to upgrade to the [Team plan](https://segment.com/pricing/) 2-week free trial. 
 
 ## Team Trial FAQ
 
@@ -81,20 +89,20 @@ The Team trial is a 14-day free trial of Segment's [Team plan](https://segment.c
 
 **How do I get a two-week Team trial?**
 
-You automatically receive a two week trial when you sign up for a Team plan. 
+You automatically receive a 2-week trial when you sign up for a Team plan. 
 
 **Do I have to be a "new" customer to receive the free Team trial?**
 
 The free trial is available to all customers who have never had a Team plan. This includes new customers as well as customers who have previously been on the Free plan. 
 
 **Do you have to include your payment information when signing up for a Team trial?**
 
-If you're upgrading from a Free Plan to a Team Plan, you are required to add your payment information. 
+If you're upgrading from a Free Plan to a Team Plan, you're required to add your payment information. 
 
-If you are signing up for a new Team plan, you do not have to add your payment information during sign up. However, if you would like to continue to use the Team plan after the 14 day trial, add your credit card information on the "Payment Information" page in your workspace before the trial ends. 
+If you're signing up for a new Team plan, you don't have to add your payment information during sign up. If you would like to continue to use the Team plan after the 14-day trial, add your credit card information on the "Payment Information" page in your workspace before the trial ends. 
 
-**What happens when the two week trial ends?**
+**What happens when the two-week trial ends?**
 
-If you added your payment information, your subscription automatically continues at the regular rate after the trial period expires. You can [delete your workspace](/docs/guides/usage-and-billing/account-management/#how-do-i-delete-my-workspace-entirely) or [downgrade to a Free plan](/docs/guides/usage-and-billing/billing/#how-do-i-change-my-plan) any time during the trial if you don't want to be charged.
+If you added your payment information, your subscription automatically continues at the regular rate after the trial period expires. You can [delete your workspace](/docs/guides/usage-and-billing/account-management/#how-do-i-delete-my-workspace-entirely) or [downgrade to a Free plan](/docs/guides/usage-and-billing/billing/#how-do-i-change-my-plan) any time during the trial to avoid charges.
 
-To activate the free trial we ask that you add your payment information (if you have already done so).
+To activate the free trial, add your payment information.
diff --git a/src/guides/usage-and-billing/twilio-developer-plan.md b/src/guides/usage-and-billing/twilio-developer-plan.md
diff --git a/src/guides/what-is-replay.md b/src/guides/what-is-replay.md
