FIRST-Tech-Challenge · miriamsr · Aug 2, 2024 · Aug 2, 2024 · Aug 3, 2024 · Aug 3, 2024
diff --git a/docs/source/control_hard_compon/ds_components/components/components.rst b/docs/source/control_hard_compon/ds_components/components/components.rst
@@ -45,11 +45,11 @@ The heart of the Driver Station is the Android Device that runs the
 Driver Station App. This Android Device requirement can be fulfilled
 either through the use of a 
 `REV Driver Hub <https://www.revrobotics.com/rev-31-1596/>`_ 
-or one of the approved Android Smartphones listed in
-:doc:`Game Manual 1 <../../../manuals/game_manuals/game_manuals>`. It is of
+or one of the approved Android Smartphones listed in the
+:doc:`Competition Manual <../../../manuals/competition_manual/competition_manual>`. It is of
 vital importance that the Driver Station App be updated to a version
 that meets or exceeds the minimum Driver Station App version as
-defined in :doc:`Game Manual 1 <../../../manuals/game_manuals/game_manuals>`.
+defined in the :doc:`Competition Manual <../../../manuals/competition_manual/competition_manual>`.
 
 USB-OTG Adapter / Hubs
 ----------------------
@@ -145,7 +145,7 @@ Comercial USB Battery Pack
 
 A commercial USB battery pack is an auxiliary power source that can be used in
 specific situations in accordance with the
-:ref:`Game Manuals<manuals/game_manuals/game_manuals:game manuals>`. A USB 
+:ref:`Competition Manual <manuals/competition_manual/competition_manual:competition manual>`. A USB 
 battery pack is permitted to be used to charge your Android Device. Only the
 REV Driver Hub can be charged while in use, through its USB-C port.
 
@@ -257,7 +257,7 @@ Gamepads
 
       Quadstick FPS
 
-:ref:`Game Manual 1 <manuals/game_manuals/game_manuals:game manuals>` defines
+The :ref:`Competition Manual <manuals/competition_manual/competition_manual:competition manual>` defines
 the gamepads that are allowed in competition play. Up to two gamepads, in any
 combination, of the allowed types of gamepads may be used. All gamepads MUST be
 used in wired mode only, no wireless of any kind is allowed. Special features of

diff --git a/docs/source/control_hard_compon/ds_components/index.rst b/docs/source/control_hard_compon/ds_components/index.rst
@@ -14,8 +14,8 @@ way represent the only possible way of connecting these components. These
 images also do not represent using a 
 `Driver Station Carrier <https://www.thingiverse.com/thing:3386378>`_, 
 which is recommended for teams to use for component management and
-transportation. See rule ``DS07`` in 
-:doc:`Game Manual 1 <../../manuals/game_manuals/game_manuals>` for more information 
+transportation. See the 
+:doc:`Competition Manual <../../manuals/competition_manual/competition_manual>` for more information 
 on Driver Station Carriers.
 
 .. tab-set::

diff --git a/docs/source/control_hard_compon/rc_components/hub/ports/std-ports.rst b/docs/source/control_hard_compon/rc_components/hub/ports/std-ports.rst
@@ -11,8 +11,8 @@ As the connector is known for its fragility it is highly recommended you be care
 It is also recommended that you expand your connector prongs periodically. For more information on this 
 process please watch this `video <https://www.youtube.com/watch?v=UYXTiSeVmB0>`_. While this video features an XT60, a larger version 
 of the XT-30, and a drone the advice is much the same. This port may also be used 
-to connect a grounding strap. For more information on legal grounding straps see ``<RE15>``, 
-:ref:`Game Manual Part 1 <manuals/game_manuals/game_manuals:game manuals>`. For more information on this port please see 
+to connect a grounding strap. For more information on legal grounding straps see the, 
+:ref:`Competition Manual <manuals/competition_manual/competition_manual:competition manual>`. For more information on this port please see 
 `REV Documentation <https://docs.revrobotics.com/duo-control/control-system-overview/control-hub-basics#input-power-specifications>`_.
 
 Motor Ports
@@ -46,7 +46,7 @@ Servo Ports
 These 0.1” Header pins are used to power and control your servos. There are 6 ports on each hub and they are numbered from 0-5. 
 Be mindful of matching the polarity of the device attached to this port as it is possible to flip the connector. 
 For increasing the power supplied to these servos it is possible to use a Servo Power Module that is in compliance with 
