Merge branch 'master' into develop

install.rst

@@ -127,7 +127,7 @@ Quick Install
 **IMPORTANT:** Notes on Installation
 - Due to the high volume of installations, the auto-generated domain has been rate-limited by the certificate provider. For this reason, we **strongly recommend** using your domain. Using the auto-generated domain may lead to a failed installation due to rate limiting.
 
-**IMPORTANT:** From v0.22.0 the install script will install the PRO version of netmaker with a 30-day free trial, for you to try out the full capabilities of netmaker.
+**IMPORTANT:** From v0.22.0 the install script will install PRO version of netmaker with a 14-day free trial, for you to try out full capabilities of netmaker.
 
 Integrating OAuth
 ====================
@@ -138,8 +138,7 @@ After the trial period ends:
 ==============================
 
     a. if you wish to continue using PRO:-
-
-        i. Check these steps to obtain a pro license `<https://docs.netmaker.io/quick-start.html#extra-steps-for-pro>`_
+        i. check these steps to obtain pro license `<https://docs.netmaker.io/pro/pro-setup.html>`_
         ii. Run `/root/nm-quick.sh -u`
 
     b. if you wish to downgrade to the community version

manual-install.rst

@@ -217,7 +217,7 @@ Extra Steps for Pro
 -----------------------------------------------------------------------------------------------------
 
 1. Visit `<https://app.netmaker.io>`_ to create your account on the Netmaker SaaS platform.
-2. Create a tenant of type ``self-hosted`` to obtain a license key. more details in :doc:`Netmaker Professional setup <./pro/pro-setup>`
+2. Create a tenant of type ``On-Prem`` to obtain a license key. more details in :doc:`Netmaker Professional setup <./pro/pro-setup>`
 3. Retrieve Tenant ID and license key from the tenant's settings tab.
 4. Place the licence key and tenant ID in the netmaker.env file.
 5. In the netmaker.env file, change the METRICS_EXPORTER and PROMETHEUS from off to on.