Cleaned up issues with multiple components ? button (#6555)

* Cleaned up issues with multiple components ? button Signed-off-by: John Jones-Steele <82226755+jjjoness@users.noreply.github.com> * Commit for merge Signed-off-by: John Jones-Steele <82226755+jjjoness@users.noreply.github.com> * Commit before merge Signed-off-by: John Jones-Steele <82226755+jjjoness@users.noreply.github.com> * WIP Signed-off-by: John Jones-Steele <82226755+jjjoness@users.noreply.github.com> * Before merge from development Signed-off-by: John Jones-Steele <82226755+jjjoness@users.noreply.github.com> * Updated all HelpURL Signed-off-by: John Jones-Steele <82226755+jjjoness@users.noreply.github.com> * Changes from PR Signed-off-by: John Jones-Steele <82226755+jjjoness@users.noreply.github.com> * Changes from PR Signed-off-by: John Jones-Steele <82226755+jjjoness@users.noreply.github.com>
4 years ago · e57b854fca
parent c9432dc5e0
commit e57b854fca
31 changed files with 25 additions and 32 deletions
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/ToolsComponents/TransformComponent.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/ToolsComponents/TransformComponent.cpp
@ -1202,6 +1202,7 @@ namespace AzToolsFramework
                            Attribute(AZ::Edit::Attributes::FixedComponentListIndex, 0)->
                            Attribute(AZ::Edit::Attributes::Icon, "Icons/Components/Transform.svg")->
                            Attribute(AZ::Edit::Attributes::ViewportIcon, "Icons/Components/Viewport/Transform.svg")->
+                            Attribute(AZ::Edit::Attributes::HelpPageURL, "https://o3de.org/docs/user-guide/components/reference/transform/")->
                            Attribute(AZ::Edit::Attributes::AutoExpand, true)->
                        DataElement(AZ::Edit::UIHandlers::Default, &TransformComponent::m_parentEntityId, "Parent entity", "")->
                            Attribute(AZ::Edit::Attributes::ChangeValidate, &TransformComponent::ValidatePotentialParent)->
--- a/Gems/AtomLyIntegration/AtomBridge/Code/Source/FlyCameraInputComponent.cpp
+++ b/Gems/AtomLyIntegration/AtomBridge/Code/Source/FlyCameraInputComponent.cpp
@ -102,6 +102,7 @@ void FlyCameraInputComponent::Reflect(AZ::ReflectContext* reflection)
                ->Attribute("Category", "Gameplay")
                ->Attribute("Icon", "Icons/Components/FlyCameraInput.svg")
                ->Attribute("ViewportIcon", "Icons/Components/Viewport/FlyCameraInput.svg")
+                ->Attribute(AZ::Edit::Attributes::HelpPageURL, "https://o3de.org/docs/user-guide/components/reference/gameplay/fly-camera-input/")
                ->Attribute("AutoExpand", true)
                ->Attribute("AppearsInAddComponentMenu", AZ_CRC("Game", 0x232b318c))
                ->DataElement(0, &FlyCameraInputComponent::m_moveSpeed, "Move Speed", "Speed at which the camera moves")
--- a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/PostProcess/ColorGrading/EditorHDRColorGradingComponent.cpp
+++ b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/PostProcess/ColorGrading/EditorHDRColorGradingComponent.cpp
@ -40,7 +40,6 @@ namespace AZ
                        ->Attribute(AZ::Edit::Attributes::ViewportIcon, "Icons/Components/Viewport/Component_Placeholder.svg") // [GFX TODO ATOM-2672][PostFX] need to create icons for PostProcessing.
                        ->Attribute(Edit::Attributes::AppearsInAddComponentMenu, AZ_CRC_CE("Game"))
                        ->Attribute(Edit::Attributes::AutoExpand, true)
-                        ->Attribute(Edit::Attributes::HelpPageURL, "https://") // [TODO ATOM-2672][PostFX] need to create page for PostProcessing.
                        ->ClassElement(AZ::Edit::ClassElements::Group, "LUT Generation")
                        ->Attribute(AZ::Edit::Attributes::AutoExpand, true)
                        ->UIElement(AZ::Edit::UIHandlers::Button, "Generate LUT", "Generates a LUT from the scene's enabled color grading blend.")
--- a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/PostProcess/RadiusWeightModifier/EditorRadiusWeightModifierComponent.cpp
+++ b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/PostProcess/RadiusWeightModifier/EditorRadiusWeightModifierComponent.cpp
@ -32,7 +32,7 @@ namespace AZ
                        ->Attribute(AZ::Edit::Attributes::ViewportIcon, "Icons/Components/Viewport/Component_Placeholder.svg")
                        ->Attribute(Edit::Attributes::AppearsInAddComponentMenu, AZ_CRC("Game", 0x232b318c))
                        ->Attribute(Edit::Attributes::AutoExpand, true)
-                        ->Attribute(Edit::Attributes::HelpPageURL, "https://o3de.org/docs/user-guide/components/reference/atom/radius-weight-modifier/")
+                        ->Attribute(Edit::Attributes::HelpPageURL, "https://o3de.org/docs/user-guide/components/reference/atom/postfx-radius-weight-modifier/")
                        ;

                    editContext->Class<RadiusWeightModifierComponentController>("RadiusWeightModifierComponentController", "")
--- a/Gems/AtomTressFX/Code/Components/EditorHairComponent.cpp
+++ b/Gems/AtomTressFX/Code/Components/EditorHairComponent.cpp
@ -37,7 +37,6 @@ namespace AZ
                                ->Attribute(AZ::Edit::Attributes::ViewportIcon, "editor/icons/components/viewport/component_placeholder.png")
                                ->Attribute(Edit::Attributes::AppearsInAddComponentMenu, AZ_CRC("Game", 0x232b318c))
                                ->Attribute(Edit::Attributes::AutoExpand, true)
-                                ->Attribute(Edit::Attributes::HelpPageURL, "https://o3de.org/docs/user-guide/gems/reference/rendering/amd/atom-tressfx/")
                            ;
                        
                        editContext->Class<HairComponentController>(
--- a/Gems/Blast/Code/Source/Editor/EditorBlastFamilyComponent.cpp
+++ b/Gems/Blast/Code/Source/Editor/EditorBlastFamilyComponent.cpp
@ -37,9 +37,6 @@ namespace Blast
                    ->Attribute(AZ::Edit::Attributes::Icon, "Icons/Components/Box.png")
                    ->Attribute(AZ::Edit::Attributes::ViewportIcon, "Icons/Components/Viewport/Box.png")
                    ->Attribute(AZ::Edit::Attributes::AppearsInAddComponentMenu, AZ_CRC("Game", 0x232b318c))
-                    ->Attribute(
-                        AZ::Edit::Attributes::HelpPageURL,
-                        "https://o3de.org/docs/user-guide/components/reference/destruction/blast-family/")
                    ->Attribute(AZ::Edit::Attributes::AutoExpand, true)
                    ->DataElement(
                        AZ::Edit::UIHandlers::Default, &EditorBlastFamilyComponent::m_blastAsset, "Blast asset",
--- a/Gems/Blast/Code/Source/Editor/EditorBlastMeshDataComponent.cpp
+++ b/Gems/Blast/Code/Source/Editor/EditorBlastMeshDataComponent.cpp
@ -60,9 +60,6 @@ namespace Blast
                    ->Attribute(AZ::Edit::Attributes::Icon, "Icons/Components/Box.png")
                    ->Attribute(AZ::Edit::Attributes::ViewportIcon, "Icons/Components/Viewport/Box.png")
                    ->Attribute(AZ::Edit::Attributes::AppearsInAddComponentMenu, AZ_CRC("Game", 0x232b318c))
-                    ->Attribute(
-                        AZ::Edit::Attributes::HelpPageURL,
-                        "https://o3de.org/docs/user-guide/components/reference/destruction/blast-family-mesh-data/")
                    ->Attribute(AZ::Edit::Attributes::AutoExpand, true)
                    ->DataElement(
                        AZ::Edit::UIHandlers::CheckBox, &EditorBlastMeshDataComponent::m_showMeshAssets,
--- a/Gems/FastNoise/Code/Source/EditorFastNoiseGradientComponent.h
+++ b/Gems/FastNoise/Code/Source/EditorFastNoiseGradientComponent.h
@ -28,7 +28,7 @@ namespace FastNoiseGem
        static constexpr const char* const s_componentDescription = "Generates gradient values using FastNoise a noise generation library with a collection of realtime noise algorithms";
        static constexpr const char* const s_icon = "Editor/Icons/Components/Gradient.svg";
        static constexpr const char* const s_viewportIcon = "Editor/Icons/Components/Viewport/Gradient.svg";
-        static constexpr const char* const s_helpUrl = "https://o3de.org/docs/user-guide/components/";
+        static constexpr const char* const s_helpUrl = "";

    private:
        AZ::Crc32 OnGenerateRandomSeed();
--- a/Gems/GradientSignal/Code/Source/Editor/EditorConstantGradientComponent.h
+++ b/Gems/GradientSignal/Code/Source/Editor/EditorConstantGradientComponent.h
@ -26,6 +26,6 @@ namespace GradientSignal
        static constexpr const char* const s_componentDescription = "Returns a specified value as a gradient when sampled";
        static constexpr const char* const s_icon = "Editor/Icons/Components/Gradient.svg";
        static constexpr const char* const s_viewportIcon = "Editor/Icons/Components/Viewport/Gradient.svg";
-        static constexpr const char* const s_helpUrl = "https://o3de.org/docs/user-guide/components/";
+        static constexpr const char* const s_helpUrl = "";
    };
 }
--- a/Gems/GradientSignal/Code/Source/Editor/EditorDitherGradientComponent.h
+++ b/Gems/GradientSignal/Code/Source/Editor/EditorDitherGradientComponent.h
@ -26,7 +26,7 @@ namespace GradientSignal
        static constexpr const char* const s_componentDescription = "Applies ordered dithering to the input gradient";
        static constexpr const char* const s_icon = "Editor/Icons/Components/GradientModifier.svg";
        static constexpr const char* const s_viewportIcon = "Editor/Icons/Components/Viewport/GradientModifier.svg";
-        static constexpr const char* const s_helpUrl = "https://o3de.org/docs/user-guide/components/";
+        static constexpr const char* const s_helpUrl = "https://o3de.org/docs/user-guide/components/reference/gradient-modifiers/dither-gradient-modifier/";

    protected:
        AZ::u32 ConfigurationChanged() override;
--- a/Gems/GradientSignal/Code/Source/Editor/EditorGradientSurfaceDataComponent.h
+++ b/Gems/GradientSignal/Code/Source/Editor/EditorGradientSurfaceDataComponent.h
@ -33,7 +33,7 @@ namespace GradientSignal
        static constexpr const char* const s_componentDescription = "Enables a gradient to emit surface tags";
        static constexpr const char* const s_icon = "Editor/Icons/Components/SurfaceData.svg";
        static constexpr const char* const s_viewportIcon = "Editor/Icons/Components/Viewport/SurfaceData.png";
-        static constexpr const char* const s_helpUrl = "https://o3de.org/docs/user-guide/components/";
+        static constexpr const char* const s_helpUrl = "https://o3de.org/docs/user-guide/components/reference/";
        
    private:
        AZ::u32 ConfigurationChanged() override;
--- a/Gems/GradientSignal/Code/Source/Editor/EditorGradientTransformComponent.h
+++ b/Gems/GradientSignal/Code/Source/Editor/EditorGradientTransformComponent.h
@ -35,7 +35,7 @@ namespace GradientSignal
        static constexpr const char* const s_componentDescription = "Transforms coordinates into a space relative to a shape, allowing other transform and sampling modifications";
        static constexpr const char* const s_icon = "Editor/Icons/Components/GradientModifier.svg";
        static constexpr const char* const s_viewportIcon = "Editor/Icons/Components/Viewport/GradientModifier.svg";
-        static constexpr const char* const s_helpUrl = "https://o3de.org/docs/user-guide/components/";
+        static constexpr const char* const s_helpUrl = "https://o3de.org/docs/user-guide/components/reference/gradient-modifiers/gradient-transform-modifier/";

    private:
        AZ::u32 ConfigurationChanged() override;
--- a/Gems/GradientSignal/Code/Source/Editor/EditorImageGradientComponent.h
+++ b/Gems/GradientSignal/Code/Source/Editor/EditorImageGradientComponent.h
@ -26,6 +26,6 @@ namespace GradientSignal
        static constexpr const char* const s_componentDescription = "Generates a gradient by sampling an image asset";
        static constexpr const char* const s_icon = "Editor/Icons/Components/Gradient.svg";
        static constexpr const char* const s_viewportIcon = "Editor/Icons/Components/Viewport/Gradient.svg";
-        static constexpr const char* const s_helpUrl = "https://o3de.org/docs/user-guide/components/";
+        static constexpr const char* const s_helpUrl = "";
    };
 }