-``<RE05>``, :ref:`Game Manual Part 1 <manuals/game_manuals/game_manuals:game manuals>`. For more information on this port 
+the :ref:`Competition Manual <manuals/competition_manual/competition_manual:competition manual>`. For more information on this port 
 please see `REV Servo Port Documentation <https://docs.revrobotics.com/duo-control/control-system-overview/control-hub-basics#servo-port-specifications>`_.
 
 +5V Power Ports
@@ -56,8 +56,8 @@ These 0.1” Header pins are used to power and control various appliances. There
 are two ports on each hub. These connectors can be used for a limited range of
 applications in FIRST Tech Challenge, such as powering powered USB hubs. For more
 information on this port please see 
-`REV +5V Power Port Documentation <https://docs.revrobotics.com/duo-control/control-system-overview/control-hub-basics#id-5v-power-port-specifications>`_ and 
-:ref:`Game Manual Part 1 <manuals/game_manuals/game_manuals:game manuals>`.
+`REV +5V Power Port Documentation <https://docs.revrobotics.com/duo-control/control-system-overview/control-hub-basics#id-5v-power-port-specifications>`_ and the
+:ref:`Competition Manual <manuals/competition_manual/competition_manual:competition manual>`.
 
 Analog Ports
 --------------
@@ -88,7 +88,7 @@ I2C Ports
 These 4-pin `JST-PH <https://docs.revrobotics.com/duo-control/control-system-overview/cables-and-connectors/jst-ph-sensors-and-rs485>`_ 
 style connectors are used for connecting I2C sensors. Each port is a single I2C bus where multiple sensors can be 
 attached. Using sensors with identical addresses on the same bus can cause problems. The range of I2C sensors that can be connected is limited 
-by :ref:`Game Manual Part 1 <manuals/game_manuals/game_manuals:game manuals>`. While it is possible to use a large range of 
+by the :ref:`Competition Manual <manuals/competition_manual/competition_manual:competition manual>`. While it is possible to use a large range of 
 sensors, the vast majority of I2C sensors do not have drivers built into the SDK. It is possible to use community drivers 
 or create your own. For more information on this port please see 
 `REV I2C Port Documentation <https://docs.revrobotics.com/duo-control/control-system-overview/control-hub-basics#i2c-port-specifications>`_.

diff --git a/docs/source/control_hard_compon/rc_components/motors/motors.rst b/docs/source/control_hard_compon/rc_components/motors/motors.rst
@@ -89,10 +89,10 @@ Motors
 
       REV Robotics Core Hex 12V DC Motor
 
-Motors are the primary drivers of a robot. All motors are 12v brushed DC motors and are enumerated in
-:ref:`Game Manual Part 1 <manuals/game_manuals/game_manuals:game manuals>`. They may only be controlled
+Motors are the primary drivers of a robot. All motors are 12v brushed DC motors and are enumerated in the
+:ref:`Competition Manual <manuals/competition_manual/competition_manual:competition manual>`. They may only be controlled
 via a REV Expansion Hub, REV Control Hub, REV SPARKmini Motor Controller, or VEX Motor
-Controller 29. ``<RE09>``
+Controller 29.
 
 Additional Resources
 ---------------------

diff --git a/docs/source/control_hard_compon/rc_components/power_distr/power-distr.rst b/docs/source/control_hard_compon/rc_components/power_distr/power-distr.rst
@@ -59,10 +59,10 @@ Robot Main Battery
       REV Robotics (REV-31-1302)
 
 The main power of a robot comes from one 12v battery. The battery may be one of
-the batteries shown above. Refer to section ``<RE03>`` in the 
-:ref:`Game Manual Part 1<manuals/game_manuals/game_manuals:game manuals>` 
+the batteries shown above. Refer to the 
+:ref:`Competition Manual <manuals/competition_manual/competition_manual:competition manual>` 
 for exact information on allowed batteries. Note that it is typically allowed
-by ``<RE15>`` to replace the connector on the batteries, provided the in-line
+to replace the connector on the batteries, provided the in-line
 fuse on the battery is preserved.
 
 .. warning:: 
@@ -146,9 +146,9 @@ Main Power Switch
 
 
 One Main Power Switch must control all power provided by the Main Battery. It
