Merge branch 'develop' of github.com:segmentio/segment-docs into develop

Author: markzegarelli

.github/styles/Vocab/Docs/accept.txt

@@ -102,6 +102,7 @@ NSDate
 NSNull
 NSNumber
 NSString
+OAuth
 Okta
 Omnichannel
 onboarding

src/connections/destinations/catalog/zendesk/index.md

@@ -8,9 +8,6 @@ id: 54521fdc25e721e32a72ef06
 
 ## Getting Started
 
-{% include content/connection-modes.md %}
-
-
 1. From the Segment web app, click **Catalog**.
 2. Search for "Zendesk" in the Catalog, select it, and choose which of your sources to connect the destination to.
 3. There are two ways to authenticate your Zendesk account with Segment:
@@ -35,17 +32,6 @@ When you call `identify`, Segment inserts or updates a user record in Zendesk an
 
 Here's an example:
 
-{% comment %} api-example '{
-  "action": "identify",
-  "userId": "12345",
-  "traits": {
-    "name": "Kobe Bryant",
-    "email": "[email protected]",
-    "timezone": "America/Los_Angeles",
-    "organizationId": 6789,
-    "phone": "763-555-2342"
-  }
-}'}}} {% endcomment %}
 
 ```js
 {
@@ -61,6 +47,9 @@ Here's an example:
 }
 ```
 
+> info "The `role` trait in Zendesk"
+> 'role1 us a reserved trait in Zendesk. As a result, you can't pass data into that field. To get role-related data into Zendesk, map it as a separate field, for example `user_role`.
+
 By default, Users in Zendesk have many standard attributes associated with a single User record. Segment, at this time, is mapping to a subset of these. If you attempt to send data to a Zendesk attribute that are not yet mapped, it will create a custom field for this (it will not update the existing attribute).
 
 Here are the Zendesk User Attributes Segment maps to and their syntax.
@@ -75,7 +64,8 @@ Here are the Zendesk User Attributes Segment maps to and their syntax.
 | userId             | user_id            |
 | userId             | external_id        |
 
-**Note on Name:** If `name` is provided, Segment will parse `firstName` and `lastName` from this, or you can send `firstName` and `lastName`separately and they will be concatenated to `name`.
+> info "About the Name field" 
+> If `name` is provided, Segment parses `firstName` and `lastName` from this, or you can send `firstName` and `lastName` separately and Zendesk concatenates them to `name`.
 
 ### Removing Users from a Zendesk Organization Membership on Segment Identify
 
@@ -101,7 +91,7 @@ Here's an example:
 ```
 
 > note ""
-> **Note**: When a request is made, Zendesk schedules a job to unassign all working tickets currently assigned to the user and organization combination. The `organization_id` of the unassigned tickets is set to `null`.
+> **Note**: When a request is made, Zendesk schedules a job to un-assign all working tickets currently assigned to the user and organization combination. The `organization_id` of the unassigned tickets is set to `null`.
 
 ### Zendesk Verification Email at User Creation