otcbot[bot]
commented
1 month ago I tried my best, but could not apply the patch as is, therefore I will report you what I could not apply.
BTW, if in the diff you see removed line equal to the added line it may be caused by invisible trailing spaces. This is safe to ignore.
In most cases content of the patch remainder need to be carefully analyzed and necessary changes applied manually.
Following is the patch remainder:
diff a/umn/source/index.rst b/umn/source/index.rst (rejected hunks)
@@ -14,7 +14,7 @@ Elastic Cloud Server - User Guide
eip/index
security/index
cbr/index
- passwords_and_key_pairs/index
+ passwords_and_key_pairs_management/index
permissions_management/index
resources_and_tags/index
monitoring/index
diff a/umn/source/change_history.rst b/umn/source/change_history.rst (rejected hunks)
@@ -32,10 +32,6 @@ Change History
| | |
| | :ref:`Searching for ECSs <en-us_topic_0000001630328828>` |
+-----------------------------------+------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
-| 2023-12-18 | Modified the following content: |
-| | |
-| | - Added G7v ECSs in :ref:`GPU-accelerated ECSs <en-us_topic_0097289624>`. |
-+-----------------------------------+------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
| 2023-12-15 | Modified the following content: |
| | |
| | - Added S7n ECSs in :ref:`General-Purpose ECSs <en-us_topic_0035470101>`. |
diff a/umn/source/security/security_groups/default_security_groups_and_rules.rst b/umn/source/security/security_groups/default_security_groups_and_rules.rst (rejected hunks)
@@ -2,8 +2,8 @@
.. _en-us_topic_0140323154:
-Default Security Group and Rules
-================================
+Default Security Groups and Rules
+=================================
Note the following when using default security group rules:
diff a/umn/source/security/security_groups/overview.rst b/umn/source/security/security_groups/overview.rst (rejected hunks)
@@ -21,7 +21,7 @@ Security Group Rules
After a security group is created, you can add rules to the security group. A rule applies either to inbound traffic (ingress) or outbound traffic (egress). After ECSs are added to the security group, they are protected by the rules of that group.
-Each security group has default rules. For details, see :ref:`Default Security Group and Rules <en-us_topic_0140323154>`. You can also customize security group rules. For details, see :ref:`Configuring Security Group Rules <en-us_topic_0030878383>`.
+Each security group has default rules. For details, see :ref:`Default Security Groups and Rules <en-us_topic_0140323154>`. You can also customize security group rules. For details, see :ref:`Configuring Security Group Rules <en-us_topic_0030878383>`.
Notes and Constraints
---------------------
This is an automatically created Pull Request for changes to elastic-cloud-server-api-ref to promote changes down the pipeline to Production environment.
The original change can be found under https://gitea.eco.tsi-dev.otc-service.com/docs/elastic-cloud-server/pulls/268.
There were patch conflicts, please review original patch file.