Stabilization/23101 main merge to resolve differing histories of override-a-prefab.md conflict

content/docs/api/gems/_index.md

@@ -4,6 +4,7 @@ description: Reference index for Gems shipped with Open 3D Engine.
 ---
 
 * [Achievements](/docs/api/gems/Achievements)
+* [Archive](/docs/api/gems/Archive)
 * [AssetValidation](/docs/api/gems/AssetValidation)
 * [Atom](/docs/api/gems/Atom)
 * [AtomContent](/docs/api/gems/AtomContent)
@@ -15,6 +16,7 @@ description: Reference index for Gems shipped with Open 3D Engine.
 * [AWSCore](/docs/api/gems/AWSCore)
 * [AWSGameLift](/docs/api/gems/AWSGameLift)
 * [AWSMetrics](/docs/api/gems/AWSMetrics)
+* [AzQtComponentsForPython](/docs/api/gems/AzQtComponentsForPython)
 * [BarrierInput](/docs/api/gems/BarrierInput)
 * [Camera](/docs/api/gems/Camera)
 * [CameraFramework](/docs/api/gems/CameraFramework)
@@ -52,17 +54,20 @@ description: Reference index for Gems shipped with Open 3D Engine.
 * [Multiplayer](/docs/api/gems/Multiplayer)
 * [MultiplayerCompression](/docs/api/gems/MultiplayerCompression)
 * [NvCloth](/docs/api/gems/NvCloth)
+* [OpenXRVk](/docs/api/gems/OpenXRVk)
 * [PhysX](/docs/api/gems/PhysX)
 * [PhysXDebug](/docs/api/gems/PhysXDebug)
 * [Prefab](/docs/api/gems/Prefab)
 * [Presence](/docs/api/gems/Presence)
 * [PrimitiveAssets](/docs/api/gems/PrimitiveAssets)
 * [Profiler](/docs/api/gems/Profiler)
+* [ProteusRobot](/docs/api/gems/ProteusRobot)
 * [PythonAssetBuilder](/docs/api/gems/PythonAssetBuilder)
 * [QtForPython](/docs/api/gems/QtForPython)
 * [RecastNavigation](/docs/api/gems/RecastNavigation)
 * [RemoteTools](/docs/api/gems/RemoteTools)
 * [ROS2](/docs/api/gems/ROS2)
+* [RosRobotSample](/docs/api/gems/RosRobotSample)
 * [SaveData](/docs/api/gems/SaveData)
 * [SceneLoggingExample](/docs/api/gems/SceneLoggingExample)
 * [SceneProcessing](/docs/api/gems/SceneProcessing)
@@ -89,4 +94,8 @@ description: Reference index for Gems shipped with Open 3D Engine.
 * [Vegetation](/docs/api/gems/Vegetation)
 * [VideoPlaybackFramework](/docs/api/gems/VideoPlaybackFramework)
 * [VirtualGamepad](/docs/api/gems/VirtualGamepad)
+* [WarehouseAssets](/docs/api/gems/WarehouseAssets)
+* [WarehouseAutomation](/docs/api/gems/WarehouseAutomation)
+* [WarehouseSample](/docs/api/gems/WarehouseSample)
 * [WhiteBox](/docs/api/gems/WhiteBox)
+* [XR](/docs/api/gems/XR)

content/docs/contributing/code-of-conduct.md

@@ -5,24 +5,7 @@ description: Before you join the O3DE project, make sure you understand the cond
 weight: 600
 ---
 
-## CNCF Community Code of Conduct v1.0
-
-Other languages available:
-
-- [Arabic/العربية](https://github.com/cncf/foundation/blob/master/code-of-conduct-languages/ar.md)
-- [Chinese/中文](https://github.com/cncf/foundation/blob/master/code-of-conduct-languages/zh.md)
-- [Czech/Česky](https://github.com/cncf/foundation/blob/master/code-of-conduct-languages/cs.md)
-- [French/Français](https://github.com/cncf/foundation/blob/master/code-of-conduct-languages/fr.md)
-- [German/Deutsch](https://github.com/cncf/foundation/blob/master/code-of-conduct-languages/de.md)
-- [Indonesian/Bahasa Indonesia](https://github.com/cncf/foundation/blob/master/code-of-conduct-languages/id.md)
-- [Italian/Italiano](https://github.com/cncf/foundation/blob/master/code-of-conduct-languages/it.md)
-- [Japanese/日本語](https://github.com/cncf/foundation/blob/master/code-of-conduct-languages/jp.md)
-- [Korean/한국어](https://github.com/cncf/foundation/blob/master/code-of-conduct-languages/ko.md)
-- [Polish/Polski](https://github.com/cncf/foundation/blob/master/code-of-conduct-languages/pl.md)
-- [Portuguese/Português](https://github.com/cncf/foundation/blob/master/code-of-conduct-languages/pt.md)
-- [Russian/Русский](https://github.com/cncf/foundation/blob/master/code-of-conduct-languages/ru.md)
-- [Spanish/Español](https://github.com/cncf/foundation/blob/master/code-of-conduct-languages/es.md)
-- [Ukrainian/Українська](https://github.com/cncf/foundation/blob/master/code-of-conduct-languages/uk.md)
+## Community Code of Conduct v1.0
 
 ### Contributor Code of Conduct
 
@@ -56,10 +39,10 @@ Conduct may be permanently removed from the project team.
 This code of conduct applies both within project spaces and in public spaces
 when an individual is representing the project or its community.
 
-Instances of abusive, harassing, or otherwise unacceptable behavior in O3DE may be reported by contacting the [O3DE Code of Conduct Committee](https://github.com/o3de/foundation/tree/main/committee/committee-code-of-conduct) via <conduct@o3de.org>. For other projects, please contact a CNCF project maintainer.
+Instances of abusive, harassing, or otherwise unacceptable behavior in O3DE may be reported by contacting the [O3DE Code of Conduct Committee](https://github.com/o3de/foundation/tree/main/committee/committee-code-of-conduct) via <conduct@o3de.org>. For other projects, please contact a project maintainer.
 
 This Code of Conduct is adapted from the [Contributor Covenant](http://contributor-covenant.org), version 1.2.0, available [here](http://contributor-covenant.org/version/1/2/0/).
 
-### CNCF Events Code of Conduct
+### Events Code of Conduct
 
-CNCF events are governed by the Linux Foundation [Code of Conduct](https://events.linuxfoundation.org/code-of-conduct/) available on the event page. This is designed to be compatible with the above policy and also includes more details on responding to incidents
+O3DF events are governed by the Linux Foundation [Code of Conduct](https://events.linuxfoundation.org/code-of-conduct/) available on the event page. This is designed to be compatible with the above policy and also includes more details on responding to incidents