Merge branch 'main' into patch-5

content/common/navigation/engine/guides.yaml

@@ -566,7 +566,7 @@ navigation:
         path: /production/promotion/experience-events
       - title: Player Invite Prompts
         path: /production/promotion/invite-prompts
-      - title: Player Referral System
+      - title: Friend Invite Reward System
         path: /production/promotion/referral-system
       - title: Experience Notifications
         path: /production/promotion/experience-notifications

content/en-us/education/resources/roblox-educators.md

@@ -360,6 +360,7 @@ We have many educators across the world teaching with Roblox. If you're interest
 #### Azerbaijan
 
 <a href="https://coddyschool.com/courses/sozdanie_igr_v_roblox_studio/" title="CODDY">CODDY</a>
+<a href="https://impactacademiesaz.com/" title="impactAz">impact Academies and Camps</a>
 
 #### Belarus
 
@@ -368,6 +369,7 @@ We have many educators across the world teaching with Roblox. If you're interest
 
 #### Belgium
 
+<a href="https://impactacademies.be/en/liege" title="impactBg">impact Academies and Camps</a>
 <a href="https://www.logiscool.com/" title="Logiscool">Logiscool</a>
 
 #### Brazil
@@ -396,6 +398,7 @@ We have many educators across the world teaching with Roblox. If you're interest
 <a href="https://datawiz.ca/" title="DataWiz Academy">DataWiz Academy</a>
 <a href="https://www.digitalmediaacademy.org" title="Digital Media Academy">Digital Media Academy</a>
 <a href="https://www.geekedu.org/" title="Geekedu Coding for Kids">Geekedu Coding for Kids</a>
+<a href="https://impactacademies.ca/" title="impactCa">impact Academies and Camps</a>
 <a href="https://www.kidsinnovative.com" title="Kids Innovative">Kids Innovative</a>
 <a href="https://www.logiscool.com/" title="Logiscool">Logiscool</a>
 
@@ -410,11 +413,20 @@ We have many educators across the world teaching with Roblox. If you're interest
 
 <a href="https://digitalsake.com/" title="digitalsake">digitalsake</a>
 
+#### Cyprus 
+
+<a href="https://impactacademiescyprus.com/" title="impactCy">impact Academies and Camps</a>
+
 #### Czech Republic
 
+<a href="https://impactacademies.cz/" title="impactCz">impact Academies and Camps</a>
 <a href="https://kiber-one.cz/moduli/roblox-studio-sdelat-vse-chto-vy-mozhete-sebe-predstavit/" title="KIBERone Czech Republic">KIBERone Czech Republic</a>
 <a href="https://www.logiscool.com/" title="Logiscool">Logiscool</a>
 
+#### Denmark 
+
+<a href="https://impactacademies.dk/copenhagen" title="impactDk">impact Academies and Camps</a>
+
 #### Dominican Republic
 
 <a href="https://campsonshineinternational.org/" title="Camp Sonshine">Camp Sonshine</a>
@@ -431,6 +443,7 @@ We have many educators across the world teaching with Roblox. If you're interest
 #### Germany
 
 <a href="https://coddyschool.com/courses/sozdanie_igr_v_roblox_studio/" title="CODDY">CODDY</a>
+<a href="https://impactacademies.de/" title="impactDe">impact Academies and Camps</a>
 <a href="https://kiber-one.de/moduli/roblox-studio-sdelat-vse-chto-vy-mozhete-sebe-predstavit/" title="KIBERone Germany">KIBERone Germany</a>
 <a href="https://www.logiscool.com/" title="Logiscool">Logiscool</a>
 
@@ -477,6 +490,10 @@ We have many educators across the world teaching with Roblox. If you're interest
 <a href="https://kodingnext.com/" title="Koding Next">Koding Next</a>
 <a href="https://kodingakademi.id/" title="KodingAkademi">KodingAkademi</a>
 
+#### Ireland 
+
+<a href="https://impactacademiesie.com/" title="impactIr">impact Academies and Camps</a>
+
 #### Israel
 
 <a href="https://coddyschool.com/courses/sozdanie_igr_v_roblox_studio/" title="CODDY">CODDY</a>
@@ -523,6 +540,10 @@ We have many educators across the world teaching with Roblox. If you're interest
 <a href="https://small.academy/cursuri/programare-roblox/" title="Small Academy">Small Academy</a>
 <a href="https://impactacademies.com/" title="impact Academies and Camps">impact Academies and Camps</a>
 
+#### Montenegro 
+
+<a href="https://impactacademies.me/" title="impactMg">impact Academies and Camps</a>
+
 #### Mozambique
 
 <a href="https://www.codeup.pt" title="Code.Up">Code.Up</a>
@@ -548,6 +569,7 @@ We have many educators across the world teaching with Roblox. If you're interest
 #### Poland
 
 <a href="https://www.giganciprogramowania.edu.pl" title="Giganci Programowania">Giganci Programowania</a>
+<a href="https://impactacademies.pl/" title="impactPl">impact Academies and Camps</a>
 <a href="https://www.kidscoderlab.pl" title="Kids Coder Lab">Kids Coder Lab</a>
 <a href="https://www.wowschool.pl/" title="WOW School">WOW School</a>
 
@@ -572,6 +594,7 @@ We have many educators across the world teaching with Roblox. If you're interest
 <a href="https://coddyschool.com/courses/sozdanie_igr_v_roblox_studio/" title="CODDY">CODDY</a>
 <a href="https://start.codabra.org/" title="Codabra">Codabra</a>
 <a href="https://excklusiveit.com/" title="Exclusive-It">Exclusive-It</a>
+<a href="https://impactacademies.ru/" title="impactRu">impact Academies and Camps</a>
 <a href="https://kiber-one.com/moduli/roblox-studio-sdelat-vse-chto-vy-mozhete-sebe-predstavit/" title="KIBERone Russia">KIBERone Russia</a>
 <a href="https://ozonacademy.ru/" title="Ozon Academy">Ozon Academy</a>
 <a href="https://program-school.org/" title="Program School">Program School</a>
@@ -632,11 +655,13 @@ We have many educators across the world teaching with Roblox. If you're interest
 <a href="https://www.conmasfuturo.com/" title="ConMasFuturo">ConMasFuturo</a>
 <a href="https://curiosityandlearn.com/" title="Curiosity and Learn">Curiosity and Learn</a>
 <a href="https://www.giganciprogramowania.edu.pl" title="Giganci Programowania">Giganci Programowania</a>
+<a href="https://impactacademies.es/" title="impactEs">impact Academies and Camps</a>
 <a href="https://kiber-one.es/moduli/roblox-studio-hacer-todo-lo-que-uno-puede-imaginarse/" title="KIBERone Spain">KIBERone Spain</a>
 <a href="https://www.logiscool.com/" title="Logiscool">Logiscool</a>
 
 #### Switzerland
 
+<a href="https://impactacademies.ch/" title="impactCh">impact Academies and Camps</a>
 <a href="https://www.logiscool.com/" title="Logiscool">Logiscool</a>
 <a href="https://www.idtech.com/roblox-summer-camps?utm_source=roblox&amp;utm_medium=website&amp;utm_campaign=2018&amp;utm_content=roblox-site" title="iD Tech">iD Tech</a>
 
@@ -692,6 +717,7 @@ We have many educators across the world teaching with Roblox. If you're interest
 <a href="https://www.firetechcamp.com/" title="Fire Tech">Fire Tech</a>
 <a href="https://funtechsummercamps.com/course-descriptions/roblox-game-maker" title="FunTech">FunTech</a>
 <a href="https://www.idtech.com/roblox-summer-camps?utm_source=roblox&amp;utm_medium=website&amp;utm_campaign=2018&amp;utm_content=roblox-site" title="iD Tech">iD Tech</a>
+<a href="https://impactacademies.co.uk/" title="impactUk">impact Academies and Camps</a>
 
 #### Uruguay
 
@@ -700,6 +726,7 @@ We have many educators across the world teaching with Roblox. If you're interest
 #### Uzbekistan
 
 <a href="https://coddyschool.com/courses/sozdanie_igr_v_roblox_studio/" title="CODDY">CODDY</a>
+<a href="https://impactacademiesuz.com/" title="impactUz">impact Academies and Camps</a>
 
 #### Venezuela
 

content/en-us/production/promotion/invite-prompts.md

