Merge pull request #139 from Inedo/license-update

License update

Various/licensing/activation.md

@@ -8,6 +8,9 @@ keywords: license
 **Automatic License Activation Not Working?** See [Knowledge Base post 1758](https://inedo.com/support/kb/1758/automatic-license-activation-not-working). For more information on how to fix automatic license activation problems & errors.
 :::
 
+- [Jump to Activating Your License Key](/docs/various/licensing/activation#activating)
+- [Jump to FAQ](/docs/various/licensing/activation#faq)
+
 All licensed Inedo products require license activation regardless of the edition. License activation is the process of pairing a license key with a value that is unique per machine it is installed on. The machine-unique identifier is a hash of the following components:
 
 {.docs}
@@ -26,6 +29,34 @@ If any of these components change, re-activation would be required. There is no
 - A new network interface was added
 - Upgrading to a minor or major version of the software
 
+## Activating Your License Key {#activating}
+
+### Step 1:
+Go to: Administration (Gear Icon > Administration)
+![administration portal](/resources/documentation/various/administration.png){.screenshot}
+
+### Step 2:
+Under: System select License Key & Activation
+![license key](/resources/documentation/various/system.png){.screenshot}
+
+### Step 3:
+Under License key select [change]
+![change key](/resources/documentation/various/license-key.png){.screenshot}
+
+### Step 4:
+This will change the license key or allow you to add one for the first time
+![change key](/resources/documentation/various/change-license-key.png){.screenshot}
+
+### Step 5:
+Select Save
+
+### Step 6: 	
+After Saving the License select [activate] under Activation Status
+![activate](/resources/documentation/various/activate.png){.screenshot}
+### Step 7:
+License is now Active
+![active](/resources/documentation/various/activation.png){.screenshot}
+
 ## Automatic Activation {#automatic}
 
 Generally, activation happens automatically in the background upon first use of an Inedo product. Automatic activation will also be attempted if any activation code becomes invalid. If activation cannot be performed automatically, the software will function normally (albeit with a warning notification) during the 7-day grace period from the day the license key was created. Once the grace period expires, if the product is still unable to establish a connection to the internet to perform the activation, ***manual activation*** is required.
@@ -36,7 +67,7 @@ When an Inedo product is unable to access the internet and requires activation,
 
 ### Step 1:
 
-Log in to [MyInedo](https://my.inedo.com){target="_blank"} and click the *Manually Activate License Key* button:
+Log in to [MyInedo](https://my.inedo.com) and click the *Manually Activate License Key* button:
 
 ![Manually Activate](/resources/documentation/various/manually-activate.png){.screenshot}
 
@@ -57,3 +88,26 @@ Copy and paste the resulting activation code into the software and click save:
 ![Activation Code](/resources/documentation/various/activation-code.png){.screenshot}
 
 Alternatively, if for some reason access to the manual activation page is blocked, the values for the license key and activation code are also configurable on the "Advanced Settings" page in each product.
+
+## FAQ {#faq}
+#### Who can enter/change a key?
+A license key may be changed at any time in the software by an administrator.
+
+#### How do I activate my key?
+In your ProGet instance, go to Administration - > Software Configuration -> License Key and Activation. Plug the key in, and once it’s marked “valid,” you can click “Activate.”
+
+#### How do I view my key?
+In your ProGet instance, go to Administration - > Software Configuration -> License Key and Activation. You can also view your key(s) on [My Inedo](https://my.inedo.com).
+
+#### How much time is left on my key?
+If your key expires, you can see the expiration date under “License Key and Activation” in your ProGet Instance. Your trial begins the day you receive your key. Free forever keys do not expire.
+
+#### Does my key expire?
+There are three types of keys: free forever, free trial, and paid. Free forever keys never expire. Trial keys expire 30 days from the date they key is generated and delivered (NOT activated), and paid keys expire at the end of your subscription period. Learn all about your ProGet free trial.
+
+#### What happens when my trial key expires?
+When your trial period comes to an end, your key “expires.” When a key expires, all of your applications and components remain in ProGet in exactly the same way – there is NO SCENARIO in which your data will be locked or erased from ProGet. However, ProGet does require you to enter a key with a valid license at the end of your trial. There are two ways to do this:
+- Enter a free forever key. If you had a free key before your trial, you can simply reenter it. If you have misplaced it or never had forever free key in the past, you can create a new one by [clicking here](https://my.inedo.com).
+- [Purchase ProGet](https://inedo.com/proget/pricing) and enter that key to continue enjoying the advanced features of your free trial.
+
+[Learn More about ProGet Free Trials](https://inedo.com/proget/pricing/trial)