diff --git a/docs/User-Guide_Armbian-Config/System.md b/docs/User-Guide_Armbian-Config/System.md
index 4f752f26..af9291f4 100644
--- a/docs/User-Guide_Armbian-Config/System.md
+++ b/docs/User-Guide_Armbian-Config/System.md
@@ -182,7 +182,7 @@ armbian-config --cmd SY008
 
 ***
 
-### Install network filesystem (NFS) daemon
+### Enable Network filesystem (NFS) support
 **Command:** 
 ~~~
 armbian-config --cmd NFS01
@@ -196,7 +196,7 @@ armbian-config --cmd NFS01
 
 ***
 
-### Configure network filesystem (NFS) daemon
+### Disable Network filesystem (NFS) support
 **Command:** 
 ~~~
 armbian-config --cmd NFS02
@@ -210,10 +210,76 @@ armbian-config --cmd NFS02
 
 ***
 
-### Remove network filesystem (NFS) daemon
+### Manage NFS Server
+
+
+***
+
+#### Enable network filesystem (NFS) daemon
 **Command:** 
 ~~~
-armbian-config --cmd NFS03
+armbian-config --cmd NFS06
+~~~
+
+**Author:** @igorpecovnik
+
+**Status:** Stable
+
+
+
+***
+
+#### Configure network filesystem (NFS) daemon
+**Command:** 
+~~~
+armbian-config --cmd NFS07
+~~~
+
+**Author:** @igorpecovnik
+
+**Status:** Stable
+
+
+
+***
+
+#### Remove network filesystem (NFS) daemon
+**Command:** 
+~~~
+armbian-config --cmd NFS08
+~~~
+
+**Author:** @igorpecovnik
+
+**Status:** Stable
+
+
+
+***
+
+#### Show network filesystem (NFS) daemon clients
+**Command:** 
+~~~
+armbian-config --cmd NFS09
+~~~
+
+**Author:** @igorpecovnik
+
+**Status:** Stable
+
+
+
+***
+
+### Manage NFS Client
+
+
+***
+
+#### Find NFS servers in subnet and mount shares
+**Command:** 
+~~~
+armbian-config --cmd NFS21
 ~~~
 
 **Author:** @igorpecovnik
diff --git a/docs/User-Guide_Armbian-Software/WebHosting.md b/docs/User-Guide_Armbian-Software/WebHosting.md
new file mode 100644
index 00000000..d63d9eb6
--- /dev/null
+++ b/docs/User-Guide_Armbian-Software/WebHosting.md
@@ -0,0 +1,92 @@
+# Web hosting
+**Status:** Stable
+
+
+
+***
+
+## SWAG reverse proxy install
+
+<!--- section image START from tools/include/images/SWAG01.png --->
+[![SWAG reverse proxy install](/images/SWAG01.png)](#)
+<!--- section image STOP from tools/include/images/SWAG01.png --->
+
+
+<!--- header START from tools/include/markdown/SWAG01-header.md --->
+SWAG - Secure Web Application Gateway sets up an Nginx webserver and reverse proxy with php support and a built-in certbot client that automates free SSL server certificate generation and renewal processes (Let's Encrypt). It also contains fail2ban for intrusion prevention.
+
+After entering required information, your server will have auto updating SSL secured website! To this website you can attach several services, for example: https://my.server.com/netdata will run [Netdata](https://www.netdata.cloud/) instance.
+
+=== "Requirements"
+
+    - this computer port 80 and 443 must be open to the internet
+    - your domain name (myserver.mydomain.com) DNS server should point to your router WAN address
+    - make sure to set additional .htpasswd username and password as you don't want to expose your services without password
+
+=== "Directories"
+
+    - Config directory: `/armbian/swag/config/`
+    - Website root folder: `/armbian/swag/config/www/`
+    - Reverse proxy configuration samples: `/armbian/swag/config/nginx/proxy-confs/`
+
+=== "Advanced setup"
+
+    - Please follow this comprehensive guide: <https://github.com/linuxserver/docker-swag>
+
+<!--- header STOP from tools/include/markdown/SWAG01-header.md --->
+
+**Command:** 
+~~~
+armbian-config --cmd SWAG01
+~~~
+
+**Author:** @armbian
+
+**Status:** Stable
+
+
+
+***
+
+## SWAG reverse proxy .htpasswd set
+**Command:** 
+~~~
+armbian-config --cmd SWAG02
+~~~
+
+**Author:** @armbian
+
+**Status:** Stable
+
+
+
+***
+
+## SWAG reverse proxy remove
+**Command:** 
+~~~
+armbian-config --cmd SWAG03
+~~~
+
+**Author:** @armbian
+
+**Status:** Stable
+
+
+
+***
+
+## SWAG reverse proxy purge data folder
+**Command:** 
+~~~
+armbian-config --cmd SWAG04
+~~~
+
+**Author:** @igorpecovnik
+
+**Status:** Stable
+
+
+
+***
+
diff --git a/docs/images/SWAG01.png b/docs/images/SWAG01.png
new file mode 100644
index 00000000..16b601ec
Binary files /dev/null and b/docs/images/SWAG01.png differ