-along with its label should be placed in accordance to 
-:ref:`Game Manual Part 1<manuals/game_manuals/game_manuals:game manuals>`. 
-The legal power switches are shown above. ``<RE01>``
+along with its label should be placed in accordance to the
+:ref:`Competition Manual <manuals/competition_manual/competition_manual:competition manual>`. 
+The legal power switches are shown above.
 
 :download:`Power Switch Label <https://www.firstinspires.org/sites/default/files/uploads/resource_library/ftc/power-button-labels.pdf>`
 
@@ -195,7 +195,7 @@ Power Distribution Block
 
 Power Distribution Blocks help to distribute the power to devices such as
 Control Hubs, SPARKminis, and more.  
-See :ref:`Game Manual Part 1<manuals/game_manuals/game_manuals:game manuals>` 
+See the :ref:`Competition Manual <manuals/competition_manual/competition_manual:competition manual>` 
 for a description of legal Power Distribution methods. The Power
 Distribution Blocks shown are not the only legal devices for power distribution.
 
@@ -252,11 +252,9 @@ COTS USB Battery Pack
       Anker Battery Pack
 
 A Commercial Off The Shelf (COTS) USB battery pack is an auxiliary power source
-that can be used in specific situations in accordance with the :ref:`Game
-Manuals<manuals/game_manuals/game_manuals:game manuals>`. In the 2023-2024
-season, these batteries were deemed permissible to power LEDs (per
-``<RE12>f.ii``) and, by extension, COTS light controller sources like the `REV
-Blinkin <https://www.revrobotics.com/rev-11-1105/>`__ (per ``<RE12>e``).
+that can be used in specific situations in accordance with the :ref:`Competition Manual <manuals/competition_manual/competition_manual:competition manual>`. In the 2023-2024
+season, these batteries were deemed permissible to power LEDs and, by extension, COTS light controller sources like the `REV
+Blinkin <https://www.revrobotics.com/rev-11-1105/>`_.
 However, having a COTS USB External Battery on the Robot carries additional
 considerations.  All teams must ensure their COTS USB Battery Pack:
 

diff --git a/docs/source/control_hard_compon/rc_components/sensors/sensors.rst b/docs/source/control_hard_compon/rc_components/sensors/sensors.rst
@@ -2,7 +2,7 @@ Sensors
 =========
 
 .. note:: 
-   As per :ref:`Game Manual Part 1<manuals/game_manuals/game_manuals:game manuals>` 
+   As per the :ref:`Competition Manual <manuals/competition_manual/competition_manual:competition manual>` 
    a UVC Webcam is not considered a sensor.
 
 Listed below are some examples of common robot sensors. This is not

diff --git a/...rce/game_specific_resources/playing_field_resources/playing_field_resources.rst b/...rce/game_specific_resources/playing_field_resources/playing_field_resources.rst
@@ -7,23 +7,25 @@ Playing Field Resources
 
 About the Playing Field
 ------------------------------------
-There are multiple configurations of the playing field that can be used. For traditional games, the playing field is a part of the Competition Area that includes the 12 ft. x 12 ft. (3.66 m x 3.66 m) field and all
-the elements described in the official field drawings. For remote games, the playing field is a part of the Competition Area that includes the 12 ft. x 8 ft. (3.66 m x 2.44 m) field and all the elements described 
-in the official field drawings. The base field stays the same for all games but the game elements are subject to change as per :ref:`Game Manual Part 2<manuals/game_manuals/game_manuals:game manuals>`.
+There are multiple configurations of the playing field that can be used. For traditional games, the playing field is a part of the ARENA that includes the 12 ft. x 12 ft. (3.66 m x 3.66 m) field and all
+the elements described in the official field drawings. For remote games, the playing field is a part of the ARENA that includes the 12 ft. x 8 ft. (3.66 m x 2.44 m) field and all the elements described 
+in the official field drawings. The base field stays the same for all games but the game elements are subject to change as per the :ref:`Competition Manual <manuals/competition_manual/competition_manual:competition manual>`.
 
 
 Traditional Field Setup Guide
 ------------------------------------
 
-This document can be found here: `Traditional Field Setup Guide <https://firstinspiresst01.blob.core.windows.net/first-in-show-ftc/field-assembly-and-setup-guide.pdf>`__
+Check back after kickoff for the INTO THE DEEP Field Setup Guide.
 