--- a/Gems/GradientSignal/Code/Source/Editor/EditorInvertGradientComponent.h
+++ b/Gems/GradientSignal/Code/Source/Editor/EditorInvertGradientComponent.h
@ -26,6 +26,6 @@ namespace GradientSignal
        static constexpr const char* const s_componentDescription = "Inverts a gradient's values";
        static constexpr const char* const s_icon = "Editor/Icons/Components/GradientModifier.svg";
        static constexpr const char* const s_viewportIcon = "Editor/Icons/Components/Viewport/GradientModifier.svg";
-        static constexpr const char* const s_helpUrl = "https://o3de.org/docs/user-guide/components/";
+        static constexpr const char* const s_helpUrl = "https://o3de.org/docs/user-guide/components/reference/gradient-modifiers/invert-gradient-modifier/";
    };
 }
--- a/Gems/GradientSignal/Code/Source/Editor/EditorLevelsGradientComponent.h
+++ b/Gems/GradientSignal/Code/Source/Editor/EditorLevelsGradientComponent.h
@ -26,6 +26,6 @@ namespace GradientSignal
        static constexpr const char* const s_componentDescription = "Modifies an input gradient's signal using low/mid/high points and allows clamping of min/max output values";
        static constexpr const char* const s_icon = "Editor/Icons/Components/GradientModifier.svg";
        static constexpr const char* const s_viewportIcon = "Editor/Icons/Components/Viewport/GradientModifier.svg";
