docs(actuators): move flaps setup docs

Author: ttechnick

docs/en/config/actuators.md

@@ -175,9 +175,7 @@ The fields are:
 
 #### Flap Scale and Spoiler Scale Configuration
 
-The channel setup of flaps and spoilers is described in [Flaps and Spoiler Control with Manual Control](../payloads/generic_actuator_control.md#flaps-and-spoiler-control-with-manual-control).
-
-"Flap-control" and "Spoiler-control" are aerodynamic configurations that can either be commanded manually by the pilot (using RC, say), or are set automatically by the controller.
+"Flap-control" and "Spoiler-control" are aerodynamic configurations that can either be commanded manually by the pilot (using RC or a Joystick, say) (see [Flaps and Spoiler Control with Manual Control](#flaps-and-spoiler-control-with-manual-control)), or are set automatically by the controller.
 For example, a pilot or the landing system might engage "Spoiler-control" in order to reduce the airspeed before landing.
 
 The configurations are an _abstract_ way for the controller to tell the allocator how much it should adjust the aerodynamic properties of the wings relative to the "full flaps" or "full spoiler" configuration (between `[0,1]`, where "1" indicates the full range).
@@ -200,6 +198,20 @@ In the following example, the vehicle has two ailerons, one elevator, one rudder
   These are the elevator deflections added to compensate for the pitching moments generated by the flaps and spoiler actuators.
   In the case here the elevator would be deflected 0.3 up when the flaps are fully deployed to counteract the pitching down moment caused by the flaps.
 
+#### Flaps and Spoiler Control with Manual Control
+
+The preferred method to manually actuate spoilers and flaps is to map a manual control switch to an `AUX` output (see [Generic Actuator Control with RC](#generic-actuator-control-with-rc)), and then map that AUX output to the flap or spoiler function using [FW_FLAPS_MAN](../advanced_config/parameter_reference.md#FW_FLAPS_MAN) or [FW_SPOILERS_MAN](../advanced_config/parameter_reference.md#FW_SPOILERS_MAN).
+The source for the manual control can be RC or MAVLink.
+
+::: warning
+The following method is not recommended, and will be removed in a future release.
+If using it you should migrate to using the AUX-based method.
+
+It is also possible to define a flaps channel directly on the RC using [RC_MAP_FLAPS](../advanced_config/parameter_reference.md#RC_MAP_FLAPS).
+This channel can also be used to control the spoilers by setting [FW_SPOILERS_MAN](../advanced_config/parameter_reference.md#FW_SPOILERS_MAN) to `Flaps channel`.
+This method is not possible when the source for the manual control is MAVLink.
+:::
+
 #### Actuator Roll, Pitch, and Yaw Scaling
 
 ::: info

docs/en/payloads/generic_actuator_control.md

@@ -36,20 +36,6 @@ For example, to control an actuator attached to AUX pin 3 (say) you would assign
 You could then use set the RC channel to control the `AUX3` output using `RC_MAP_AUX5`.
 
 
-### Flaps and Spoiler Control with Manual Control
-
-The preferred method to manually actuate spoilers and flaps is to map a manual control switch to an `AUX` output (see [Generic Actuator Control with RC](#generic-actuator-control-with-rc)), and then map that AUX output to the flap or spoiler function using [FW_FLAPS_MAN](../advanced_config/parameter_reference.md#FW_FLAPS_MAN) or [FW_SPOILERS_MAN](../advanced_config/parameter_reference.md#FW_SPOILERS_MAN).
-The source for the manual control can be RC or MAVLink.
-
-::: warning
-The following method is not recommended, and will be removed in a future release.
-If using it you should migrate to using the AUX-based method.
-
-It is also possible to define a flaps channel directly on the RC using [RC_MAP_FLAPS](../advanced_config/parameter_reference.md#RC_MAP_FLAPS).
-This channel can also be used to control the spoilers by setting [FW_SPOILERS_MAN](../advanced_config/parameter_reference.md#FW_SPOILERS_MAN) to `Flaps channel`.
-This method is not possible when the source for the manual control is MAVLink.
-:::
-
 ## Generic Actuator Control in Missions
 
 To use generic actuator control in a mission you must first [configure the outputs that you want to control using MAVLink](#generic-actuator-control-with-mavlink).