Merge branch 'master' into thomas/wootric_rebrand_source

Author: markzegarelli

.github/workflows/repo-sync.yml

@@ -17,7 +17,7 @@ jobs:
         GITHUB_TOKEN: ${{ secrets.DOCS_BOT_PAT_REPO_SCOPE }}
       with:
         source_repo: ${{ secrets.SOURCE_REPO }}
-        source_branch: master
+        source_branch: ${{ secrets.SOURCE_BRANCH }}
         destination_branch: ${{ secrets.INTERMEDIATE_BRANCH }}
         github_token: ${{ secrets.DOCS_BOT_PAT_REPO_SCOPE }}
 
@@ -27,7 +27,7 @@ jobs:
         GITHUB_TOKEN: ${{ secrets.DOCS_BOT_PAT_REPO_SCOPE }}
       with:
         source_branch: ${{ secrets.INTERMEDIATE_BRANCH }}
-        destination_branch: master
+        destination_branch: ${{ secrets.DESTINATION_BRANCH }}
         pr_title: 'repo sync'
         pr_body: "This is an automated pull request to sync changes between the public and private repos.\n\n:robot: This pull request should be merged (not squashed) to preserve continuity across repos, so please let a bot do the merging!"
         pr_label: autoupdate,automated-reposync-pr
@@ -39,7 +39,7 @@ jobs:
       with:
         github-token: ${{ secrets.GITHUB_TOKEN }}
         branch: repo-sync
-        base: master
+        base: ${{ secrets.DESTINATION_BRANCH }}
         author: bot-docsteam 
         state: open
 

CONTRIBUTING.md

@@ -14,12 +14,12 @@ Not all pages have a 1-1 mapping with their location within the repository. This
 
 ## Want to go deeper? Fork the repository
 
-You can fork this repository to your local machine to make larger changes. Examples of larger changes include:
+You can fork this repository and clone it to your local machine to make larger changes. Examples of larger changes include:
 - editing more than one file at a time
 - adding or updating images
 - updating navigation items
 
-In this scenario, you'll fork the repository locally, make your changes, and submit a pull request to have them reviewed and merged back into the site.
+In this scenario, you'll fork the repository, clone it locally, make your changes, and submit a pull request to have them reviewed and merged back into the site.
 
 ## Site structure
 

README.md

@@ -3,6 +3,8 @@
 
 Here, you can contribute to the Segment Documentation site.
 
+**Note**: On Friday, October 1st, the default branch of this repository was changed from `master` to `develop`. If you have a fork of `segment-docs`, please ensure the default branch of the fork is updated accordingly.
+
 ## Overview
 
 This repository contains the documentation website code and source files for https://segment.com/docs.
@@ -16,17 +18,21 @@ In this article, find information about:
 
 ## Contributing
 
-The Segment docs team accepts a few types of contribution, including:
+The Segment docs team accepts contributions in the form of issues and pull requests.
+
+All accepted contributions, in the form of approved pull requests and resolved issues, are deployed twice weekly, on Tuesday and Thursdays. As a result, once your pull request is closed, or your issue resolved, you may not see these changes on the site immediately.
 
 ### Issues
 
 If you see an error or something incorrect on a specific page, click Request docs change to create an issue to bring it to the team’s attention.
 
 ### Pull Requests
 
-If you would like to update the documentation yourself, create a Pull Request to bring it to the team’s attention. Click Edit this page to edit the page directly on GitHub. Alternatively, you can clone the repository and submit your Pull Request that way. For more information, see Contributing and the Developer Guide
+If you would like to update the documentation yourself, create a Pull Request to bring it to the team’s attention. Click Edit this page to edit the page directly on GitHub. Alternatively, you can clone the repository and submit your Pull Request that way. For more information, see [Contributing](CONTRIBUTING.md) and the [Developer Guide](devguide.md)
+
+
+
 
-For more information about contributing, see [Contributing](CONTRIBUTING.md).
 
 ## List of READMEs
 

devguide.md

@@ -4,7 +4,7 @@ The contents of this guide will help you get up and running with the Segment Doc
 
 ## Local development with `ruby` and `node`, without Config API
 
-If using OSX:
+If using MacOS:
   * Install command line tools, `xcode-select --install`
   * Install `Ruby` >= 2.3.0 https://www.ruby-lang.org/en/documentation/installation/
   * Ensure you're running `RubyGems` >= 2.5.0 by running `gem update --system` followed by `gem --version`