-        static constexpr const char* const s_helpUrl = "https://o3de.org/docs/user-guide/components/";
+        static constexpr const char* const s_helpUrl = "https://o3de.org/docs/user-guide/components/reference/gradient-modifiers/levels-gradient-modifier/";
    };
 }
--- a/Gems/GradientSignal/Code/Source/Editor/EditorMixedGradientComponent.h
+++ b/Gems/GradientSignal/Code/Source/Editor/EditorMixedGradientComponent.h
@ -58,7 +58,7 @@ namespace GradientSignal
        static constexpr const char* const s_componentDescription = "Generates a new gradient by combining other gradients";
        static constexpr const char* const s_icon = "Editor/Icons/Components/GradientModifier.svg";
        static constexpr const char* const s_viewportIcon = "Editor/Icons/Components/Viewport/GradientModifier.svg";
-        static constexpr const char* const s_helpUrl = "https://o3de.org/docs/user-guide/components/";
+        static constexpr const char* const s_helpUrl = "https://o3de.org/docs/user-guide/components/reference/gradient-modifiers/gradient-mixer/";

    protected:

--- a/Gems/GradientSignal/Code/Source/Editor/EditorPerlinGradientComponent.h
+++ b/Gems/GradientSignal/Code/Source/Editor/EditorPerlinGradientComponent.h
@ -27,7 +27,7 @@ namespace GradientSignal
        static constexpr const char* const s_componentDescription = "Generates a gradient by sampling a perlin noise generator";
        static constexpr const char* const s_icon = "Editor/Icons/Components/Gradient.svg";
        static constexpr const char* const s_viewportIcon = "Editor/Icons/Components/Viewport/Gradient.svg";
