summaryrefslogtreecommitdiff
path: root/docs/appendix
diff options
context:
space:
mode:
authorChristian Poessinger <christian@poessinger.com>2020-09-11 22:49:23 +0200
committerGitHub <noreply@github.com>2020-09-11 22:49:23 +0200
commit5df2b6a3be0c07c44517592df2cef23f2659ea4a (patch)
treeccbdbbd6fb35807d25863c0efea11accbb68df57 /docs/appendix
parent1b71305b9be53b7d3c192c7bad63f5ff1e4d76d4 (diff)
parentec9e4722a78746be3a9efda23a7828f19a4e54d8 (diff)
downloadvyos-documentation-5df2b6a3be0c07c44517592df2cef23f2659ea4a.tar.gz
vyos-documentation-5df2b6a3be0c07c44517592df2cef23f2659ea4a.zip
Merge pull request #323 from currite/appendix-reindex
appendix: reindex to nest virtual environments
Diffstat (limited to 'docs/appendix')
-rw-r--r--docs/appendix/virtual/index.rst12
-rw-r--r--docs/appendix/virtual/libvirt.rst (renamed from docs/appendix/vyos-on-virtual-environments.rst)20
-rw-r--r--docs/appendix/virtual/vyos-on-gns3.rst (renamed from docs/appendix/vyos-on-gns3.rst)5
-rw-r--r--docs/appendix/virtual/vyos-on-vmware.rst (renamed from docs/appendix/vyos-on-vmware.rst)0
4 files changed, 19 insertions, 18 deletions
diff --git a/docs/appendix/virtual/index.rst b/docs/appendix/virtual/index.rst
new file mode 100644
index 00000000..7ede37b5
--- /dev/null
+++ b/docs/appendix/virtual/index.rst
@@ -0,0 +1,12 @@
+.. _virtual:
+
+Running on Virtual Environments
+===============================
+
+
+.. toctree::
+ :maxdepth: 2
+
+ libvirt
+ vyos-on-vmware
+ vyos-on-gns3
diff --git a/docs/appendix/vyos-on-virtual-environments.rst b/docs/appendix/virtual/libvirt.rst
index eed82390..0d624b94 100644
--- a/docs/appendix/vyos-on-virtual-environments.rst
+++ b/docs/appendix/virtual/libvirt.rst
@@ -1,12 +1,8 @@
-.. _vyos-on-virtual-environments:
+.. _libvirt:
-###############################
-Running in Virtual Environments
-###############################
-
-****************
-Libvirt Qemu/KVM
-****************
+***************************
+Running on Libvirt Qemu/KVM
+***************************
Libvirt is an open-source API, daemon and management tool for managing platform virtualization.
There are several ways to deploy VyOS on libvirt kvm. Use Virt-manager and native CLI.
@@ -161,12 +157,4 @@ Download predefined VyOS.qcow2 image for ``KVM``
.. figure:: /_static/images/virt-libvirt-qc-03.png
-*******
-Proxmox
-*******
-
-References
-==========
-
-https://www.proxmox.com/en/proxmox-ve
diff --git a/docs/appendix/vyos-on-gns3.rst b/docs/appendix/virtual/vyos-on-gns3.rst
index f17715b2..93ea9ae2 100644
--- a/docs/appendix/vyos-on-gns3.rst
+++ b/docs/appendix/virtual/vyos-on-gns3.rst
@@ -1,7 +1,8 @@
.. _vyos-on-gns3:
-VyOS on GNS3
-############
+###############
+Running on GNS3
+###############
Sometimes you may want to test VyOS in a lab environment.
`GNS3 <http://www.gns3.com>`__ is a network emulation software you
diff --git a/docs/appendix/vyos-on-vmware.rst b/docs/appendix/virtual/vyos-on-vmware.rst
index c4299cbf..c4299cbf 100644
--- a/docs/appendix/vyos-on-vmware.rst
+++ b/docs/appendix/virtual/vyos-on-vmware.rst