Merge branch 'main' into patch-2

content/common/navigation/engine/guides.yaml

@@ -33,16 +33,14 @@ navigation:
           - title: Instance Streaming
             path: /workspace/streaming
       - title: Working in Teams
-        path: /projects/setting-up-a-team
+        path: /projects/groups
         section:
-          - title: Setting Up a Team
-            path: /projects/setting-up-a-team
-          - title: Collaboration
-            path: /projects/collaboration
-          - title: Activity History
-            path: /projects/activity-history
           - title: Groups
             path: /projects/groups
+          - title: Collaboration
+            path: /projects/collaboration
+      - title: Activity History
+        path: /projects/activity-history
       - title: External Tools
         path: /projects/external-tools
   - title: Assets

content/en-us/art/characters/facial-animation/moods.md

@@ -22,7 +22,7 @@ A **mood** is a type of [facial animation](../../../art/characters/facial-animat
 
 ## Creating Moods
 
-If you have a character model with an animatable head, you can create any mood animation you can think of using the [Face Animation Editor](../../../art/characters/facial-animation/animating-heads.md#using-the-face-animation-editor). If you don't want to use the [Blocky](../../../assets/avatar/dynamic-heads/reference-files/BlockyCharacter.zip) or [Goblin](../../../assets/avatar/dynamic-heads/reference-files/GoblinCharacter.fbx) reference character models, you can create or modify an existing model to support animated heads in a third-party modeling software, such as Blender or Maya. For information on how to create an animatable head, see [Creating Basic Heads](../../../art/characters/facial-animation/creating-basic-heads.md).
+If you have a character model with an animatable head, you can create any mood animation you can think of using the [Face Animation Editor](../../../art/characters/facial-animation/animating-heads.md#using-the-face-animation-editor). If you don't want to use the [Blocky](../../../assets/avatar/dynamic-heads/reference-files/BlockyCharacter.zip) or [Goblin](../../../assets/avatar/dynamic-heads/reference-files/GoblinCharacter.zip) reference character models, you can create or modify an existing model to support animated heads in a third-party modeling software, such as Blender or Maya. For information on how to create an animatable head, see [Creating Basic Heads](../../../art/characters/facial-animation/creating-basic-heads.md).
 
 To create a mood:
 

content/en-us/art/characters/facial-animation/using-heads-in-studio.md

@@ -30,7 +30,7 @@ If you want to experiment with pre-made heads before [making your own](../../../
       <td>A reference experience with a head Blocky model with `Class.FaceControls`.</td>
     </tr>
     <tr>
-      <td>[Goblin Character Model](../../../assets/avatar/dynamic-heads/reference-files/GoblinCharacter.fbx)</td>
+      <td>[Goblin Character Model](../../../assets/avatar/dynamic-heads/reference-files/GoblinCharacter.zip)</td>
       <td>A Goblin character model with an animatable head.</td>
     </tr>
     <tr>

content/en-us/art/characters/project-files.md

@@ -34,7 +34,7 @@ The following `.fbx`, `.blend`, and `.ma` project files are available to use as
     <td>A Blocky character model with an [animatable head](../../art/characters/facial-animation/index.md) and a full body cage.</td>
   </tr>
     <tr>
-    <td><a href="../../assets/avatar/dynamic-heads/reference-files/GoblinCharacter.fbx" download>Goblin.fbx</a></td>
+    <td><a href="../../assets/avatar/dynamic-heads/reference-files/GoblinCharacter.zip" download>GoblinCharacter.zip</a></td>
     <td>A Goblin character model with an [animatable head](../../art/characters/facial-animation/index.md) and a full body cage.</td>
   </tr>
     <tr>

content/en-us/art/modeling/project-files.md

@@ -108,7 +108,7 @@ A rigged and skinned humanoid character model with a full body cage, facial anim
 </CardContent>
 
 <CardActions style={{position: 'absolute', bottom: 0, width: '100%'}}>
-<Button href="../../assets/avatar/dynamic-heads/reference-files/GoblinCharacter.fbx" fullWidth size='large' color='primary' variant='contained' style={{marginBottom:"4px;"}}>Download</Button>
+<Button href="../../assets/avatar/dynamic-heads/reference-files/GoblinCharacter.zip" fullWidth size='large' color='primary' variant='contained' style={{marginBottom:"4px;"}}>Download</Button>
 </CardActions>
 
 </Card>

content/en-us/avatar/resources.md

@@ -100,7 +100,7 @@ A rigged and skinned humanoid character model with a full body cage, facial anim
 </CardContent>
 
 <CardActions style={{position: 'absolute', bottom: 0, width: '100%'}}>
-<Button href="../assets/avatar/dynamic-heads/reference-files/GoblinCharacter.fbx" fullWidth size='large' color='primary' variant='contained' style={{marginBottom:"4px;"}}>Download</Button>
+<Button href="../assets/avatar/dynamic-heads/reference-files/GoblinCharacter.zip" fullWidth size='large' color='primary' variant='contained' style={{marginBottom:"4px;"}}>Download</Button>
 </CardActions>
 
 </Card>

content/en-us/cloud/open-cloud/api-keys.md

@@ -79,12 +79,12 @@ permissions for group members.
 
 ### Permissions Granting
 
-As a group owner, you can grant the **Administer all group API keys** permission
+As a group owner, you can grant the **Manage all API keys** permission
 to roles within your group. Members with this permission have all the
 permissions that a group owner has for API keys, including the ability to
 create, view, edit, revoke, and audit all of the group's API keys.
 
-You can also grant the **Create group API keys** permission to roles within your
+You can also grant the **Manage own API keys** permission to roles within your
 group. This allows members to only create and view keys owned by them rather
 than being able to manage others' keys.
 
@@ -101,7 +101,7 @@ permission to manage group API keys:
 
 In any of these cases, API keys generated by that user are given the **Revoked**
 [status](#api-key-status). To use these keys again, the group owner or a member
-with the **Administer all group API keys** permission must regenerate the keys.
+with the **Manage all API keys** permission must regenerate the keys.
 
 ## CIDR Format
 

content/en-us/projects/activity-history.md

@@ -3,30 +3,29 @@ title: Activity History
 description: Activity History is a log of key configuration, publish, and edit activities within a place.
 ---
 
-<Grid container spacing={2}>
-  <Grid item container md={7}  direction="row" style={{gap: 24, marginBottom: 12}}>
-  <Grid item container wrap="nowrap" direction="column" style={{gap: 8, flex: 1}}>
-  The **Activity History** view in Roblox Studio is a shared log of key changes within your experience. Each entry tells you:
+<Grid container spacing={4} alignItems="top">
+	<Grid item XSmall={12} Medium={6} Large={6} xs={12} sm={12} md={6} lg={6}>
+	The **Activity History** view in Studio is a shared log of key changes within an experience. Each entry tells you:
   <ul>
     <li>What changed</li>
     <li>Who changed it</li>
     <li>When they made the change</li>
   </ul>
-  You can find similar information in the **Activity History** page for your experience on the [Creator Hub](https://create.roblox.com/dashboard/creations), although the two views have some differences. See the [Event Reference](#event-reference).
-  </Grid>
-  </Grid>
-  <Grid item container md={5}  direction="row" style={{gap: 24, marginBottom: 12}}>
-  <Grid item container wrap="nowrap" direction="column" style={{gap: 8, flex: 1}}>
-    <img src="../assets/studio/collaboration/Activity-History.png" alt="A view of the Activity History screen showing several collaborators." />
-  </Grid>
-  </Grid>
+  You can find similar information in an experience's **Activity History** page on the [Creator&nbsp;Hub](https://create.roblox.com/dashboard/creations), although the two views have some differences. See the [Event Reference](#event-reference).
+	</Grid>
+	<Grid item XSmall={12} Medium={6} Large={6} xs={12} sm={12} md={6} lg={6}>
+	<img src="../assets/studio/general/Activity-History.png" width="360" alt="A view of the Activity History window showing various changes and updates." />
+	</Grid>
 </Grid>
 
 ## Working with Activity History
 
 To open the Activity History view in Studio, your experience must be saved to Roblox.
 
-1. In the **View** tab, select **Activity History**. Events are displayed in chronological order, with the most recent appearing first.
+1. In the [View](../studio/view-tab.md) tab, select **Activity History**. Events are displayed in chronological order, with the most recent appearing first.
+
+   <img src="../assets/studio/general/View-Tab-Activity-History.png" width="720" alt="Activity History tool indicated in the View tab." />
+
 1. If you have a large number of events, you can filter them by type or collaborator.
 1. If you want to manage the configuration or get more details on a change, use the **&ctdot;** menu next to each event to get a link to the setting in either Studio or the Creator Hub.
 
@@ -89,4 +88,4 @@ Group given play permissions | &check; | &check;
 Group with play permissions removed | &check; | &check;
 Group role's permissions to this experience changed | &check; | &check;
 
-For more information, see [Group Roles and Permissions](../projects/groups.md#roles-and-permissions)
+For more information, see [Group Roles and Permissions](../projects/groups.md#roles-and-permissions).

content/en-us/projects/groups.md

@@ -1,5 +1,5 @@
 ---
-title: Group Collaboration
+title: Groups (Teams)
 description: Explains Roblox groups and how to collaborate with multiple creators on the same experience.
 ---
 
@@ -51,15 +51,15 @@ Roles created using the legacy [Groups](https://www.roblox.com/groups) pages wil
    <tbody>
      <tr>
        <td>**Add or remove group members**</td>
-       <td>Member can [invite](#inviting-members) and [remove](#removing-members) other members.</td>
+       <td>Members with this role can [invite](#inviting-members) and [remove](#removing-members) other members.</td>
      </tr>
      <tr>
-       <td>**Create, configure, and assign group roles**</td>
-       <td>Member can create and manage group roles, and [assign](#assigning-roles) any role to any member.</td>
+       <td>**Add or remove [role] role members**</td>
+       <td>Members with this role can give or remove the role to/from other members in the group. This permission is useful for roles that should have some management permissions but not at the super‑admin level.</td>
      </tr>
      <tr>
        <td>**Configure group profile**</td>
-       <td>Member can update the group's name, description, and other metadata. Does not include transferring ownership.</td>
+       <td>Members with this role can update the group's name, description, and other metadata. Does not include transferring ownership, which only the owner can do.</td>
      </tr>
    </tbody>
    <thead>
@@ -70,15 +70,60 @@ Roles created using the legacy [Groups](https://www.roblox.com/groups) pages wil
    <tbody>
      <tr>
       <td>**Play all group experiences**</td>
-      <td>Member can play all experiences owned by the group, whether they're private or public.</td>
+      <td>Members with this role can play all experiences owned by the group, whether they're private or public.</td>
      </tr>
      <tr>
        <td>**Edit all group experiences**</td>
-       <td>Member can edit all experiences and [assets](../projects/assets/index.md) owned by the group. Does not include editing an experience outside of a [collaborative](../projects/collaboration.md) session or saving a place from one experience into another experience.</td>
+       <td>Members with this role can edit all experiences and [assets](../projects/assets/index.md) owned by the group. Does not include editing an experience outside of a [collaborative](../projects/collaboration.md) session or saving a place from one experience into another experience.</td>
      </tr>
      <tr>
        <td>**View all analytics for group experiences**</td>
-       <td>Member can access the [analytics](../production/analytics/index.md) of all experiences owned by the group, even if they don't have edit access.</td>
+       <td>Members with this role can access the [analytics](../production/analytics/index.md) of all experiences owned by the group, even if they don't have edit access.</td>
+     </tr>
+   </tbody>
+	 <thead>
+     <tr>
+       <th colspan="2">Group Revenue</th>
+     </tr>
+   </thead>
+   <tbody>
+     <tr>
+      <td>**Configure group revenue**</td>
+      <td>Members with this role can view all group revenue (as&nbsp;below), and also directly manage it. This includes setting up [recurring payouts](#recurring-payouts), as well as sending [one‑time payouts](#one-time-payouts) to collaborators.</td>
+     </tr>
+     <tr>
+       <td>**View group revenue**</td>
+       <td>Members with this role can view the group Robux balance, any configured recurring split payouts, and (in the future) new revenue logging features.</td>
+     </tr>
+   </tbody>
+	 <thead>
+     <tr>
+       <th colspan="2">Avatar Item Permissions</th>
+     </tr>
+   </thead>
+   <tbody>
+     <tr>
+      <td>**Configure classic avatar items**</td>
+      <td>Members with this role can configure classic avatar items such as 2D clothing.</td>
+     </tr>
+     <tr>
+       <td>**Create classic avatar items**</td>
+       <td>Members with this role can create classic avatar items such as 2D clothing.</td>
+     </tr>
+   </tbody>
+	 <thead>
+     <tr>
+       <th colspan="2">Open Cloud Permissions</th>
+     </tr>
+   </thead>
+   <tbody>
+     <tr>
+      <td>**Manage all API keys**</td>
+      <td>Members with this role can upload their own [Open Cloud API keys](../cloud/open-cloud/api-keys.md) to the group, as well as configure everyone else's.</td>
+     </tr>
+     <tr>
+       <td>**Manage own API keys**</td>
+       <td>Members with this role can configure and upload their own [Open Cloud API keys](../cloud/open-cloud/api-keys.md) to the group (but not configure everyone else's as above).</td>
      </tr>
    </tbody>
    </table>

content/en-us/projects/index.md

@@ -81,7 +81,7 @@ For more information, see [Collaboration](../projects/collaboration.md).
 
 ## Testing
 
-Your [team](../projects/setting-up-a-team.md) can instantly test an experience on PC, mobile, VR, and other devices you wish to support through the Roblox app; no need to compile builds, deploy to app stores, or await app store approval.
+Your [team](../projects/groups.md) can instantly test an experience on PC, mobile, VR, and other devices you wish to support through the Roblox app; no need to compile builds, deploy to app stores, or await app store approval.
 
 Studio offers a suite of options for testing an experience before releasing it to the public: