Fixing merge conflicts

Author: jabbacakes

mppm/about.md

@@ -10,6 +10,10 @@ Use Multiplayer Play Mode to test multiplayer functionality within the Unity Edi
 
 Multiplayer Play Mode version 1.1.0 is compatible with Unity Editor versions 6000.0.3f1 or later.
 
+## Compatibility
+
+Multiplayer Play Mode version 1.1.0 is compatible with Unity Editor versions 6000.0.3f1 or later.
+
 ## Multiplayer Play Mode terminology
 
 The following have specific meaning in relation to Multiplayer Play Mode:

mppm/virtual-players/virtual-players-enable.md

@@ -29,12 +29,12 @@ To understand how **Multiplayer Play Mode** works with **Play mode**, refer to [
 
 ## Deactivate a Virtual Player
 
-Virtual Players do not automatically deactivate when you close the Virtual Player window. 
+Virtual Players do not automatically deactivate when you close the Virtual Player window.
 To deactivate a **Virtual Player**.
 
 1. In the Unity Editor, open the Multiplayer Play Mode window by navigating to **Window** > **Multiplayer Play Mode**.
 2. Deselect the checkbox for the active Virtual Player (**Player 2**, **Player 3**, or **Player 4**).
 
 :::note
-When you deactivate a Virtual Player, Unity doesn't delete its corresponding folder. To remove a Virtual Player folder, navigate to `C://Users/[YourName]/[ProjectName]Library/VP` and delete the folder for this Virtual Player. 
-:::
+When you deactivate a Virtual Player, Unity doesn't delete its corresponding folder. To remove a Virtual Player folder, navigate to `C://Users/[YourName]/[ProjectName]Library/VP` and delete the folder for this Virtual Player.
+:::

mppm/virtual-players/virtual-players-layout.md

@@ -18,7 +18,7 @@ You can only use the Hierarchy, Inspector, and Scene windows in Play Mode.
 
 ## Display a window in a Virtual Player
 
-To display a window in a Virtual Player, perform the following actions: 
+To display a window in a Virtual Player, perform the following actions:
 
 1. [Activate](../virtual-players/virtual-players-enable) a Virtual Player.
 2. Select the **Layout** dropdown.
@@ -27,7 +27,7 @@ To display a window in a Virtual Player, perform the following actions:
 
 ## Hide a window in a Virtual Player
 
-To hide a window in a Virtual Player, perform the following actions: 
+To hide a window in a Virtual Player, perform the following actions:
 
 1. [Activate](../virtual-players/virtual-players-enable) a Virtual Player.
 2. Select the **Layout** dropdown.

mppm/virtual-players/virtual-players.md

@@ -19,5 +19,3 @@ This section contains the following information:
 | [Activate a Virtual Player](../virtual-players/virtual-players-enable)   | Set up Virtual Players.         |
 | [Focus the Multiplayer Play Mode view on a Virtual Player](../virtual-players/virtual-players-focus) | Switch the Multiplayer Play Mode view between Players. |
 | [Change the layout of a Virtual Player](../virtual-players/virtual-players-layout)| Control which parts of the [Unity Interface](https://docs.unity3d.com/Manual/UsingTheEditor.html) appear in a Virtual Player. |
-
-

mppm_versioned_docs/version-1.0.0/about.md

@@ -9,6 +9,9 @@ Use Multiplayer Play Mode to test multiplayer functionality within the Unity Edi
 ## Compatibility
 Multiplayer Play Mode version 1.0.0 is compatible with Unity Editor versions 2023.1 or later.
 
+## Compatibility
+Multiplayer Play Mode version 1.0.0 is compatible with Unity Editor versions 2023.1 or later.
+
 ## Multiplayer Play Mode terminology
 
 The following have specific meaning in relation to Multiplayer Play Mode:
@@ -27,6 +30,7 @@ The Unity Editor and Virtual Players require a lot of system resources, so you s
 
 ### Authoring
 You can't create or change the properties of GameObjects in a Virtual Player. Instead, use the main Editor Player to make changes and a Virtual Player to test multiplayer functionality. Any changes you make in Play Mode in the main Editor Player reset when you exit Play Mode.
+
 :::note
 You can't access any main Editor Player functionality from Virtual Players.
 :::

mppm_versioned_docs/version-1.1.0/about.md

@@ -27,7 +27,7 @@ Multiplayer Play Mode has some inherent technical limitations, specifically arou
 The Unity Editor and Virtual Players require a lot of system resources, so you shouldn't use Multiplayer Play Mode at scale. Multiplayer Play Mode is designed for small-scale, local testing environments that can only support up to four total Players (the main Editor Player and three Virtual Players).
 
 ### Authoring
-You can't create or change the properties of GameObjects in a Virtual Player. Instead, use the main Editor Player to make changes and a Virtual Player to test multiplayer functionality. Any changes you make in Play Mode in the main Editor Player reset when you exit Play Mode. 
+You can't create or change the properties of GameObjects in a Virtual Player. Instead, use the main Editor Player to make changes and a Virtual Player to test multiplayer functionality. Any changes you make in Play Mode in the main Editor Player reset when you exit Play Mode.
 :::note
 You can't access any main Editor Player functionality from Virtual Players.
 :::

mppm_versioned_docs/version-1.1.0/install.md

@@ -11,7 +11,7 @@ To install the Multiplayer Play Mode package, follow these steps:
 2. Select a Project to open it.
 3. In the Editor's menu bar, navigate to **Window** > **Package Manager**.
 4. Select **Unity Registry**.
-5. Select the **Multiplayer Play Mode** package. 
+5. Select the **Multiplayer Play Mode** package.
 6. Select **Install**.
 
 ## Next steps

mppm_versioned_docs/version-1.1.0/release-notes/release-notes.md

@@ -22,7 +22,7 @@ description: Release notes for Multiplayer Play Mode including new features, upd
 - The escape key no longer closes virtual Player windows on Windows devices.
 - Fixed issues with heartbeat timeout.
 - Removed the forward slash **/** character from tags because it's for drop-down behavior only.
-  
+
 ## [1.0.0] - 2024-03-12
 
 ### Added

mppm_versioned_docs/version-1.1.0/virtual-players/virtual-players-enable.md

@@ -36,5 +36,5 @@ To deactivate a Virtual Player.
 2. Deselect the checkbox for the active Virtual Player (**Player 2**, **Player 3**, or **Player 4**).
 
 :::note
-When you deactivate a Virtual Player, Unity doesn't delete its corresponding folder. To remove a Virtual Player folder, navigate to `C://Users/[YourName]/[ProjectName]Library/VP` and delete the folder for this Virtual Player. 
-:::
+When you deactivate a Virtual Player, Unity doesn't delete its corresponding folder. To remove a Virtual Player folder, navigate to `C://Users/[YourName]/[ProjectName]Library/VP` and delete the folder for this Virtual Player.
+:::

mppm_versioned_docs/version-1.1.0/virtual-players/virtual-players.md

@@ -19,5 +19,3 @@ This section contains the following information:
 | [Activate a Virtual Player](../virtual-Players/virtual-Players-enable)   | Set up virtual Players.         |
 | [Focus the multiplayer Play Mode view on a virtual Player](../virtual-Players/virtual-Players-focus) | Switch the multiplayer Play Mode view between Players. |
 | [Change the layout of a Virtual Player](../virtual-Players/virtual-Players-layout)| Control which parts of the [Unity Interface](https://docs.unity3d.com/Manual/UsingTheEditor.html) appear in a Virtual Player. |
-
-