Merge remote-tracking branch 'upstream/main' into ipv6

bin/v-add-mail-domain-reject

@@ -1,11 +1,11 @@
 #!/bin/bash
-# info: add mail domain reject spam
+# info: add mail domain reject spam support
 # options: USER DOMAIN
 # labels: mail
 #
-# example: v-add-mail-domain-antivirus admin mydomain.tld
+# example: v-add-mail-domain-reject admin mydomain.tld
 #
-# The function enables clamav scan for incoming emails.
+# The function enables spam rejection for incoming emails.
 
 #----------------------------------------------------------#
 #                    Variable&Function                     #

bin/v-change-dns-domain-dnssec

@@ -2,7 +2,7 @@
 # info: change dns domain dnssec status
 # options: USER DOMAIN STATUS
 #
-# example: v-change-dns-domain-status admin domain.pp.ua yes
+# example: v-change-dns-domain-dnssec admin domain.pp.ua yes
 
 #----------------------------------------------------------#
 #                Variables & Functions                     #

bin/v-change-mail-account-rate-limit

@@ -1,8 +1,8 @@
 #!/bin/bash
-# info: change mail domain rate limit
+# info: change mail account rate limit
 # options: USER DOMAIN ACCOUNT RATE
 #
-# example: v-change-mail-domain-quota admin mydomain.tld user01 100
+# example: v-change-mail-account-rate-limit admin mydomain.tld user01 100
 #
 # This function changes email account rate limit. Use system to use domain or "server" setting
 

bin/v-change-mail-domain-rate-limit

@@ -1,10 +1,10 @@
 #!/bin/bash
-# info: change mail account rate limit
-# options: USER DOMAIN ACCOUNT RATE
+# info: change mail domain rate limit
+# options: USER DOMAIN RATE
 #
-# example: v-change-mail-account-quota admin mydomain.tld user01 100
+# example: v-change-mail-domain-rate-limit admin mydomain.tld 100
 #
-# This function changes email account rate limit for the domain. account specific setting will overwrite domain setting!
+# This function changes email account rate limit for the domain. Account specific setting will overwrite domain setting!
 
 #----------------------------------------------------------#
 #                Variables & Functions                     #

bin/v-delete-mail-domain-reject

@@ -3,9 +3,9 @@
 # options: USER DOMAIN
 # labels: mail
 #
-# example: v-delete-mail-domain-antispam admin mydomain.tld
+# example: v-delete-mail-domain-reject admin mydomain.tld
 #
-# The function disable spamassasin for incoming emails.
+# The function disables spam rejection for incoming emails.
 
 #----------------------------------------------------------#
 #                    Variable&Function                     #

bin/v-list-user-backup

@@ -2,7 +2,7 @@
 # info: list user backup
 # options: USER BACKUP [FORMAT]
 #
-# example: v-list-user-backups admin admin.2019-05-19_03-31-30.tar
+# example: v-list-user-backup admin admin.2019-05-19_03-31-30.tar
 #
 # This function of obtaining the list of backup parameters. This call, just as
 # all v_list_* calls, supports 3 formats - json, shell and plain.

docs/docs/reference/cli.md

@@ -504,17 +504,17 @@ This function adds DKIM signature to outgoing domain emails.
 
 ## v-add-mail-domain-reject
 
-add mail domain reject spam
+add mail domain reject spam support
 
 **Options**: `USER` `DOMAIN`
 
 **Examples**:
 
 ```bash
-v-add-mail-domain-antivirus admin mydomain.tld
+v-add-mail-domain-reject admin mydomain.tld
 ```
 
-The function enables clamav scan for incoming emails.
+The function enables spam rejection for incoming emails.
 
 ## v-add-mail-domain-smtp-relay
 
@@ -641,21 +641,21 @@ This function enables the system firewall.
 
 ## v-add-sys-ip
 
-add system ip address
+add system IP address
 
 **Options**: `IP` `NETMASK` `[INTERFACE]` `[USER]` `[IP_STATUS]` `[IP_NAME]` `[NAT_IP]`
 
 **Examples**:
 
 ```bash
-v-add-sys-ip 216.239.32.21 255.255.255.0
+v-add-sys-ip 203.0.113.1 255.255.255.0
 ```
 
-This function adds ip address into a system. It also creates rc scripts. You
-can specify ip name which will be used as root domain for temporary aliases.
+This function adds IP address into a system. It also creates rc scripts. You
+can specify IP name which will be used as root domain for temporary aliases.
 For example, if you set a1.myhosting.com as name, each new domain created on
-this ip will automatically receive alias $domain.a1.myhosting.com. Of course
-you must have wildcard record \*.a1.myhosting.com pointed to ip. This feature
+this IP will automatically receive alias $domain.a1.myhosting.com. Of course
+you must have wildcard record \*.a1.myhosting.com pointed to IP. This feature
 is very handy when customer wants to test domain before dns migration.
 
 ## v-add-sys-pma-sso
@@ -1177,7 +1177,7 @@ change dns domain dnssec status
 **Examples**:
 
 ```bash
-v-change-dns-domain-status admin domain.pp.ua yes
+v-change-dns-domain-dnssec admin domain.pp.ua yes
 ```
 
 ## v-change-dns-domain-exp
@@ -1355,14 +1355,14 @@ This function changes email account disk quota.
 
 ## v-change-mail-account-rate-limit
 
-change mail domain rate limit
+change mail account rate limit
 
 **Options**: `USER` `DOMAIN` `ACCOUNT` `RATE`
 
 **Examples**:
 
 ```bash
-v-change-mail-domain-quota admin mydomain.tld user01 100
+v-change-mail-account-rate-limit admin mydomain.tld user01 100
 ```
 
 This function changes email account rate limit. Use system to use domain or "server" setting
