Merge pull request #3873 from braze-inc/develop

_docs/_api/basics.md

@@ -45,10 +45,6 @@ For SDK integration, use the ["SDK Endpoint"]({{site.baseurl}}/user_guide/admini
 |EU-02| `https://dashboard-02.braze.eu` | `https://rest.fra-02.braze.eu` | `sdk.fra-02.braze.eu` |
 {: .reset-td-br-1 .reset-td-br-2 .reset-td-br-3  .reset-td-br-4}
 
-### Company secret explanation
-
-The `company_secret` was formerly included with all API requests but has been deprecated as of October 2014. This field will be ignored for all future API requests to ensure backward compatibility.
-
 ### App group REST API keys
 
 {% alert note %}
@@ -120,7 +116,7 @@ For more information, refer to the following article based on your platform:
 
 - [Setting User IDs - iOS][9]
 - [Setting User IDs - Android][10]
-- [Setting User IDs - Windows Universal][13]
+- [Setting User IDs - Web][13]
 
 ## API limits
 
@@ -143,7 +139,7 @@ This client library is currently in beta. Want to help us make this library bett
 [8]: https://dashboard-01.braze.com/app_settings/developer_console/ "Developer Console"
 [9]: {{site.baseurl}}/developer_guide/platform_integration_guides/ios/analytics/setting_user_ids/
 [10]: {{site.baseurl}}/developer_guide/platform_integration_guides/android/analytics/setting_user_ids/
-[13]: {{site.baseurl}}/developer_guide/platform_integration_guides/windows_universal/analytics/setting_user_ids/#setting-user-ids
+[13]: {{site.baseurl}}/developer_guide/platform_integration_guides/web/analytics/setting_user_ids/
 [support]: {{site.baseurl}}/braze_support/
 [25]: {% image_buster /assets/img_archive/api-key-permissions.png %}
 [26]: {% image_buster /assets/img_archive/api-key-ip-whitelisting.png %}

_docs/_developer_guide/platform_integration_guides/android/push_notifications/android/integration/standard_integration.md

@@ -82,7 +82,7 @@ Braze.configure(this, brazeConfig)
 {% endtab %}
 {% tab Manual registration %}
 
-To manually register your tokens, we recommended you call [`Braze.registerAppboyPushMessages()`](https://appboy.github.io/appboy-android-sdk/kdoc/braze-android-sdk/com.appboy/-appboy/register-push-token.html) from within your application [`onCreate()`](https://developer.android.com/reference/android/app/Application.html#onCreate()) method to ensure that push tokens are reliably delivered to Braze.
+To manually register your tokens, we recommended you call [`Braze.setRegisteredPushToken()`](https://appboy.github.io/appboy-android-sdk/kdoc/braze-android-sdk/com.braze/-braze/registered-push-token.html) from within your application [`onCreate()`](https://developer.android.com/reference/android/app/Application.html#onCreate()) method to ensure that push tokens are reliably delivered to Braze.
 
 {% subtabs local %}
 {% subtab JAVA %}

_docs/_partners/canvas_steps/facebook_audience_sync.md

@@ -64,13 +64,18 @@ For customers who have previously undergone the Facebook App Review process for
 <br><br>The Facebook oAuth configuration will also apply to [Facebook exports via Segments]({{site.baseurl}}/partners/message_orchestration/additional_channels/retargeting/facebook/#prerequisites). 
 {% endalert %}
 
-### Step 2: Add a Facebook Audience component in Canvas Flow
+### Step 2: Accept custom audiences terms of service
+
+Before building out your Canvas, you must first accept the Facebook custom audiences terms of service. Your terms of service can be found at the following link:
+`https://business.facebook.com/ads/manage/customaudiences/tos/?act=<your_ad_account_id>`
+
+### Step 3: Add a Facebook Audience component in Canvas Flow
 
 Add a component in your Canvas and select **Facebook Audience**.
 
 ![Workflow of the previous steps to add a Facebook Audience component in Canvas Flow.][11]
 
-### Step 3: Sync setup
+### Step 4: Sync setup
 
 Click on the **Custom Audience** button to open the component editor.
 
@@ -101,7 +106,7 @@ It's important to note that Facebook prohibits removing users from custom audien
 {% endtab %}
 {% endtabs %}
 
-### Step 4: Launch Canvas
+### Step 5: Launch Canvas
 
 Once you have configured your Facebook Audience component, simply launch the Canvas! The new custom audience will be created, and users who flow through the Facebook Audience component will be passed into this custom audience on Facebook. If your Canvas contains subsequent components, your users will then advance to the next step in their user journey.
 

_docs/_user_guide/message_building_by_channel/email/managing_user_subscriptions.md

@@ -33,7 +33,7 @@ Braze does not count subscription state changes against your data points, global
 
 ### Subscription groups
 
-Subscription groups are segment filters that can further narrow your audience from the [Global Subscription States](#subscription-states). You can add up to 25 subscription groups per app group. These groups allow you to present more granular subscription options to end-users.
+Subscription groups are segment filters that can further narrow your audience from the [Global Subscription States](#subscription-states). You can add up to 100 subscription groups per app group. These groups allow you to present more granular subscription options to end-users.
 
 For example, suppose you send out multiple categories of email campaigns (Promotional, Newsletter, Product Updates). In that case, you can use subscription groups to let your customers pick and choose which email categories they want to subscribe or unsubscribe from in bulk from a single page, using our [email preference center](#email-preference-center). 
 

_docs/_user_guide/message_building_by_channel/sms/sms_subscription_group.md

@@ -28,6 +28,7 @@ There are two subscription states for SMS users: `subscribed` and `unsubscribed`
 - **Rest API:** User profiles can be programmatically set by the [/subscription/status/set][4] endpoint by using Braze's REST API.
 - **Web SDK:** Users can be added to an email or SMS subscription group using the `addToSubscriptionGroup` method for [Android](https://appboy.github.io/appboy-android-sdk/javadocs/com/braze/BrazeUser.html#addToSubscriptionGroup-java.lang.String-), [iOS](https://appboy.github.io/appboy-ios-sdk/docs/interface_a_b_k_user.html#a74092a50fcda364bb159013d0222e287), or [Web][11].
 - **Automatically handled upon user opt-in/opt-out:** By users texting a default opt-in or opt-out [keyword][7], Braze automatically sets and updates users' subscription state.
+- **User import**: Users can be added into email or SMS subscription groups via user import. When updating subscription group status, you must have these two columns in your CSV: `subscription_group_id` and `subscription_state`. Refer to [User import]({{site.baseurl}}/user_guide/data_and_analytics/user_data_collection/user_import/#updating-subscription-group-status) for more information.
 
 ### How to check a user's SMS subscription group