fix conflicts

Author: markzegarelli

src/_data/sidenav/main.yml

@@ -491,6 +491,8 @@ sections:
     title: Prod and Testing Environments in Segment
   - path: /segment-app/verify-email-address
     title: Verifying Your Email Address
+  - path: /segment-app/support-access
+    title: Support Access
 - section_title: API
   section:
   - path: /api/public-api

src/connections/sources/catalog/libraries/server/http-api/index.md

@@ -24,9 +24,16 @@ To send data to Segment's HTTP API, a content-type header must be set to `'appli
 
 ## Errors
 
-Segment returns a `200` response for all API requests so debugging should be done in the Segment Debugger. The only exception is if the request is too large / JSON is invalid it will respond with a `400`.
+Segment returns a `200` response for all API requests except errors caused by large payloads and JSON errors (which return `400` responses.) To debug events that return `200` responses but aren't accepted by Segment, use the Segment Debugger.
 
-Segment welcomes feedback on API responses and error messages. [Reach out to support](https://segment.com/help/contact/) with any requests or suggestions you may have.
+Common reasons events are not accepted by Segment include: 
+  - **Payload is too large:** The HTTP API can handle API requests that are 32KB or smaller. The batch API endpoint accepts a maximum of 500KB per request, with a limit of 32KB per event in the batch. If these limits are exceeded, Segment returns a 400 Bad Request error. 
+  - **Identifier is not present**: The HTTP API requires that each payload has a userId and/or anonymousId.
+  - **Track event is missing name**: All `track` events sent to Segment must have an `event` field. 
+  - **Deduplication**: Segment deduplicates events using the `messageId` field, which is automatically added to all payloads coming into Segment. If you're setting up the HTTP API yourself, ensure all events have unique messageId values.
+  - **Invalid JSON**: If you send an event with invalid JSON, Segment returns a 400 Bad Request error.
+
+Segment welcomes feedback on API responses and error messages. [Reach out to support](https://segment.com/help/contact/){:target="_blank"} with any requests or suggestions you may have.
 
 ## Rate Limits
 

src/privacy/user-deletion-and-suppression.md

@@ -97,3 +97,17 @@ Refer to [List Suppressions](https://docs.segmentapis.com/tag/Deletion-and-Suppr
 ### List Deletion Requests for your Workspace
 
 Refer to the [List Regulations from Source](https://docs.segmentapis.com/tag/Deletion-and-Suppression#operation/listRegulationsFromSource){:target="_blank"} Public API method.
+
+## Data retention
+
+Set lifecycle policies for the data stored internally in Segment’s secure event Archives, on S3.
+
+These limits represent the amount of time that Segment stores a copy of event data received by any of your sources. Segment recommends keeping at least 30 days of data to enable [Replays](/docs/guides/what-is-replay/) of your data.
+
+### Workspace Default Archive Retention Period
+
+Select the default retention period for the workspace here. This value applies to all sources in the workspace, unless overridden.
+
+### Source-Level Archive Retention Periods
+
+Override the workspace default retention period on a per-source level.

src/profiles/identity-resolution/identity-resolution-settings.md

@@ -190,3 +190,4 @@ When choosing the priority of your identifier, ask the following questions about
 1. Is it an immutable ID? Give immutable IDs, such as user_id, highest priority.
 2. Are they unique IDs? Give Unique IDs such as email higher priority than possibly shared identifiers like android.id or ios.id.
 3. Does it temporarily identify a user? Identifiers such as anonymous_id, ios.idfa, and ga_client_id are constantly updated or expired for a user. Generally speaking, rank these lower than identifiers that permanently identify a user.
+

src/profiles/profiles-settings.md

@@ -0,0 +1,22 @@
+---
+title: Profiles Settings
+---
+
+## Identity resolution
+
+For information about Profiles Identity Resolution Settings, see [Identity Resolution Settings](/docs/profiles/identity-resolution/identity-resolution-settings/)
+
+## Sources
+
+Sources provide the data that Profiles uses to perform Identity Resolution. You can add multiple sources to a single Profiles space. Profiles supports the following Source types:
+
+| Type                                                             | Profiles Compatibility            |
+| ---------------------------------------------------------------- | --------------------------------- |
+| [Web](/docs/connections/sources/#website-libraries)              | ![](/docs/images/supported.svg)   |
+| [Mobile](/docs/connections/sources/#mobile)                      | ![](/docs/images/supported.svg)   |
+| [Server](/docs/connections/sources/#server)                      | ![](/docs/images/supported.svg)   |
+| [Object Cloud ](/docs/connections/sources/#object-cloud-sources) | ![](/docs/images/unsupported.svg) |
+| [Event Cloud](/docs/connections/sources/#event-cloud-sources)    | ![](/docs/images/supported.svg)   |
+
+
+

src/segment-app/iam/audit-trail.md

@@ -3,7 +3,7 @@ title: Audit Trail
 ---
 {% include content/plan-grid.md name="audit-trail" %}
 
-Segment offers an in-app 90 day Audit Trail for Business Tier accounts. If you are a workspace Owner, you view user and system activity in your workspace settings, in the "Audit Trail" tab under "Admin".
+Segment offers an in-app 90 day Audit Trail for Business Tier accounts. If you are a Workspace Owner, you view user and system activity in your workspace settings, in the "Audit Trail" tab under "Admin".
 
 You can filter for specific actions or actors to see who made changes on specific resources in the app. Actors can include both logged-in users as well as access tokens. You can export the information to a CSV for download, or forward the activity to a Segment source. For example, you can forward audit trail activity to set up real-time Slack alerts and quickly revert changes that could cause unwanted downstream effects, such as a user unintentionally disabling a warehouse.
 
@@ -89,3 +89,16 @@ The Audit Trail includes information on the following activity:
 *   Engage Warehouse Source Created
 *   Engage Warehouse Source Modified
 *   Engage Warehouse Source Deleted
+
+
+## Audit forwarding
+
+You can forward events in your workspace to any of the sources you have configured in the workspace.
+
+To forward Audit Trail events:
+
+1. Navigate to **Settings > Workspace Settings > Audit Forwarding**.
+2. Select the source to which you'll forward workspace events.
+3. Toggle the setting to **On** and click **Save Changes**.
+
+When you forward audit events to a source, Segment passes those events through its entire processing pipeline. This ensures that tracking plans, filters, and other features work with the audit events, and also ensures you can send those events to multiple downstream destinations.

src/segment-app/support-access.md

@@ -1,27 +1,19 @@
 ---
-title: Granting Segment Support Access
-hidden: true
+title: Support Access
 ---
-You can contact Segment Product Support by [submitting a ticket](https://segment.com/help/contact/).
+To best assist you after you submit a support ticket, Segment's Customer Success Engineers may request temporary access to your workspace. Once you grant access to your workspace, CSEs can access your workspace for up to 7 days, or until you revoke access.
 
-If you submit a particularly tricky ticket to our Segment Support Engineers, we might ask you to grant temporary access to your Segment account so we can troubleshoot your issue. Once granted access, a Segment Support Engineer can access your account for up to 7 days. You can also revoke Support Access at any time. This option is always available to you, but you only need to grant access when it is recommended by a Segment Support Engineer.
-> note ""
-> *Note*: Support Access is not available for workspaces using forced-SSO at this time.
+> info ""
+> Support Access is not available for workspaces using forced-SSO at this time.
 
 ## Granting a Segment Support Engineer access to your account
-Support Access is available for all Segment Workspace Owners and can be found under your [Workspace Settings](https://app.segment.com/goto-my-workspace/settings/support-access).
+Support Access is available for all Segment Workspace Owners and can be found on the **Support Access** tab of the  [Workspace Settings](https://app.segment.com/goto-my-workspace/settings/support-access) page.
 
 Click **Grant Access** to allow a Segment Support Engineer to access your account.
 
-When Segment Support no longer needs access to your account, simply revoke access at any time.
 
-![The Segment Settings page before granting Support Access](images/support-access-before.png)
-_The Segment Settings page before granting Support Access_
+## Support privileges
 
-![The Segment Settings page after granting Support Access](images/support-access-after.png)
-_The Segment Settings page after granting Support Access_
-
-**What can a Segment Support Engineer do in my account?**
 When you grant Support Access, the Segment Support Engineers can do everything that you can do in your workspace.
 
 ## How do I know it's working?

src/segment-app/workspace-home.md

@@ -2,13 +2,10 @@
 title: Workspace Home
 ---
 
-{% include content/plan-grid.md name="workspace-home" %}
-
-
 Segment's Workspace Home serves as a dashboard that gives you a single consolidated view of the workspace, its health and status, and metrics for specific integrations over time.
 
-> info ""
-> The Workspace Home is available only to Business tier customers, and is only visible for [Workspace Owners](/docs/segment-app/iam/roles/). If you have access to the Home page, it is the first screen you see when you first log in to your Segment Workspace.
+> info "Availability"
+> The Workspace Home is visible to users who have the Workspace Owner [role](/docs/segment-app/iam/roles/). If you have access to the Home page, it is the first screen you see when you log in to your Segment Workspace.
 
 The Home page shows a summary of errors in the workspace's sources and destinations, a list of "favorite" integrations that you can configure, and information about recent audit logged events, and your billing plan usage.
 
@@ -29,6 +26,10 @@ If your Segment plan includes Protocols, the dashboard shows [Event Violations](
 ![](/docs/segment-app/images/workspace-home-violations.png)
 
 
+## Sources - Events Received
+
+If your Segment plan does not include Protocols, an Events Received chart is shown to reflect the number of events received across sources.
+
 ## Destinations - Event Delivery
 
 The Destinations section of the Home page shows a summary of the Event Delivery for the workspace, including a graph over time. You can click the **destinations** link to see a list of destinations with delivery problems, ordered from highest to lowest error rate. You can click a destination to see more details about the delivery failures, and from the details panel click the destination name to go directly to its configuration page.
@@ -50,7 +51,7 @@ To delete a favorite, click the **more** (…) menu and select **Remove favorite
 
 ## Recent Activity
 
-The recent activity section displays the most recent items logged to the Segment Audit trail. This includes workspace membership changes and requests, changes to the configuration of different Segment features (including sources, destinations, and to Engage and Protocols configurations), and data storage sync failures.
+For users with Business Tier workspaces, the recent activity section displays the most recent items logged to the Segment Audit trail. This includes workspace membership changes and requests, changes to the configuration of different Segment features (including sources, destinations, and to Engage and Protocols configurations), and data storage sync failures.
 
 ## Usage