Merge pull request segmentio#6212 from segmentio/DOC-849

updated wording for salesforce version upgrade

Author: stayseesong

src/connections/destinations/catalog/google-tag-manager/index.md

@@ -102,4 +102,4 @@ If you're using an 'environment' variable for `gtm_preview` in your tag's query
 
 For Google Tag Manager, consent mode settings need to be managed directly [within your GTM account](https://support.google.com/tagmanager/answer/10718549?hl=en#tag-settings){:target="_blank"}. There's no direct update from Segment for the GTM destination regarding consent mode, as it's managed within GTM tags themselves.
 
-Segment recommeds you to install a consent management platform that uses the current [consent-tools wrapper](https://github.com/segmentio/analytics-next/tree/master/packages/consent/consent-tools){:target="_blank"} that's outside of Google Tag Manager such as [One Trust](https://tanelytics.com/integrate-onetrust-with-google-tag-manager/){:target="_blank"}.
+Segment recommends you install a consent management platform that uses the current [consent-tools wrapper](https://github.com/segmentio/analytics-next/tree/master/packages/consent/consent-tools){:target="_blank"} that's outside of Google Tag Manager like [OneTrust](https://tanelytics.com/integrate-onetrust-with-google-tag-manager/){:target="_blank"}.

src/connections/sources/catalog/cloud-apps/salesforce/index.md

@@ -9,7 +9,7 @@ id: 2baks93n
 Take your company's analysis to the next level by **adding Salesforce as a Source to Segment.** Segment automatically collects objects like `Accounts`, `Campaigns`, and `Tasks` and loads them into your data warehouse. 
 
 > info "Salesforce version upgrade to 58.0"
-> Segment's Salesforce source is currently running on version 39.0. On March 25, 2024, the Salesforce source will upgrade to use Salesforce's latest API version 58.0. See the [version upgrade changes](#version-upgrade-changes) to learn more.
+> Segment's Salesforce source is currently running on version 39.0. On March 25, 2024, the Salesforce source will upgrade to use Salesforce's API version 58.0. See the [version upgrade changes](#version-upgrade-changes) to learn more.
 
 ## Getting started
 > info ""
@@ -129,7 +129,7 @@ For Salesforce, Segment uses the `SystemModstamp`(system_modstamp) field to chec
 If you've added and selected custom fields to an existing collection and would not like to use `SystemModstamp` to bring in historical data, [contact Segment Support](https://segment.com/help/contact/){:target="_blank"} to configure them to sync. You do not need to include the field names.
 
 ## Version upgrade changes
-On March 25, 2024, Segment will upgrade the Salesforce source integration from version 39.0 to Salesforce's latest API version 58.0. With the upgrade, there are [deleted fields](#deleted-fields) and [added fields](#added-fields). 
+On March 25, 2024, Segment will upgrade the Salesforce source integration from version 39.0 to Salesforce's API version 58.0. With the upgrade, there are [deleted fields](#deleted-fields) and [added fields](#added-fields). 
 
 > info ""
 > All new Salesforce sources created on or after March 25, 2024 will use version 58.0. 
@@ -139,7 +139,7 @@ On March 25, 2024, Segment will upgrade the Salesforce source integration from v
 Change | Fields
 ---- | ------------
 Collections deprecated | `AssistantRecommendationShare`, `AssistantRecommendation` 
-Deprecated (Column name, Collection) pairs | (`ForeignKeyAssetId, CustomBrandAsset`), (`UserPermissionsMobileUser, User`), (`OptionsRequireHttps, Site`), (`UniqueKey, LoginEvent`), (`OptionsExternalHttps, Domain`) 
+Columns deprecated from the collections (Column name, Collection) | (`ForeignKeyAssetId, CustomBrandAsset`), (`UserPermissionsMobileUser, User`), (`OptionsRequireHttps, Site`), (`UniqueKey, LoginEvent`), (`OptionsExternalHttps, Domain`) 
 
 
 ### Added fields

src/connections/sources/catalog/libraries/website/javascript/custom-proxy.md

@@ -6,6 +6,8 @@ strat: ajs
 
 Custom domains allow you to proxy Analytics.js and proxy all tracking event requests through your domain.
 
+You cannot use custom proxy setup for Analytics.js CDN or Tracking API with device-mode destinations because it requires the destination's native scripts are loaded onto the client, and the requests are sent directly to the destination. 
+
 ## Custom Proxy prerequisites
 
 To set up a custom domain, you need:

src/guides/how-to-guides/collect-on-client-or-server.md

@@ -43,7 +43,7 @@ Sensitive information is also best kept out of browsers. Any data you don't want
 
 ### Selecting Destinations
 
-Each Segment library allows an `integrations` object either as a top level object or nested in options object. [Check your library docs](/docs/connections/sources/) for details; look for the section titled ["Selecting Destinations"](/docs/connections/sources/catalog/libraries/website/javascript/#selecting-destinations-with-the-integrations-object).
+Each Segment library allows an `integrations` object either as a top level object or nested in options object. 
 
 This flag may be especially useful in Legacy source types, where an event might be triggered on both the client and server for various reasons. The following will cause the payload to be sent to all enabled tools **except** Facebook Pixel:
 

src/protocols/faq.md

@@ -128,6 +128,16 @@ That being said, there are plenty of scenarios where the reactive Schema functio
 
 Blocked events are blocked from sending to all Segment Destinations, including warehouses and streaming Destinations. When an Event is blocked using a Tracking Plan, it does not count towards your MTU limit. They will, however, count toward your MTU limit if you enable [blocked event forwarding](/docs/protocols/enforce/forward-blocked-events/) in your Source settings.
 
+### Why am I seeing unplanned properties/traits in the payload when violations are triggered, despite using schema controls to omit them?
+
+If you're seeing unplanned properties/traits in your payload despite using Schema Controls, you might want to select a new degree of blocking controls. 
+
+Segment's [Schema Controls](docs/connections/sources/schema/destination-data-control/) provide three options to omit properties/traits. Select the one that aligns with your requirements:
+
+1. **Standard Schema Controls/"Unplanned Properties/Traits"**: Segment checks the names of incoming properties/traits against your Tracking Plan.
+2. **Standard Schema Controls/"JSON Schema Violations"**: Segment checks the names and evaluates the values of properties/traits. This is useful if you've specified a pattern or a list of acceptable values in the [JSON schema](/docs/protocols/tracking-plan/create/#edit-underlying-json-schema) for each Track event listed in the Tracking Plan.
+3. **Advanced Blocking Controls/"Common JSON Schema Violations"**: Segment evaluates incoming events thoroughly, including event names, context field names and values, and the names and values of properties/traits, against the [Common JSON schema](/docs/protocols/tracking-plan/create/#common-json-schema) in your Tracking Plan.
+
 ### Do blocked and discarded events count towards my MTU counts?
 
 Blocking events within a [Source Schema](/docs/connections/sources/schema/) or [Tracking Plan](/docs/protocols/tracking-plan/create/) excludes them from API call and MTU calculations, as the events are discarded before they reach the pipeline that Segment uses for calculations.