-        static constexpr const char* const s_helpUrl = "https://o3de.org/docs/user-guide/components/";
+        static constexpr const char* const s_helpUrl = "";

    private:
        AZ::Crc32 OnGenerateRandomSeed();
--- a/Gems/GradientSignal/Code/Source/Editor/EditorPosterizeGradientComponent.h
+++ b/Gems/GradientSignal/Code/Source/Editor/EditorPosterizeGradientComponent.h
@ -26,6 +26,6 @@ namespace GradientSignal
        static constexpr const char* const s_componentDescription = "Divides an input gradient's signal into a specified number of bands";
        static constexpr const char* const s_icon = "Editor/Icons/Components/GradientModifier.svg";
        static constexpr const char* const s_viewportIcon = "Editor/Icons/Components/Viewport/GradientModifier.svg";
-        static constexpr const char* const s_helpUrl = "https://o3de.org/docs/user-guide/components/";
+        static constexpr const char* const s_helpUrl = "https://o3de.org/docs/user-guide/components/reference/gradient-modifiers/posterize-gradient-modifier/";
    };
 }
--- a/Gems/GradientSignal/Code/Source/Editor/EditorRandomGradientComponent.h
+++ b/Gems/GradientSignal/Code/Source/Editor/EditorRandomGradientComponent.h
@ -29,7 +29,7 @@ namespace GradientSignal
        static constexpr const char* const s_componentDescription = "Generates a gradient by sampling a random noise generator";
        static constexpr const char* const s_icon = "Editor/Icons/Components/Gradient.svg";
        static constexpr const char* const s_viewportIcon = "Editor/Icons/Components/Viewport/Gradient.svg";
