Merge branch 'master' into niallb/wootric_update

Author: niallzato

_config.yml

@@ -7,7 +7,7 @@ source: ./src
 
 permalink: /:categories/:title/
 
-exclude: ['js', '_site']
+exclude: ['js', '_site', '*.sketch']
 # Build settings
 markdown: kramdown
 highlighter: rouge

diagram-library/readme.md

@@ -0,0 +1,32 @@
+# The Segment Diagram Library
+
+The library file was built by Tonik, and is in Sketch. You'll need a Sketch license to edit the file.
+
+You can also export the file, or diagrams you make with it, to `.svg` format for storage.
+
+![](sample-diagram.png)
+
+## Using the Library
+
+1. To create a new diagram, open the library file in Sketch and **make a copy**.
+2. Rename the copy so it's specific to the project you're working on.
+   *Don't* use the base library file itself for this.
+3. Optionally, save the Sketch file to the `images` directory for the file you'll be putting this diagram in, so it's easier to find later.
+    Jekyll _should_ exclude Sketch files from the build. You can also name the file with an underscore as the first character to exclude it from the build. If you have more than 3 sketch files for a specific doc, you can create a folder called `_src` in the `images` directory.
+4. In Sketch, create a new Artboard. (Press A and drag a box on the screen.)
+   This is the canvas where you'll put items from the library, and represents an area that you can export as an image.
+5. Make your diagram! Don't forget to save frequently.
+6. When you're ready to export, select the artboard by clicking it in the left layers navigation, and find the **Export** panel at the end of the right tool pane.
+7. Select **1x** (Apple Retina screens support 2x but it's not necessary) and `.png` format.
+8. At the VERY end of the panel, find the **Export Selected** button, and click it.
+9. If needed, move the resulting `.png` file to the correct `images` directory.
+10. Add the new diagram in the markdown file, and run a test build to make sure your diagram is legible on the page!
+
+That's it!
+
+When you need to update the images, you can reopen the Sketch file, make your changes, and re-export.
+
+
+## Adding new items to the Library
+
+Contact @sanscontext for instructions. :)

diagram-library/sample-diagram.png

@@ -81,8 +81,6 @@ sections:
       title: 'Spec: Screen'
     - path: /connections/spec/track
       title: 'Spec: Track'
-    - path: /connections/spec/alias
-      title: 'Spec: Alias'
     - path: /connections/spec/group
       title: 'Spec: Group'
     - path: /connections/spec/identify

src/_data/sidenav/main.yml

@@ -66,7 +66,6 @@ Below is a table of events that Braze sends to Segment. These events show up as
    <td>Email Bounced</td>
    <td>Braze attempted to send an email, but the User's receiving mail server did not accept it.</td>
   </tr>
-  <tr>
   <tr>
    <td>Email Soft Bounced</td>
    <td>Braze attempted to send an email, but the User's receiving mail server temporarily bounced it. (Reasons may include: inbox full, server down, etc.)</td>

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

@@ -5,6 +5,9 @@ sourceTitle: 'Cross-Domain Analytics'
 sourceCategory: 'Website'
 ---
 
+> warning ""
+> **Note**: Cross-domain analytics is no longer being offered as a product for new customers. If you have any questions, please contact [Segment support](https://www.segment.com/help/contact).
+
 Cross-Domain Analytics allows businesses to measure customer activity across their digital properties, without exposing user data to third parties. For example, if you have multiple brands, content properties, or marketing mini-sites, you likely want to learn how cross-domain browsing impacts your revenue.
 
 What you can do with Cross-Domain Analytics

src/connections/sources/cross-domain.md

@@ -2,6 +2,8 @@
 title: 'Spec: Alias'
 ---
 
+> note "Alias is an advanced method"
+> The Alias method allows you to explicitly change the ID of a tracked user, however this should only be done when it's required for downstream destination compatibility. See our [Best Practices for Identifying Users](/docs/guides/how-to-guides/best-practices-identify/) for more information. 
 
 The `alias` method is used to merge two user identities, effectively connecting two sets of user data as one. This is an advanced method, but it is required to manage user identities successfully in some of our destinations.