@@ -11,6 +11,8 @@ The invite prompt system features the following:
 - **Launch Data** — Include optional [launch data](#including-launch-data) that can be read through `Class.Player:GetJoinData()` when the invited friend joins. Example use cases include routing invited friends to a coordinate location or personalizing the joining experience for the invitee.
 - **Customizable Text** — Customize the [invite prompt](#prompting-an-invite) message and the [notification](#setting-notification-options) message. For example, an invite prompt for the player may read "Ask your friends to join the adventure!" and the notification message for the invited friend(s) may read "\{displayName\} wants you to join their adventure in \{experienceName\}!".
 
+You can also track and reward inviters and invitees using the [Friend Invite Reward System](./referral-system.md).
+
    <Tabs>
    <TabItem label="In-Experience Prompt">
      <figure>

content/en-us/production/promotion/referral-system.md

@@ -1,21 +1,23 @@
 ---
-title: Player Referral System
+title: Friend Invite Reward System
 description: Use referral links to track and reward players that have successfully invited other players into your experience, and players that have joined your experience using a referral link invitation from another player.
 ---
 
 <Alert severity="info">
 This feature is still in beta. If you'd like to provide Roblox with feedback about this feature, join the [User Acquisition Referrals](https://www.guilded.gg/i/kbQ4Po42) Guilded group.
 </Alert>
 
-The referral system encourages existing players to bring new players into your experience, increasing player retention and overall engagement. Players can access and share referral links from [player invite prompts](./invite-prompts.md) or directly from the default in-experience invite menu.
+The friend referral system encourages existing players to bring new players into your experience, increasing player retention and overall engagement. Players can access and share referral links from [player invite prompts](./invite-prompts.md) or directly from the default in-experience invite menu.
 
 As a developer, you can use these shareable referral links to:
 
 - Track which players have successfully invited other players into your experience.
 - Track which players have joined your experience using a referral link invitation from another player.
 - Create and distribute rewards to both inviters and invitees.
 
-To implement a referral system, [set up a referral event](#set-up-a-referral-event) and [create referral rewards](#grant-referral-rewards). The `ReferredByPlayerId` property of `Class.Player:GetJoinData()|GetJoinData()` automatically populates for all types of invitations and gives you access to the user ID of the referring player. You can then access this data in the `Players.PlayerAdded` event to identify the inviter and grant rewards to the inviter and the invitee.
+<img src="../../assets/promotion/referral-system/Invite-Friends.png" width="90%" />
+
+To implement a friend referral system, [set up a referral event](#set-up-a-referral-event) and [create referral rewards](#grant-referral-rewards). The `ReferredByPlayerId` property of `Class.Player:GetJoinData()|GetJoinData()` automatically populates for all types of invitations and gives you access to the user ID of the referring player. You can then access this data in the `Players.PlayerAdded` event to identify the inviter and grant rewards to the inviter and the invitee.
 
 ```lua
 function onPlayerAdded(player)
@@ -107,7 +109,7 @@ Players.PlayerAdded:Connect(onPlayerAdded)
 
 ## Manage Abuse Prevention
 
-You can implement safeguards to prevent players from exploiting the referral system.
+You can implement safeguards to prevent players from exploiting the friend referral system.
 
 - Offer one-time rewards to track invitees and make sure they're only rewarded once.
 - Introduce a cooldown period before an inviter can submit another referral.

content/en-us/reference/engine/datatypes/RBXScriptConnection.yaml

@@ -3,10 +3,21 @@ type: datatype
 summary: |
   A connection between an `Datatype.RBXScriptSignal` and a function.
 description: |
-  The `Datatype.RBXScriptConnection` data type, also known as a Connection, is a
-  special object returned by the Connect method of an Event
+  The `RBXScriptConnection` data type is a special object returned by the
+  `Datatype.RBXScriptSignal:Connect()|Connect()` method of an event
   (`Datatype.RBXScriptSignal`). This is used primarily to disconnect a listener
   from an `Datatype.RBXScriptSignal`.
+  
+  ```lua
+  local part : BasePart = script.Parent
+  -- Store reference to the RBXScriptConnection so it can be disconnected later
+  local connection : RBXScriptConnection = part.Touched:Connect(function(otherPart)
+      print("Hello world!")
+  end)
+  -- Wait 15 seconds, then disconnect
+  task.wait(15)
+  connection:Disconnect()
+  ```
 code_samples:
 tags: []
 deprecation_message: ''
@@ -18,8 +29,8 @@ properties:
     summary: |
       The state of the RBXScriptConnection.
     description: |
-      Describes whether or not the connection is still alive. This becomes false
-      if `connection:Disconnect()` is called.
+      Describes whether or not the connection is still alive. This becomes `false`
+      if `Datatype.RBXScriptConnection:Disconnect()|Disconnect()` is called.
     code_samples: []
     tags: []
     deprecation_message: ''

content/en-us/studio/game-settings.md

@@ -149,7 +149,7 @@ You should only enable the following settings if you trust all assets from other
   </tr>
   <tr>
     <td>**Secrets**</td>
-    <td>Allows for the creation and configuration of [Secrets](../reference/engine/datatypes/Secret.yaml) for Studio sessions using `Class.HttpService`. Visible only if HTTP requests are allowed.</td>
+    <td>Allows for the creation and configuration of `Datatype.Secret` for local Studio sessions using `Class.HttpService`. Visible only if HTTP requests are allowed. Secrets defined here are local to the device, and not available in Team Create sessions. Use Creator Hub to define production secrets. </td>
   </tr>
   <tr>
     <td>**Enable&nbsp;Studio&nbsp;Access to API Services**</td>