-        static constexpr const char* const s_helpUrl = "https://o3de.org/docs/user-guide/components/";
+        static constexpr const char* const s_helpUrl = "";

    private:
        AZ::Crc32 OnGenerateRandomSeed();
--- a/Gems/GradientSignal/Code/Source/Editor/EditorReferenceGradientComponent.h
+++ b/Gems/GradientSignal/Code/Source/Editor/EditorReferenceGradientComponent.h
@ -26,6 +26,6 @@ namespace GradientSignal
        static constexpr const char* const s_componentDescription = "References another gradient";
        static constexpr const char* const s_icon = "Editor/Icons/Components/Gradient.svg";
        static constexpr const char* const s_viewportIcon = "Editor/Icons/Components/Viewport/Gradient.svg";
-        static constexpr const char* const s_helpUrl = "https://o3de.org/docs/user-guide/components/";
+        static constexpr const char* const s_helpUrl = "";
    };
 }
--- a/Gems/GradientSignal/Code/Source/Editor/EditorShapeAreaFalloffGradientComponent.h
+++ b/Gems/GradientSignal/Code/Source/Editor/EditorShapeAreaFalloffGradientComponent.h
@ -26,6 +26,6 @@ namespace GradientSignal
        static constexpr const char* const s_componentDescription = "Generates a gradient based on distance from a shape";
        static constexpr const char* const s_icon = "Editor/Icons/Components/Gradient.svg";
        static constexpr const char* const s_viewportIcon = "Editor/Icons/Components/Viewport/Gradient.svg";
-        static constexpr const char* const s_helpUrl = "https://o3de.org/docs/user-guide/components/";
+        static constexpr const char* const s_helpUrl = "";
    };
 }
--- a/Gems/GradientSignal/Code/Source/Editor/EditorSmoothStepGradientComponent.h
+++ b/Gems/GradientSignal/Code/Source/Editor/EditorSmoothStepGradientComponent.h
@ -26,6 +26,6 @@ namespace GradientSignal
        static constexpr const char* const s_componentDescription = "Generates a gradient with fall off, which creates a smoother input gradient";
        static constexpr const char* const s_icon = "Editor/Icons/Components/GradientModifier.svg";
        static constexpr const char* const s_viewportIcon = "Editor/Icons/Components/Viewport/GradientModifier.svg";
-        static constexpr const char* const s_helpUrl = "https://o3de.org/docs/user-guide/components/";
+        static constexpr const char* const s_helpUrl = "https://o3de.org/docs/user-guide/components/reference/gradient-modifiers/smooth-step-gradient-modifier/";
    };
 }
--- a/Gems/GradientSignal/Code/Source/Editor/EditorSurfaceAltitudeGradientComponent.h
+++ b/Gems/GradientSignal/Code/Source/Editor/EditorSurfaceAltitudeGradientComponent.h
@ -26,7 +26,7 @@ namespace GradientSignal
        static constexpr const char* const s_componentDescription = "Generates a gradient based on height within a range";
        static constexpr const char* const s_icon = "Editor/Icons/Components/Gradient.svg";
        static constexpr const char* const s_viewportIcon = "Editor/Icons/Components/Viewport/Gradient.svg";
