Revert "Resolving merge conflicts"

This reverts commit 606b834.

Author: josepmariapujol-unity

Packages/com.unity.inputsystem/Documentation~/controls.md

@@ -0,0 +1,31 @@
+---
+uid: input-system-controls
+---
+
+# Controls
+
+![A flowchart showing the general workflow of the Input System, with icons representing the different concepts. It starts with the User icon, which then leads into the Input Device and its Controls icon. This then leads into the Action Map and Actions concept. The Input Device and Action Map and Actions icons are collectively grouped under the Binding header. This leads into the final icon representing your action code.](Images/ConceptsOverview.png)
+
+A **control** is a part of a [device](devices.md) that sends values to the Input System when [actuated](control-actuation.md), such as the buttons and sticks on a gamepad, or the keys on a keyboard.
+
+
+| **Topic**                       | **Description**                  |
+| :------------------------------ | :------------------------------- |
+| **[Introduction to controls](introduction-to-controls.md)** | An introduction to the concept of controls. |
+| **[Control hierarchies](control-hierarchies.md)** | Learn about how controls are arranged hierarchically.  |
+| **[Control types reference](control-types-reference.md)** | The types of control defined in the Input System. |
+| **[Control usages](control-usages.md)** | Understand what a control usage is. |
+| **[Control paths](control-paths.md)** | Learn about control paths and how to use them to refer to controls.  |
+| **[Control state](control-state.md)** | Details about how a control's state is stored and accessed. |
+| **[Record control state history](record-control-state-history.md)** | How to record a control's state history over time. |
+| **[Control actuation](control-actuation.md)** | Whether or not a control is currently being used by the user. |
+| **[Noisy controls](noisy-controls.md)** | Controls which can change value without any actual or intentional user interaction such as the accelerometer. |
+| **[Synthetic controls](synthetic-controls.md)** | A type of virtual control with values synthesized from input from a physical control on the device.  |
+| **[Optimize controls](optimize-controls.md)** | Detailed information about increasing input performance in some specialized scenarios. |
+
+## Additional resources
+
+- [Bindings](bindings.md)
+- [Devices](devices.md)
+- [Layouts](layouts.md)
+- [Device states](device-states.md)

Packages/com.unity.inputsystem/Documentation~/devices.md

@@ -0,0 +1,29 @@
+---
+uid: input-system-devices
+---
+
+# Devices
+
+You can configure and respond to a variety of input devices in the Actions Editor window, but each type of device has its own unique features that sometimes require special handling, such as touches on a touchscreen, or text input on a keyboard.
+
+Learn about supported input devices and their unique features in this section.
+
+| **Topic** | **Description** |
+| :--- | :--- |
+| **[Types of input devices](devices-overview.md)**|Connect devices to your application.|
+| **[Pointer devices](devices-pointers.md)** | Configure devices that track input on a 2D surface, such as mice, or pens. |
+| **[Keyboards](devices-keyboard.md)** | Configure devices that use a set of key controls.|
+| **[Joysticks](devices-joysticks.md)** | Configure devices that have at least one input stick and one button. |
+| **[Gamepads](devices-gamepads.md)** | Configure devices that have a D-pad and four face buttons. |
+| **[Sensors](devices-sensors.md)** | Configure devices that measure environmental input. |
+| **[Human Interface Device specification](hid-specification.md)** | Use the Human Interface Device specification to implement peripheral user input devices connected to computers with USB or Bluetooth. |
+| **[Supported devices reference](supported-devices-reference.md)** | Explore platform support for each compatible device. |
+| **[Devices (scripting)](devices-scripting.md)** | Learn how to manage devices in code. |
+| **[Custom devices](custom-devices.md)** | Create events and custom devices. |
+
+## Additional resources
+
+- [Setting up input](setting-up-input.md)
+- [Responding to input](respond-to-input.md)
+- [Layouts](layouts.md)
+- [Debug a device](debug-device.md)

Packages/com.unity.inputsystem/Documentation~/videos.md

@@ -1,13 +1,13 @@
 ---
 uid: input-system-videos
 ---
-# Videos
+
+# Video resources
 
 This page provides a collection of video resources to introduce the Input System in Unity 6. Follow the videos in the order provided, since many of the tutorials provide a foundation for understanding the more advanced tutorials.
 
 The Input System supports several different workflows, each with its own advantages. These videos walk you through the most commonly used workflows and offer practical guidance to help you begin using the Input System right away.
 
-
 ## Introduction to the Unity Input System
 
 **Description**: This is the first video in a 7-part series that demonstrates how to get started with Unity’s Input System and introduces some of its core concepts. It covers the following lessons:
@@ -20,7 +20,6 @@ The Input System supports several different workflows, each with its own advanta
 
 **Link**: [Watch video 1/7](https://www.youtube.com/watch?v=TiTKAseu17A) (YouTube)
 
-
 ## Input System scripting
 
 **Description**: The second video in the series introduces scripting with the Input System to control a third-person character:
@@ -51,7 +50,6 @@ The Input System supports several different workflows, each with its own advanta
 
 **Link**: [Watch Video 4/7](https://www.youtube.com/watch?v=GdjP5pggaHw) (YouTube)
 
-
 ## Rebind Input System controls
 
 **Description**: The fifth video in the series explores in-game rebinding:
@@ -72,7 +70,6 @@ The Input System supports several different workflows, each with its own advanta
 
 **Link**: [Watch Video 6/7](https://www.youtube.com/watch?v=beDfIBLfx4c) (YouTube)
 
-
 ## Player Input Manager and local multiplayer games
 
 **Description**: The seventh video in the series focuses on local multiplayer games, where two or more players share the same computer and screen while using separate controllers. Learn how to use the Player Input Manager component to enable multiple players to control different characters in a local multiplayer setup.
@@ -83,4 +80,4 @@ This includes examples that demonstrate the following:
 - A split-screen configuration
 - A two-player scenario
 
-**Link**: [Watch Video 7/7](https://www.youtube.com/watch?v=lGxXQzE5Vu8) (YouTube)
+**Link**: [Watch Video 7/7](https://www.youtube.com/watch?v=lGxXQzE5Vu8) (YouTube)