@@ -1383,17 +1383,17 @@ This function changes mail domain catchall.
 
 ## v-change-mail-domain-rate-limit
 
-change mail account rate limit
+change mail domain rate limit
 
-**Options**: `USER` `DOMAIN` `ACCOUNT` `RATE`
+**Options**: `USER` `DOMAIN` `RATE`
 
 **Examples**:
 
 ```bash
-v-change-mail-account-quota admin mydomain.tld user01 100
+v-change-mail-domain-rate-limit admin mydomain.tld 100
 ```
 
-This function changes email account rate limit for the domain. account specific setting will overwrite domain setting!
+This function changes email account rate limit for the domain. Account specific setting will overwrite domain setting!
 
 ## v-change-mail-domain-sslcert
 
@@ -1534,59 +1534,59 @@ This function for changing system hostname.
 
 ## v-change-sys-ip-name
 
-change ip name
+change IP name
 
 **Options**: `IP` `NAME`
 
 **Examples**:
 
 ```bash
-v-change-sys-ip-name 80.122.52.70 acme.com
+v-change-sys-ip-name 203.0.113.1 acme.com
 ```
 
-This function for changing dns domain associated with ip.
+This function for changing dns domain associated with IP.
 
 ## v-change-sys-ip-nat
 
-change ip nat address
+change NAT IP address
 
 **Options**: `IP` `NAT_IP` `[RESTART]`
 
 **Examples**:
 
 ```bash
-v-change-sys-ip-nat 185.209.50.140 10.110.104.205
+v-change-sys-ip-nat 10.0.0.1 203.0.113.1
 ```
 
-This function for changing nat ip associated with ip.
+This function for changing NAT IP associated with IP.
 
 ## v-change-sys-ip-owner
 
-change ip owner
+change IP owner
 
 **Options**: `IP` `USER`
 
 **Examples**:
 
 ```bash
-v-change-sys-ip-owner 91.198.136.14 admin
+v-change-sys-ip-owner 203.0.113.1 admin
 ```
 
-This function of changing ip address ownership.
+This function of changing IP address ownership.
 
 ## v-change-sys-ip-status
 
-change ip status
+change IP status
 
 **Options**: `IP` `IP_STATUS`
 
 **Examples**:
 
 ```bash
-v-change-sys-ip-status 91.198.136.14 yourstatus
+v-change-sys-ip-status 203.0.113.1 yourstatus
 ```
 
-This function of changing an ip address's status.
+This function of changing an IP address's status.
 
 ## v-change-sys-language
 
@@ -2689,10 +2689,10 @@ delete mail domain reject spam support
 **Examples**:
 
 ```bash
-v-delete-mail-domain-antispam admin mydomain.tld
+v-delete-mail-domain-reject admin mydomain.tld
 ```
 
-The function disable spamassasin for incoming emails.
+The function disables spam rejection for incoming emails.
 
 ## v-delete-mail-domain-smtp-relay
 
@@ -2831,18 +2831,18 @@ This function disables firewall support
 
 ## v-delete-sys-ip
 
-delete system ip
+delete system IP
 
 **Options**: `IP`
 
 **Examples**:
 
 ```bash
-v-delete-sys-ip 212.42.76.210
+v-delete-sys-ip 203.0.113.1
 ```
 
-This function for deleting a system ip. It does not allow to delete first ip
-on interface and do not allow to delete ip which is used by a web domain.
+This function for deleting a system IP. It does not allow to delete first IP
+on interface and do not allow to delete IP which is used by a web domain.
 
 ## v-delete-sys-mail-queue
 
@@ -4074,25 +4074,25 @@ This function for obtaining the list of network interfaces.
 
 ## v-list-sys-ip
 
-list system ip
+list system IP
 
 **Options**: `IP` `[FORMAT]`
 
 **Examples**:
 
 ```bash
-v-list-sys-ip 116.203.78.202
+v-list-sys-ip 203.0.113.1
 ```
 
-This function for getting the list of system ip parameters.
+This function for getting the list of system IP parameters.
 
 ## v-list-sys-ips
 
-list system ips
+list system IPs
 
 **Options**: `[FORMAT]`
 
-This function for obtaining the list of system ip addresses.
+This function for obtaining the list of system IP addresses.
 
 ## v-list-sys-languages
 
@@ -4300,7 +4300,7 @@ list user backup
 **Examples**:
 
 ```bash
-v-list-user-backups admin admin.2019-05-19_03-31-30.tar
+v-list-user-backup admin admin.2019-05-19_03-31-30.tar
 ```
 
 This function of obtaining the list of backup parameters. This call, just as
@@ -4336,7 +4336,7 @@ This function for obtaining the list of available user backups.
 
 ## v-list-user-ips
 
-list user ips
+list user IPs
 
 **Options**: `USER` `[FORMAT]`
 
@@ -4346,7 +4346,7 @@ list user ips
 v-list-user-ips admin
 ```
 
-This function for obtaining the list of available ip addresses.
+This function for obtaining the list of available IP addresses.
 
 ## v-list-user-log
 
@@ -5886,7 +5886,7 @@ Downloads and compiles/installs packages from GitHub repositories
 
 ## v-update-sys-ip
 
-update system ip
+update system IP
 
 **Options**: –
 
@@ -5897,8 +5897,8 @@ v-update-sys-ip
 # Intended for internal usage
 ```
 
-This function scans configured ip in the system and register them with hestia
-internal database. This call is intended for use on vps servers, where ip is
+This function scans configured IP in the system and register them with Hestia
+internal database. This call is intended for use on vps servers, where IP is
 set by hypervisor.
 
 ## v-update-sys-ip-counters