Merge branch 'master' into develop

stayseesong · web-flow · commit 53098745f580 · 2023-04-04T10:32:00.000-07:00
diff --git a/src/connections/functions/environment.md b/src/connections/functions/environment.md
@@ -52,7 +52,61 @@ If you're editing an existing function, you can **Save** changes without changin
 
 When you deploy your destination function in your workspace, you fill out the settings on the destination configuration page, similar to how you would configure a normal destination.
 
+## Functions Versioning
 
+With Functions Versioning, you can access a complete change history for each source or destination function. View version history and creation details, then use a unified or split display to compare code and restore previous versions of a function.
+
+> info "Functions Versioning in beta"
+> Functions Versioning is in beta, and Segment is actively working on this feature. Some functionality may change before it becomes generally available. Versioning is disabled in workspaces where you deploy source functions with multiple instances. [Contact Segment](https://segment.com/help/contact/){:target="_blank"} with any feedback or questions.
+
+
+### View and compare version history
+
+To view the version history of a function:
+1. Navigate to **Connections > Catalog > Functions**.
+2. Select your source or destination function.
+3. Select **Edit Function**, then click **Version history**.
+
+Select previous versions to compare code using a *unified* or *split* view. With the split view, Segment displays the latest version on the left and the version you've selected on the right.
+
+> success ""
+> Unified and split compare screens are read-only. While you can copy code, you can't make changes directly from these screens.
+
+#### `LATEST` and `DEPLOYED` versions
+
+ In the Version History panel, Segment displays `LATEST` and `DEPLOYED` labels that represent a function version state. You'll see the `LATEST` version at the top.
+
+Segment labels a version as the `LATEST` when:
+- You save a change to the function source code, but don't deploy the function at the same time.
+- You [restore a previous version](#restore-a-previous-version) from your function's version history.
+
+The `DEPLOYED` version is the function version that's currently deployed.
+
+### Restore a previous version
+
+To restore a previous function version:
+
+1. Select the function you want to restore.
+2. Click **Restore this version**.
+  - Segment creates a duplicate of the selected version and labels it as the `LATEST` version.
+3. Click **Restore** on the confirmation screen.
+4. To deploy the restored version, click **Save and Deploy** on the Source Code screen.
+
+### Use Versioning with Segment's Public API
+
+You can use Functions Versioning with Segment's [Public API](https://docs.segmentapis.com/tag/Functions){:target="_blank"} to retrieve version history records and source code, as well as to restore previous versions.
+
+Here are some Public API use case examples:
+
+**Get Version history**: Use the `/versions` endpoint to retrieve a list of version records and metadata of a certain page size. You can also use this endpoint to get version source code for a given version ID.
+
+**Restore a previous version**: Use the `/restore` endpoint to restore a previous function version. This creates a new version with the same source as the version you are restoring.
+
+**Create or update versions**: Create or update a function to add a version record and save the source code.
+
+**Deploy a function**: Use the Public API to deploy a function. After you deploy, Segment marks the function version as `DEPLOYED`. Learn more about function version states [here](#latest-and-deployed-versions).
+
+View Segment's [Public API](https://docs.segmentapis.com/tag/Functions){:target="_blank"} docs for more information on how to use Functions Versioning with the Public API.
 
 ## Functions permissions
 
diff --git a/src/engage/journeys/build-journey.md b/src/engage/journeys/build-journey.md
@@ -67,12 +67,12 @@ You may find that you need to make changes to a published Journey, like adding n
 
 ### Pausing and resuming a Journey
 
-Pausing a published Journey prevents new users from joining your Journey. Users already in the Journey, however, will continue their progress.
+Pausing a published Journey prevents new users from joining your Journey. Users already in the Journey, however, will continue their progress.
 
 Follow these steps to pause a Journey:
 
-1. Select the **Journeys** tab within your Engage space.
-2. Select the **More Options** icon next to the Journey you want to pause.
+1. Select the **Journeys** tab within your Engage space.
+2. Select the **More Options** icon next to the Journey you want to pause.
 3. From the dropdown menu, select **Pause Entry**.
 4. A modal window appears. Select **Pause Entry** again to confirm.
 
@@ -81,14 +81,14 @@ Follow these steps to pause a Journey:
 
 ### Resuming a Journey
 
-You can resume new user entries to a paused Journey at any time. 
+You can resume new user entries to a paused Journey at any time. 
 
-After you resume a Journey, users who meet the Journey's entry conditions will join the Journey. New users will not enter the Journey, however, if they met its entry conditions while it was paused. 
+After you resume a Journey, users who meet the Journey's entry conditions will join the Journey. New users will not enter the Journey, however, if they met its entry conditions while it was paused. 
 
 Follow these steps to resume entry to a paused Journey:
 
-1. Select the **Journeys** tab within your Engage space.
-2. Select the **More Options** icon next to the Journey you want to resume.
+1. Select the **Journeys** tab within your Engage space.
+2. Select the **More Options** icon next to the Journey you want to resume.
 3. From the dropdown menu, select **Resume Entry**.
 4. A modal window appears. Select **Resume Entry** again to confirm.
 
@@ -114,7 +114,17 @@ No new users enter archived Journeys, and progress stops for any users already i
 > success "Compute credits"
 > Steps in archived Journeys don't count towards your compute credits.
 
-## Journey re-entry
+## Journey exits and re-entry
+
+### Journey exits
+
+You can apply exit settings to both single entry and re-entry Journeys. Users who exit a Journey leave all Journey steps and Destinations. 
+
+Configure exit settings during initial Journey setup by enabling exit settings and entering the number of days that should pass before users exit the Journey. Journeys exits users once this time passes.
+
+If you don't apply exit settings to a Journey, users will remain in the Journey indefinitely.
+
+### Journey re-entry
 
 The Journeys re-entry setting allows users to repeat Journeys they've already exited. Common use cases for Journeys re-entry include the following:
 
@@ -124,14 +134,12 @@ The Journeys re-entry setting allows users to repeat Journeys they've already ex
 
 ### Exit and re-entry times
 
-Users who exit a Journey leave all Journey steps and Destinations. To let users re-enter a Journey they've exited, you'll need to enable two Journeys settings:
+To let users re-enter a Journey they've exited, you'll need to enable two Journeys settings:
 
 - Journeys exit time
 - Journeys re-entry time
 
-Users must first exit a Journey before re-entering. You can configure exit settings during initial Journey setup by enabling exit settings and entering the number of days that should pass before users exit the Journey. Journeys exits users once this time passes, allowing users to re-enter once they meet the Journey's entry conditions again.
-
-You can then configure re-entry time by hour, day, or week. An exited user won't re-enter the same Journey until the re-entry time has passed. Re-entry time begins once a user exits the Journey.
+Journeys exits users based off of the exit time you configure. Users can re-enter the Journey once they meet the Journey's entry condition again and your defined re-entry time has passed. You can configure re-entry time by hour, day, or week. Re-entry time begins once a user exits the Journey.
 
 Suppose, for example, you enable re-entry for an abandoned cart campaign. You set exit to seven days and re-entry to 30 days. A user who abandons their cart will progress through the Journey and exit no later than seven days after entering. Once 30 days after exit have passed, the user can re-enter the Journey.
 
@@ -157,11 +165,11 @@ When you've finished creating your Journey, click **Save as Draft** in the botto
 
 ### About published Journeys
 
-Keep the following considerations in mind when working with a published Journey:
+Keep the following in mind when working with a published Journey:
 
 - It may take up to three hours for Journeys to compute user counts after publication.
 - You can edit a Journey's name, description, and Destination steps.
 - You can't add, edit, or delete other steps in the Journey.
 - Once Journeys computes and displays user counts, you'll see the list of users at each step of the Journey.
 - Click a user profile to see the Journey list to which they belong.
-- Journeys sends and updates data to Destinations in real-time.
+- Journeys sends and updates data to Destinations in real-time.
diff --git a/src/engage/journeys/images/journeys_analytics_tiles.png b/src/engage/journeys/images/journeys_analytics_tiles.png
diff --git a/src/engage/journeys/journeys-analytics.md b/src/engage/journeys/journeys-analytics.md
@@ -1,15 +1,12 @@
 ---
-title: Journey Level Analytics
+title: Journeys Analytics
 redirect_from:
   - '/personas/journeys/journeys-analytics'
 ---
 
-With Journey Level Analytics, you can gain insight into the overall performance of an individual Journey.
+Segment maintains analytics for each Journey and its individual steps. As a result, you can view both granular and high-level performance metrics that give you insight into your Journeys.
 
-## About Journey Level Analytics
-
-> info ""
-> This feature is available in beta.
+## Journey-Level Analytics
 
 Journeys Level Analytics is a collection of statistics that can help you assess how a Journey is performing.
 
@@ -23,23 +20,28 @@ Follow these steps to view the Analytics for a specific Journey:
 2. Select a Journey from the Journeys list.
 3. The Analytics tiles display as part of the Journey's overview.
 
-![An in-app screenshot of Journeys Level Analytics](images/journeys_analytics_tiles.png "Journeys Level Analytics tiles")
+> info ""
+> Journeys in draft status don’t display Analytics.
 
-## Available Journeys Analytics statistics
+## Journey-Level Analytics statistics
 
-The following table shows the three statistics available for a Journey:
+The following table shows the statistics available for a Journey:
 
 | Statistic   | Description                                                                   |
 | ----------- | ----------------------------------------------------------------------------- |
-| Entries     | The total number of users who entered your Journey                            |
+| Entered     | The total number of users who entered your Journey                            |
 | In progress | The total number of users who have entered the Journey without yet exiting it |
+| Completed   | The total number of users who entered the Journey and reached any final step  |
 | Exits       | The total number of users who have exited the Journey                         |
 
-Using the date picker, you can view a Journey's analytics over a specific period of time.
+> info ""
+> Completed and exits are mutually exclusive.
+
+Use the date picker to view a Journey's analytics over a specific time frame in any 180 day period.
 
 The following table shows descriptions of the time frames you can select:
 
-| Time frame         | Description (based on UTC)                                 |
+| Time frame        | Description (based on UTC)                                 |
 | ----------------- | ---------------------------------------------------------- |
 | Today             | Today, beginning at midnight                               |
 | Yesterday         | The day before today                                       |
@@ -48,3 +50,28 @@ The following table shows descriptions of the time frames you can select:
 | Last 90 days      | The past 90 days, not including today                      |
 | Last 180 days     | The past 180 days, not including today                     |
 | Custom date range | The period between two dates, including the selected dates |
+
+## Step-Level Analytics
+
+Displayed with each step of your Journey, Step-Level Analytics shows you how many users made it to the step you’re viewing. You can use this data to gain context for how users flow through your Journey.
+
+### Changing the calculation percentage
+
+With Step-Level Analytics, you can configure two settings that give you granular insight into each step’s performance:  
+
+- **Previous step** or **entry step**, which calculates the displayed percentage based on either the number of users in the entry step or the number of users in the previous step
+- **Total** or **unique users**, which lets you change the displayed percentage to account for re-entry
+
+#### Previous step or entry step
+
+By default, Engage calculates an individual step’s analytics as a percentage of the number of users in the previous step. However, you can also view step analytics as a percentage of the initial number of users in the Journey’s entry step.  
+
+For example, suppose your Journey’s entry step contained 100 users, and 50 proceeded to the next step. For both calculation options, Engage would display **50% and 50** for the next step. If 25 users from the second step reached step three, however, Engage would display **50% and 25** for previous-step based calculations but **25% and 25** for entry-step based calculations.
+
+To change this base percentage, select **Calculate % based on**, then select **Entry step** or **Previous step**.
+
+#### Total or unique users
+
+If you’ve enabled re-entry for your Journey, you can also configure Step-Level Analytics to calculate the step’s percentage based on unique or total users. Selecting **Unique** generates a percentage based on unique users, while **Total** includes users who have re-entered the Journey.
+
+For more information on re-entry settings in Journeys, view [Journey re-entry](/docs/engage/journeys/build-journey/#journey-re-entry).
diff --git a/src/engage/journeys/key-terms.md b/src/engage/journeys/key-terms.md
@@ -55,3 +55,9 @@ Keep the following terms in mind as you begin to explore Journeys.
 | Delay               | No audience. Segment appends the wait duration as a condition to the following step's audience.                    |
 | T/F split           | The split's resulting conditions contain two mutually exclusive audiences.  The split node itself has no audience. |
 | Multi-branch splits | The split's resulting conditions contain audiences.  The split node itself has no audience.                        |
+
+## Analytics
+
+| Metric              | Definition                                                                                                                                   |
+| ------------------- | -------------------------------------------------------------------------------------------------------------------------------------------- |
+| Entry               | When a user enters a Journey for the first time or re-enters a Journey after exiting; excludes users who re-enter a Journey without exiting. |