-.. only:: html
+.. comment 
 
-   .. raw:: html
+    .. only:: html
+
+    .. raw:: html
 
-       <iframe id="iframepdf" src="https://firstinspiresst01.blob.core.windows.net/first-in-show-ftc/field-assembly-and-setup-guide.pdf" width="100%" height="700"></iframe>
+        <iframe id="iframepdf" src="https://firstinspiresst01.blob.core.windows.net/first-in-show-ftc/field-assembly-and-setup-guide.pdf" width="100%" height="700"></iframe>
 
-|
+    |
 
 Remote Field Setup Guide
 ------------------------------------

diff --git a/docs/source/index.rst b/docs/source/index.rst
@@ -43,7 +43,7 @@ to see why.
 
    game_specific_resources/blog/blog
    tech_tips/tech-tips
-   manuals/game_manuals/game_manuals
+   manuals/competition_manual/competition_manual
    Game Q&A Forum <game_specific_resources/ftcqa/ftcqa>
    game_specific_resources/playing_field_resources/playing_field_resources
    Field Coordinate System <game_specific_resources/field_coordinate_system/field-coordinate-system>
@@ -378,13 +378,13 @@ to see why.
 
          .. div:: col-sm pl-1 pr-1
 
-            .. button-ref:: manuals/game_manuals/game_manuals
+            .. button-ref:: manuals/competition_manual/competition_manual
                :ref-type: doc
                :color: black
                :outline:
                :expand:
 
-               Game Manuals
+               Competition Manual
 
          .. div:: col-sm pl-1 pr-1
 

diff --git a/docs/source/manuals/competition_manual/competition_manual.rst b/docs/source/manuals/competition_manual/competition_manual.rst
@@ -0,0 +1,15 @@
+Competition Manual
+==================
+
+The Competition Manual can be found on the `Game and Season Materials page <https://www.firstinspires.org/resource-library/ftc/game-and-season-info>`__ on the *FIRST* Website. It is also here for your convenience.
+
+`2024-2025 INTO THE DEEP Competition Manual <https://firstinspires.blob.core.windows.net/ftc/2024-25/Competition-Manual.pdf>`__
+
+.. only:: html
+
+   .. raw:: html
+
+       <iframe id="iframepdf" src="https://firstinspires.blob.core.windows.net/ftc/2024-25/Competition-Manual.pdf" width="100%" height="700"></iframe>
+
+|
+
diff --git a/docs/source/manuals/game_manuals/game_manuals.rst b/docs/source/manuals/game_manuals/game_manuals.rst
diff --git a/docs/source/persona_pages/rookie_teams/rookie_teams.rst b/docs/source/persona_pages/rookie_teams/rookie_teams.rst
@@ -109,13 +109,13 @@ resource you want to explore!
 
          .. div:: col-sm pl-1 pr-1
 
-            .. button-ref:: ../../manuals/game_manuals/game_manuals
+            .. button-ref:: ../../manuals/competition_manual/competition_manual
                :ref-type: doc
                :color: black
                :outline:
                :expand:
 
-               Game Manuals
+               Competition Manual
 
          .. div:: col-sm pl-1 pr-1
 

diff --git a/docs/source/programming_resources/shared/installing_kotlin/Installing-Kotlin.rst b/docs/source/programming_resources/shared/installing_kotlin/Installing-Kotlin.rst
@@ -43,9 +43,7 @@ Using Kotlin in *FIRST* Tech Challenge
 
 
 While there is no rule (as of the writing of this document) prohibiting Kotlin as a programming 
-option in *FIRST* Tech Challenge, it is not one of the recommended tools as listed in **<RS02>** 
-"Recommended Programming Tools" portion of the *FIRST* Tech Challenge 
-:doc:`Game Manual Part 1 <../../../manuals/game_manuals/game_manuals>`.
+option in *FIRST* Tech Challenge, it is not one of the officially recommended or supported tools.
 Teams that use Kotlin do so at their own risk and should expect that there will not be technical
 help/support available at events in the case of software issues.
 

diff --git a/docs/source/redirects.txt b/docs/source/redirects.txt
@@ -0,0 +1 @@
+"manuals/game_manuals/game_manuals.rst" "manuals/competition_manual/competition_manual.rst"