-        static constexpr const char* const s_helpUrl = "https://o3de.org/docs/user-guide/components/";
+        static constexpr const char* const s_helpUrl = "";

        // AZ::Component interface
        void Activate() override;
--- a/Gems/GradientSignal/Code/Source/Editor/EditorSurfaceMaskGradientComponent.h
+++ b/Gems/GradientSignal/Code/Source/Editor/EditorSurfaceMaskGradientComponent.h
@ -26,6 +26,6 @@ namespace GradientSignal
        static constexpr const char* const s_componentDescription = "Generates a gradient based on underlying surface types";
        static constexpr const char* const s_icon = "Editor/Icons/Components/Gradient.svg";
        static constexpr const char* const s_viewportIcon = "Editor/Icons/Components/Viewport/Gradient.svg";
-        static constexpr const char* const s_helpUrl = "https://o3de.org/docs/user-guide/components/";
+        static constexpr const char* const s_helpUrl = "";
    };
 }
--- a/Gems/GradientSignal/Code/Source/Editor/EditorSurfaceSlopeGradientComponent.h
+++ b/Gems/GradientSignal/Code/Source/Editor/EditorSurfaceSlopeGradientComponent.h
@ -26,6 +26,6 @@ namespace GradientSignal
        static constexpr const char* const s_componentDescription = "Generates a gradient based on surface angle";
        static constexpr const char* const s_icon = "Editor/Icons/Components/Gradient.svg";
        static constexpr const char* const s_viewportIcon = "Editor/Icons/Components/Viewport/Gradient.svg";
-        static constexpr const char* const s_helpUrl = "https://o3de.org/docs/user-guide/components/";
+        static constexpr const char* const s_helpUrl = "";
    };
 }
--- a/Gems/GradientSignal/Code/Source/Editor/EditorThresholdGradientComponent.h
+++ b/Gems/GradientSignal/Code/Source/Editor/EditorThresholdGradientComponent.h
@ -26,6 +26,6 @@ namespace GradientSignal
        static constexpr const char* const s_componentDescription = "Converts input gradient to be 0 if below the threshold or 1 if above the threshold";
        static constexpr const char* const s_icon = "Editor/Icons/Components/GradientModifier.svg";
        static constexpr const char* const s_viewportIcon = "Editor/Icons/Components/Viewport/GradientModifier.svg";
-        static constexpr const char* const s_helpUrl = "https://o3de.org/docs/user-guide/components/";
+        static constexpr const char* const s_helpUrl = "https://o3de.org/docs/user-guide/components/reference/gradient-modifiers/threshold-gradient-modifier/";
    };
 }
--- a/Gems/LmbrCentral/Code/Source/Scripting/EditorLookAtComponent.cpp
+++ b/Gems/LmbrCentral/Code/Source/Scripting/EditorLookAtComponent.cpp
@ -33,6 +33,7 @@ namespace LmbrCentral
                        ->Attribute(AZ::Edit::Attributes::Category, "Gameplay")
                        ->Attribute(AZ::Edit::Attributes::Icon, "Icons/Components/LookAt.svg")
                        ->Attribute(AZ::Edit::Attributes::ViewportIcon, "Icons/Components/Viewport/LookAt.svg")
+                        ->Attribute(AZ::Edit::Attributes::HelpPageURL, "https://o3de.org/docs/user-guide/components/reference/gameplay/look-at/")
                        ->Attribute(AZ::Edit::Attributes::AutoExpand, true)
                        ->Attribute(AZ::Edit::Attributes::AppearsInAddComponentMenu, AZ_CRC("Game", 0x232b318c))

--- a/Gems/LmbrCentral/Code/Source/Scripting/EditorRandomTimedSpawnerComponent.cpp
+++ b/Gems/LmbrCentral/Code/Source/Scripting/EditorRandomTimedSpawnerComponent.cpp
@ -59,7 +59,6 @@ namespace LmbrCentral
                    ->Attribute(AZ::Edit::Attributes::ViewportIcon, "Icons/Components/Viewport/RandomTimedSpawner.svg")
                    ->Attribute(AZ::Edit::Attributes::AutoExpand, true)
                    ->Attribute(AZ::Edit::Attributes::AppearsInAddComponentMenu, AZ_CRC("Game", 0x232b318c))
