summaryrefslogtreecommitdiff
path: root/docs/appendix
diff options
context:
space:
mode:
authorDaniil Baturin <daniil@baturin.org>2020-01-12 11:46:37 +0700
committerGitHub <noreply@github.com>2020-01-12 11:46:37 +0700
commitbea7c7318f0f7d2d6e11ee1d4db840fa7f88941a (patch)
treeea06c94dca1c8693053dd9d481638b92a084fe6b /docs/appendix
parent689756182ba1e16df51315407cdc749e6136e0cc (diff)
parent74c5a1fc3cf31ba5d6d3d5fe603768369f1a3e34 (diff)
downloadvyos-documentation-bea7c7318f0f7d2d6e11ee1d4db840fa7f88941a.tar.gz
vyos-documentation-bea7c7318f0f7d2d6e11ee1d4db840fa7f88941a.zip
Merge pull request #183 from StephenOrJames/master
Fix some typos and capitalizations
Diffstat (limited to 'docs/appendix')
-rw-r--r--docs/appendix/migrate-from-vyatta.rst4
-rw-r--r--docs/appendix/vyos-on-baremetal.rst6
-rw-r--r--docs/appendix/vyos-on-vmware.rst4
3 files changed, 7 insertions, 7 deletions
diff --git a/docs/appendix/migrate-from-vyatta.rst b/docs/appendix/migrate-from-vyatta.rst
index 051d7cef..f15c3d5a 100644
--- a/docs/appendix/migrate-from-vyatta.rst
+++ b/docs/appendix/migrate-from-vyatta.rst
@@ -7,8 +7,8 @@ VyOS 1.x line aims to preserve backward compatibility and provide a safe
upgrade path for existing Vyatta Core users. You may think of VyOS 1.0.0 as
VC7.0.
-Vyatta release compatiblity
----------------------------
+Vyatta release compatibility
+----------------------------
Vyatta Core releases from 6.5 to 6.6 should be 100% compatible.
diff --git a/docs/appendix/vyos-on-baremetal.rst b/docs/appendix/vyos-on-baremetal.rst
index 5f20a03f..36c58317 100644
--- a/docs/appendix/vyos-on-baremetal.rst
+++ b/docs/appendix/vyos-on-baremetal.rst
@@ -22,7 +22,7 @@ Shopping Cart
Optional (10GE)
---------------
-If you wan't to get additional ethernet ports or even 10GE connectivity
+If you want to get additional ethernet ports or even 10GE connectivity
the following optional parts will be required:
* 1x Supermicro RSC-RR1U-E8 (Riser Card)
@@ -98,7 +98,7 @@ Shopping Cart
* 1x VARIA Group Item 326745 19" dual rack for APU4
* 1x Compex WLE900VX (Optional mini PCIe WiFi module)
-The 19" enclosure can accomodate up to two APU4 boards - there is a single and
+The 19" enclosure can accommodate up to two APU4 boards - there is a single and
dual front cover.
.. note:: Compex WLE900VX is only supported in mPCIe slot 1.
@@ -252,7 +252,7 @@ Qotom Q355G4
The install on this Q355G4 box is pretty much plug and play. The port numbering
the OS does might differ from the labels on the outside, but the UEFI firmware
-has a port blink test built in with MAC adresses so you can very quickly
+has a port blink test built in with MAC addresses so you can very quickly
identify which is which. MAC labels are on the inside as well, and this test
can be done from VyOS or plain Linux too. Default settings in the UEFI will
make it boot, but depending on your installation wishes (i.e. storage type,
diff --git a/docs/appendix/vyos-on-vmware.rst b/docs/appendix/vyos-on-vmware.rst
index 6feb95ba..c4299cbf 100644
--- a/docs/appendix/vyos-on-vmware.rst
+++ b/docs/appendix/vyos-on-vmware.rst
@@ -1,6 +1,6 @@
.. _vyosonvmware:
-Running on VMWare ESXi
+Running on VMware ESXi
######################
ESXi 5.5 or later
@@ -14,7 +14,7 @@ using the normal process around `install image`.
Memory Contention Considerations
--------------------------------
When the underlying ESXi host is approaching ~92% memory utilisation it will start the balloon process in s a 'soft' state to start reclaiming memory from guest operating systems.
-This causes an artifical pressure using the vmmemctl driver on memory usage on the virtual guest. As VyOS by default does not have a swap file, this vmmemctl pressure is unable to
+This causes an artificial pressure using the vmmemctl driver on memory usage on the virtual guest. As VyOS by default does not have a swap file, this vmmemctl pressure is unable to
force processes to move in memory data to the paging file, and blindly consumes memory forcing the virtual guest into a low memory state with no way to escape. The balloon can expand to 65% of
guest allocated memory, so a VyOS guest running >35% of memory usage, can encounter an out of memory situation, and trigger the kernel oom_kill process. At this point a weighted
lottery favouring memory hungry processes will be run with the unlucky winner being terminated by the kernel.