From 840bd0b04fae3a0f43335e1b87fd99b30d0030fe Mon Sep 17 00:00:00 2001 From: a-stjohn Date: Wed, 3 Jun 2020 10:22:39 -0400 Subject: [PATCH 1/3] DOCS-579 Update network revert docs. (cherry picked from commit 6c1b07268168be004c3fb0600f5634f865d9de39) --- userguide/network.rst | 32 +++++++++++++++++--------------- 1 file changed, 17 insertions(+), 15 deletions(-) diff --git a/userguide/network.rst b/userguide/network.rst index e732db9e5..ffd2eda26 100644 --- a/userguide/network.rst +++ b/userguide/network.rst @@ -26,11 +26,23 @@ Each of these is described in more detail in this section. .. _webui_interface_warning: -.. warning:: Making changes to the network interface the |web-ui| uses - can result in losing connection to the %brand% system! Misconfiguring - network settings might require command line knowledge or physical - access to the %brand% system to fix. Be very careful when configuring - :ref:`Interfaces` and :ref:`Link Aggregations`. +.. note:: When any network changes are made an animated icon appears in the + upper-right |web-ui| panel to show there are pending network changes. + When the icon is clicked it prompts to review the recent network + changes. Reviewing the network changes goes to + :menuselection:`Network --> Interfaces` where the changes can be + permanently applied or discarded. + + When :guilabel:`APPLY CHANGES` is clicked the network changes are + temporarily applied for 60 seconds by default. This value can be + changed by entering a positive integer in the seconds field. This + feature is nice because if a network mistake is made that disrupts + connectivity, the settings will automatically revert preventing any + further issues. + + If the network settings applied work as intended, click + :guilabel:`KEEP CHANGES`. Otherwise, the changes can be discraded by + clicking :guilabel:`DISCARD CHANGES`. .. _Global Configuration: @@ -265,16 +277,6 @@ setting the IP addresses on multiple interfaces. Saving a new interface adds an entry to the list in :menuselection:`Network --> Interfaces`. -A new animated icon also appears in the upper-right |web-ui| panel to -show there are pending network changes. - -Network changes must be confirmed before being saved to the %brand% -system. A new section is added above the list to confirm the new -network settings. To temporarily apply the settings, click -:guilabel:`APPLY CHANGES`. Temporary settings revert automatically after -60 seconds or by clicking :guilabel:`DISCARD CHANGES`. To permanently -apply the new settings, click -:guilabel:`KEEP NETWORK CHANGES PERMANENTLY`. Expanding an entry in the list shows further details for that interface. From c3b740b14bae3a278b0e65e4623489ef0bdbf862 Mon Sep 17 00:00:00 2001 From: Aaron <32651598+a-stjohn@users.noreply.github.com> Date: Wed, 3 Jun 2020 10:24:26 -0400 Subject: [PATCH 2/3] (cherry picked from commit 5ee04ac2fd3b63aa0a878dfb51fc3db8073bff26) --- userguide/network.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/userguide/network.rst b/userguide/network.rst index ffd2eda26..ba440b9d6 100644 --- a/userguide/network.rst +++ b/userguide/network.rst @@ -41,7 +41,7 @@ Each of these is described in more detail in this section. further issues. If the network settings applied work as intended, click - :guilabel:`KEEP CHANGES`. Otherwise, the changes can be discraded by + :guilabel:`KEEP CHANGES`. Otherwise, the changes can be discarded by clicking :guilabel:`DISCARD CHANGES`. From 82e09a44c8446e909871e398b896773e4a5dd1b4 Mon Sep 17 00:00:00 2001 From: Aaron <32651598+a-stjohn@users.noreply.github.com> Date: Wed, 3 Jun 2020 10:55:04 -0400 Subject: [PATCH 3/3] Update userguide/network.rst Co-authored-by: Tim Moore (cherry picked from commit 63be461fb3021603c74ad1ef8ccadd4d12020360) --- userguide/network.rst | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/userguide/network.rst b/userguide/network.rst index ba440b9d6..6b22237af 100644 --- a/userguide/network.rst +++ b/userguide/network.rst @@ -36,9 +36,8 @@ Each of these is described in more detail in this section. When :guilabel:`APPLY CHANGES` is clicked the network changes are temporarily applied for 60 seconds by default. This value can be changed by entering a positive integer in the seconds field. This - feature is nice because if a network mistake is made that disrupts - connectivity, the settings will automatically revert preventing any - further issues. + feature is nice because the network settings preview can automatically + roll back any configuration errors that are accidentally saved. If the network settings applied work as intended, click :guilabel:`KEEP CHANGES`. Otherwise, the changes can be discarded by