summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorcurrite <sll@disroot.org>2020-09-10 02:33:21 +0200
committercurrite <sll@disroot.org>2020-09-10 02:33:21 +0200
commitec9e4722a78746be3a9efda23a7828f19a4e54d8 (patch)
treefaf6f6ac465a90f50804bac016b1d27a3ccb45f4
parentbd97c95a585cf02e88967be3f1d2703f6f21e428 (diff)
downloadvyos-documentation-ec9e4722a78746be3a9efda23a7828f19a4e54d8.tar.gz
vyos-documentation-ec9e4722a78746be3a9efda23a7828f19a4e54d8.zip
appendix: reindex to nest virtual environments
-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
-rw-r--r--docs/index.rst4
-rw-r--r--docs/information.rst2
6 files changed, 21 insertions, 22 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
diff --git a/docs/index.rst b/docs/index.rst
index bab4f930..ab9d3f66 100644
--- a/docs/index.rst
+++ b/docs/index.rst
@@ -65,14 +65,12 @@ VyOS User Guide
appendix/release-notes
appendix/examples/index
- appendix/vyos-on-vmware
appendix/vyos-on-baremetal
+ appendix/virtual/index
appendix/vyos-on-clouds
- appendix/vyos-on-virtual-environments
appendix/migrate-from-vyatta
appendix/command-scripting
appendix/http-api
- appendix/vyos-on-gns3
.. toctree::
diff --git a/docs/information.rst b/docs/information.rst
index 5565163e..02d6f1ec 100644
--- a/docs/information.rst
+++ b/docs/information.rst
@@ -5,7 +5,7 @@ Information
***********
VyOS features a rich set of operational level commands to retrieve arbitrary
-infomration about your running system.
+information about your running system.
########
Hardware