Merge remote-tracking branch 'origin/sagitta' into fix/docs-html-title-sagitta

# Conflicts:
#	docs/conf.py

1 files changed, 28 insertions, 25 deletions

diff --git a/docs/_include/interface-mirror.txt b/docs/_include/interface-mirror.txt
index 66d63248..3e2a7bed 100644
--- a/docs/_include/interface-mirror.txt
+++ b/docs/_include/interface-mirror.txt
@@ -10,28 +10,31 @@ VyOS uses the `mirror` option to configure port mirroring. The configuration
 is divided into 2 different directions. Destination ports should be configured
 for different traffic directions.
 
-.. cfgcmd:: set interfaces {{ var0 }} <interface> mirror
-   ingress <monitor-interface>
-
-   Configure port mirroring for `interface` inbound traffic and copy the
-   traffic to `monitor-interface`
-   
-   Example: Mirror the inbound traffic of `{{ var1 }}` port to `{{ var2 }}`
-   
-   .. code-block:: none
-   
-     set interfaces {{ var0 }} {{ var1 }} mirror ingress {{ var2 }} 
-
-.. cfgcmd:: set interfaces {{ var0 }} <interface> mirror egress
-   <monitor-interface>
-
-   Configure port mirroring for `interface` outbound traffic and copy the
-   traffic to `monitor-interface`
-   
-   Example: Mirror the outbound traffic of `{{ var1 }}` port to `{{ var2 }}`
-   
-   .. code-block:: none
-   
-     set interfaces {{ var0 }} {{ var1 }} mirror egress {{ var2 }} 
-
-   
+::::{cfgcmd} set interfaces {{ var0 }} \<interface\> mirror
+
+ingress <monitor-interface>
+
+Configure port mirroring for `interface` inbound traffic and copy the
+traffic to `monitor-interface`
+
+Example: Mirror the inbound traffic of `{{ var1 }}` port to `{{ var2 }}`
+
+```none
+
+```
+  set interfaces {{ var0 }} {{ var1 }} mirror ingress {{ var2 }}
+::::
+::::{cfgcmd} set interfaces {{ var0 }} \<interface\> mirror egress
+
+<monitor-interface>
+
+Configure port mirroring for `interface` outbound traffic and copy the
+traffic to `monitor-interface`
+
+Example: Mirror the outbound traffic of `{{ var1 }}` port to `{{ var2 }}`
+
+```none
+
+```
+  set interfaces {{ var0 }} {{ var1 }} mirror egress {{ var2 }}
+::::