@@ -16,7 +16,7 @@ If using OSX:
 
 ##  All about the Catalog script
 
-You run the Catalog update script by running `make catalog` from the docs repo. You, a person who is going to run the script, must first save a Segment token to an `.env` file locally, which is `gitignored` so we don’t check it in to gihub accidentally.
+You run the Catalog update script by running `make catalog` from the docs repo. You, a person who is going to run the script, must first save a Segment token to an `.env` file locally, which is `gitignored` so we don’t check it in to GitHub accidentally.
 
 Note: Old ConfigAPI tokens are not compatible with Public API. You'll need a new one if you want to use Public API.
 
@@ -33,7 +33,7 @@ It also does some slugification and destination-name normalization, since our ha
 
 ###  3.1. <a name='Layouts'></a>Layouts
 
-`default.html` is the base container through which all the individual other layouts are built to have the right title, seo, etc. The template inheritance is described in the diagram below.
+`default.html` is the base container through which all the individual other layouts are built to have the right title, SEO, etc. The template inheritance is described in the diagram below.
 
 The `destination.html`, `source.html`, and `integration.html` templates contain the logic that runs the layouts for individual catalog pages. Storage/warehouses use the generic Integration right now because they don't need anything special. Set the layout in the Jekyll `_config.yml` file.
 

src/_includes/content/functions/runtime.md