-                    ->Attribute(AZ::Edit::Attributes::HelpPageURL, "http://docs.aws.amazon.com/console/lumberyard/userguide/random-timed-spawner-component")
                    ->DataElement(AZ::Edit::UIHandlers::Default, &EditorRandomTimedSpawnerComponent::m_config, "m_config", "No Description")
                    ->Attribute(AZ::Edit::Attributes::AutoExpand, true)
                    ->Attribute(AZ::Edit::Attributes::Visibility, AZ::Edit::PropertyVisibility::ShowChildrenOnly)
--- a/Gems/LmbrCentral/Code/Source/Scripting/EditorSpawnerComponent.cpp
+++ b/Gems/LmbrCentral/Code/Source/Scripting/EditorSpawnerComponent.cpp
@ -41,7 +41,6 @@ namespace LmbrCentral
                    ->Attribute(AZ::Edit::Attributes::ViewportIcon, "Icons/Components/Viewport/Spawner.svg")
                    ->Attribute(AZ::Edit::Attributes::AppearsInAddComponentMenu, AZ_CRC("Game", 0x232b318c))
                    ->Attribute(AZ::Edit::Attributes::AutoExpand, true)
-                    ->Attribute(AZ::Edit::Attributes::HelpPageURL, "https://o3de.org/docs/user-guide/components/reference/spawner/")
                    ->DataElement(0, &EditorSpawnerComponent::m_sliceAsset, "Dynamic slice", "The slice to spawn")
                        ->Attribute(AZ::Edit::Attributes::ChangeNotify, &EditorSpawnerComponent::SliceAssetChanged)
                    ->DataElement(0, &EditorSpawnerComponent::m_spawnOnActivate, "Spawn on activate", "Should the component spawn the selected slice upon activation?")
--- a/Gems/LyShine/Code/Source/World/UiCanvasAssetRefComponent.cpp
+++ b/Gems/LyShine/Code/Source/World/UiCanvasAssetRefComponent.cpp
@ -170,7 +170,7 @@ void UiCanvasAssetRefComponent::Reflect(AZ::ReflectContext* context)
                ->Attribute(AZ::Edit::Attributes::Category, "UI")
                ->Attribute(AZ::Edit::Attributes::Icon, "Icons/Components/UiCanvasAssetRef.svg")
                ->Attribute(AZ::Edit::Attributes::ViewportIcon, "Icons/Components/Viewport/UiCanvasAssetRef.svg")
-                ->Attribute(AZ::Edit::Attributes::HelpPageURL, "https://o3de.org/docs/user-guide/components/reference/ui-canvas-asset-ref/")
+                ->Attribute(AZ::Edit::Attributes::HelpPageURL, "https://o3de.org/docs/user-guide/components/reference/ui/canvas-asset-ref/")
                ->Attribute(AZ::Edit::Attributes::AppearsInAddComponentMenu, AZ_CRC("Game", 0x232b318c));

            editInfo->DataElement("SimpleAssetRef", &UiCanvasAssetRefComponent::m_canvasAssetRef,
--- a/Gems/LyShine/Code/Source/World/UiCanvasProxyRefComponent.cpp
+++ b/Gems/LyShine/Code/Source/World/UiCanvasProxyRefComponent.cpp
@ -72,7 +72,7 @@ void UiCanvasProxyRefComponent::Reflect(AZ::ReflectContext* context)
                ->Attribute(AZ::Edit::Attributes::Category, "UI")
                ->Attribute(AZ::Edit::Attributes::Icon, "Icons/Components/UiCanvasProxyRef.svg")
                ->Attribute(AZ::Edit::Attributes::ViewportIcon, "Icons/Components/Viewport/UiCanvasProxyRef.svg")
-                ->Attribute(AZ::Edit::Attributes::HelpPageURL, "https://o3de.org/docs/user-guide/components/reference/ui-canvas-proxy-ref/")
+                ->Attribute(AZ::Edit::Attributes::HelpPageURL, "https://o3de.org/docs/user-guide/components/reference/ui/canvas-proxy-ref/")
                ->Attribute(AZ::Edit::Attributes::AppearsInAddComponentMenu, AZ_CRC("Game", 0x232b318c));

            editInfo->DataElement(0, &UiCanvasProxyRefComponent::m_canvasAssetRefEntityId,