@@ -15,7 +15,6 @@ The following dependencies are installed in the function environment by default.
 - [`@google-cloud/functions v1.1.0`](https://www.npmjs.com/package/@google-cloud/functions) exposed as `google.cloud.functions`
 - [`@google-cloud/pubsub v2.6.0`](https://www.npmjs.com/package/@google-cloud/pubsub) exposed as `google.cloud.pubsub`
 - [`@google-cloud/storage v5.3.0`](https://www.npmjs.com/package/@google-cloud/storage) exposed as `google.cloud.storage`
-- [`form-data v2.4.0`](https://www.npmjs.com/package/form-data) exposed as `FormData`
 - [`jsonwebtoken v8.5.1`](https://www.npmjs.com/package/jsonwebtoken) exposed as `jsonwebtoken`
 - [`lodash v4.17.15`](https://www.npmjs.com/package/lodash) exposed as `_`
 - [`moment v2.26.0`](https://www.npmjs.com/package/moment/v/2.26.0) exposed as `moment`

src/connections/destinations/catalog/customer-io/index.md

@@ -35,7 +35,7 @@ If you're not familiar with the Segment Specs, take a look to understand what th
 analytics.page();
 ```
 
-Page events send to Customer.io as a `Page View` event where names and properties are optional. In the Customer.io "Activity View", the event will have "Activity Type" set to "Page View" and "Activity Name" set to the page name. If there is no page name, "Activity Name" defaults to the page URL.
+Page events send to Customer.io as a `Page View` event where names and properties are optional. In the Customer.io "Activity Logs", the event will have "Activity Type" set to "Page View" and "Activity Name" set to the page name. If there is no page name, "Activity Name" defaults to the page URL.
 
 ## Screen
 
@@ -45,7 +45,7 @@ If you're not familiar with the Segment Specs, take a look to understand what th
 [[SEGAnalytics sharedAnalytics] screen:@"Home"];
 ```
 
-Screen events send to Customer.io as a custom event. In the Customer.io "Activity View", "Activity Type" is `event` and "Activity Value" sets to `Viewed {screen name} Screen`. For the earlier example the "Activity Value" will be `Viewed Home Screen`. If there is no screen name, then "Activity Value" will be `Viewed Undefined Screen`.
+Screen events send to Customer.io as a custom event. In the Customer.io "Activity Logs", "Activity Type" is `event` and "Activity Value" sets to `Viewed {screen name} Screen`. For the earlier example the "Activity Value" will be `Viewed Home Screen`. If there is no screen name, then "Activity Value" will be `Viewed Undefined Screen`.
 
 
 ## Identify
@@ -79,7 +79,7 @@ analytics.identify('userId123', {
 });
 ```
 
-If you want to change the `id` or `email` you've assigned a person in Customer.io, you have to pass a person's `cio_id`, in the format `cio_<cio_id value>` as the `userId` in your identify call. Currently, you must retrieve this value from a person's page in the Customer.io interface. In the future, you'll be able to do that using this call from Customer.io API.
+If you want to change the `id` or `email` you've assigned a person in Customer.io, you have to pass a person's `cio_id`, in the format `cio_<cio_id value>` as the `userId` in your identify call. Currently, you must retrieve this value from a person's page in the Customer.io interface. In the future, you'll be able to do that using this call from Customer.io API.
 
 ```javascript
 analytics.identify('cio_<cio_id value>', {
@@ -114,7 +114,7 @@ If you're not familiar with the Segment Specs, take a look to understand what th
 analytics.track('Clicked Button');
 ```
 
-Track events send to Customer.io as `custom events`. In the Customer.io "Activity View", "Activity Type" sets to `event` and "Activity Name" sets to the event name.
+Track events send to Customer.io as `custom events`. In the Customer.io "Activity Logs", "Activity Type" sets to `event` and "Activity Name" sets to the event name.
 
 ## Device Token Set up
 

src/personas/audiences/organization.md

@@ -31,10 +31,10 @@ To disband a Folder you’ve made in Personas, click the **More Options** icon a
 
 To move an Audience to a Folder you’ve already created, follow the steps below:
 
-1. Navigate to the Audiences tab within your Personas space.
+1. Navigate to the **Audiences** tab within your Personas space.
 2. Hover over the Audience you want to move.
 3. Check the selection box that appears next to the Audience name.
-4. **Optional**: repeat Steps 2 and 3 to move multiple Audiences.
+4. *(Optional)*: Repeat Steps 2 and 3 to move multiple Audiences.
 5. Click the **Move** icon that appears in the Audiences header.
 6. Select your destination Folder from the modal window.
 7. Click **Move** to confirm and move the selected Audiences.
@@ -48,12 +48,12 @@ Audience cloning creates a copy of your Audience.  Within Personas, you can clon
 
 To clone an Audience within the same Space, follow the steps below:
 
-1. Navigate to the Audiences tab within your Personas space.
+1. Navigate to the **Audiences** tab within your Personas space.
 2. Click the **More Options** icon next to the Audience you want to clone.
 3. From the dropdown menu, click **Clone**.
 4. Select **Current Space**, then click **Continue**.
 5. Configure the Audience, click **Preview Results**, then click **Select Destination**.
-6. **Optional**: on the next screen, connect the Audience to a Destination.  Click **Review & Create**.
+6. *(Optional)*: On the next screen, connect the Audience to a Destination.  Click **Review & Create**.
 7. Give your Audience a unique name, then click **Create Audience**.
 
 ### Cloning an Audience between Spaces
@@ -70,12 +70,12 @@ You may wish to clone an Audience between spaces for a number of use cases, incl
 
 To clone an Audience between Spaces, follow the steps below:
 
-1. Navigate to the Audiences tab within your Personas space.
+1. Navigate to the **Audiences** tab within your Personas space.
 2. Click the **More Options** icon next to the Audience you want to clone.
 3. From the dropdown menu, click **Clone**.
 4. Select **Different Space**, choose your target Space, then click **Continue**.
 5. Configure the Audience, click **Preview Results**, then click **Select Destination**.
-6. **Optional**: on the next screen, connect the Audience to a Destination.  Click **Review & Create**.
+6. *(Optional)*: On the next screen, connect the Audience to a Destination.  Click **Review & Create**.
 7. Give your Audience a unique name, then click **Create Cloned Audience**.
 
 

src/personas/debugger.md

@@ -6,7 +6,7 @@ Using the Personas Source Debugger, you can inspect and monitor the events that
 
 Because Personas generates a unique Source for every Destination connected to a Space, the Debugger gives you insight into how Personas sends events before they reach their Destination.
 
-The Debugger provides you with the payload information you need to troubleshoot potential formatting issues and ensure process and sends events as your Destinations expect.
+The Debugger provides you with the payload information you need to troubleshoot potential formatting issues and ensure Personas sends events as your Destinations expect.
 
 ## Working with the Debugger
 
@@ -23,4 +23,4 @@ The Debugger displays the payload in two tabs:
 * **Pretty view** shows the actual API call Segment sends to your Destination.
 * **Raw view** shows the full JSON object Segment sends to your Destination from the calls you sent, including timestamps, properties, traits, and ids.
 
-Similar to the Connections Debugger, the Personas Debugger allows you to search through events, using information contained within the event's payload.
+Similar to the Connections Debugger, the Personas Debugger allows you to search through events using information contained within the event's payload.